Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
dfad4e97
Commit
dfad4e97
authored
Oct 08, 2019
by
Katharina Heck
Browse files
[tests][shallowater] use new neumann interface and fix warning for
frictionlaw in spatialparams
parent
8bf95129
Changes
2
Hide whitespace changes
Inline
Side-by-side
test/freeflow/shallowwater/roughchannel/problem.hh
View file @
dfad4e97
...
...
@@ -119,6 +119,8 @@ class RoughChannelProblem : public ShallowWaterProblem<TypeTag>
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
;
using
NeumannFluxes
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
ElementVolumeVariables
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>::
LocalView
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
ElementFluxVariablesCache
=
typename
GridVariables
::
GridFluxVariablesCache
::
LocalView
;
using
VolumeVariables
=
typename
ElementVolumeVariables
::
VolumeVariables
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>::
LocalView
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
...
...
@@ -287,6 +289,7 @@ public:
NeumannFluxes
neumann
(
const
Element
&
element
,
const
FVElementGeometry
&
fvGeometry
,
const
ElementVolumeVariables
&
elemVolVars
,
const
ElementFluxVariablesCache
&
elemFluxVarsCache
,
const
SubControlVolumeFace
&
scvf
)
const
{
NeumannFluxes
values
(
0.0
);
...
...
test/freeflow/shallowwater/roughchannel/spatialparams.hh
View file @
dfad4e97
...
...
@@ -70,7 +70,7 @@ public:
Scalar
manningN
=
getParam
<
Scalar
>
(
"Problem.ManningN"
);
frictionLaw_
=
std
::
make_unique
<
FrictionLawManning
<
VolumeVariables
>>
(
gravity_
,
manningN
);
}
if
(
frictionLawType_
==
"Nikuradse"
)
else
if
(
frictionLawType_
==
"Nikuradse"
)
{
Scalar
ks
=
getParam
<
Scalar
>
(
"Problem.Ks"
);
// equivalent sand roughness
frictionLaw_
=
std
::
make_unique
<
FrictionLawNikuradse
<
VolumeVariables
>>
(
ks
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment