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
b111fda2
Commit
b111fda2
authored
Jun 05, 2020
by
Kilian Weishaupt
Committed by
Timo Koch
Jun 18, 2020
Browse files
[test][md][stokesdarcy] Use BoundaryTypes directly
parent
5268c73a
Changes
16
Hide whitespace changes
Inline
Side-by-side
test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
View file @
b111fda2
...
...
@@ -26,6 +26,7 @@
#define DUMUX_ONEP_SUB_TEST_PROBLEM_HH
#include
<dune/common/indices.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
"spatialparams.hh"
...
...
@@ -54,7 +55,7 @@ class OnePTestProblem
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
static
constexpr
int
dimWorld
=
GridView
::
dimensionworld
;
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
static
constexpr
auto
domainIdx
=
Dune
::
index_constant
<
tag
>
{};
...
...
test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
View file @
b111fda2
...
...
@@ -26,6 +26,7 @@
#define DUMUX_ONEP_SUB_TEST_PROBLEM_HH
#include
<dune/common/indices.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
"spatialparams.hh"
...
...
@@ -55,7 +56,7 @@ class OnePTestProblem
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
static
constexpr
int
dimWorld
=
GridView
::
dimensionworld
;
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
...
...
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
View file @
b111fda2
...
...
@@ -29,19 +29,19 @@
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/flux/maxwellstefanslaw.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
<dumux/common/boundarytypes.hh>
#include
"./../spatialparams
.hh
"
#include
<dumux/flux/maxwellstefanslaw
.hh
>
#include
<dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
#include
<dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh>
// for StokesDarcyCouplingOptions
#include
<dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
"./../spatialparams.hh"
#ifndef DIFFUSIONTYPE
#define DIFFUSIONTYPE FicksLaw<TypeTag>
...
...
@@ -110,7 +110,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
...
...
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
View file @
b111fda2
...
...
@@ -32,13 +32,16 @@
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/
material/fluidsystems/1padapter
.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
#include
<dumux/
discretization/staggered/freeflow/properties
.hh>
#include
<dumux/flux/maxwellstefanslaw.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/compositional/navierstokesncmodel.hh>
#include
<dumux/freeflow/navierstokes/boundarytypes.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
// for StokesDarcyCouplingOptions
#include
<dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
...
...
@@ -108,7 +111,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GridGeometry
::
LocalView
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
...
...
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
View file @
b111fda2
...
...
@@ -29,15 +29,17 @@
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
"spatialparams.hh"
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
#include
<dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh>
namespace
Dumux
{
template
<
class
TypeTag
>
class
DarcySubProblem
;
...
...
@@ -97,7 +99,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
...
...
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
View file @
b111fda2
...
...
@@ -27,12 +27,14 @@
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/compositional/navierstokesncmodel.hh>
#include
<dumux/freeflow/navierstokes/boundarytypes.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
namespace
Dumux
{
template
<
class
TypeTag
>
...
...
@@ -90,7 +92,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using
GridView
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
GridView
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GridGeometry
::
LocalView
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
...
...
test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
View file @
b111fda2
...
...
@@ -28,13 +28,14 @@
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
#include
<dumux/porousmediumflow/2p2c/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
<dumux/porousmediumflow/2p2c/model.hh>
#include
"spatialparams.hh"
namespace
Dumux
{
...
...
@@ -93,7 +94,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
...
...
test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
View file @
b111fda2
...
...
@@ -27,13 +27,14 @@
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/compositional/navierstokesncmodel.hh>
#include
<dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
#include
<dumux/freeflow/navierstokes/boundarytypes.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
namespace
Dumux
{
template
<
class
TypeTag
>
...
...
@@ -97,7 +98,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GridGeometry
::
LocalView
;
...
...
test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
View file @
b111fda2
...
...
@@ -28,15 +28,15 @@
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/flux/maxwellstefanslaw.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/flux/maxwellstefanslaw.hh>
#include
<dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh>
// for StokesDarcyCouplingOptions
#include
<dumux/
multidomain/boundary/stokesdarcy/couplingdata
.hh>
#include
<dumux/porousmediumflow/1pnc/model.hh>
#include
<dumux/
porousmediumflow/problem
.hh>
#include
"../1p2c_1p2c/spatialparams.hh"
#include
"h2n2co2fluidsystem.hh"
...
...
@@ -101,7 +101,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
...
...
test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
View file @
b111fda2
...
...
@@ -27,15 +27,15 @@
#include
<dune/grid/yaspgrid.hh>
#include
"h2n2co2fluidsystem.hh"
#include
<dumux/flux/maxwellstefanslaw.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/compositional/navierstokesncmodel.hh>
#include
<dumux/freeflow/navierstokes/boundarytypes.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/flux/maxwellstefanslaw.hh>
// for StokesDarcyCouplingOptions
#include
<dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
#include
"h2n2co2fluidsystem.hh"
namespace
Dumux
{
template
<
class
TypeTag
>
...
...
@@ -93,7 +93,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GridGeometry
::
LocalView
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
...
...
test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
View file @
b111fda2
...
...
@@ -30,15 +30,17 @@
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/material/components/constant.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
#include
<dumux/porousmediumflow/1p/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
"spatialparams.hh"
#include
"testcase.hh"
#include
<dumux/material/components/constant.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
namespace
Dumux
{
template
<
class
TypeTag
>
class
DarcySubProblem
;
...
...
@@ -86,7 +88,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
...
...
test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
View file @
b111fda2
...
...
@@ -28,12 +28,15 @@
#include
<dune/common/fvector.hh>
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/navierstokes/boundarytypes.hh>
#include
<dumux/freeflow/navierstokes/model.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
#include
<dumux/material/components/constant.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/navierstokes/model.hh>
#include
"testcase.hh"
namespace
Dumux
{
...
...
@@ -79,7 +82,7 @@ class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
{
using
ParentType
=
NavierStokesProblem
<
TypeTag
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
GridView
=
typename
GridGeometry
::
GridView
;
using
FVElementGeometry
=
typename
GridGeometry
::
LocalView
;
...
...
test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
View file @
b111fda2
...
...
@@ -29,14 +29,16 @@
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
#include
<dumux/material/components/simpleh2o.hh>
#include
<dumux/porousmediumflow/1p/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
#include
"spatialparams.hh"
#include
<dumux/material/components/simpleh2o.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
namespace
Dumux
{
template
<
class
TypeTag
>
class
DarcySubProblem
;
...
...
@@ -80,7 +82,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
...
...
test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
View file @
b111fda2
...
...
@@ -27,12 +27,14 @@
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
#include
<dumux/material/components/simpleh2o.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/navierstokes/boundarytypes.hh>
#include
<dumux/freeflow/navierstokes/model.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
#include
<dumux/material/components/simpleh2o.hh>
namespace
Dumux
{
template
<
class
TypeTag
>
...
...
@@ -84,7 +86,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GridGeometry
::
LocalView
;
...
...
test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
View file @
b111fda2
...
...
@@ -29,6 +29,8 @@
#include
<dumux/discretization/cctpfa.hh>
#include
<dumux/common/boundarytypes.hh>
#include
<dumux/porousmediumflow/2p/model.hh>
#include
<dumux/porousmediumflow/problem.hh>
...
...
@@ -82,7 +84,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
ElementVolumeVariables
=
typename
GridVariables
::
GridVolumeVariables
::
LocalView
;
using
ElementFluxVariablesCache
=
typename
GridVariables
::
GridFluxVariablesCache
::
LocalView
;
...
...
test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
View file @
b111fda2
...
...
@@ -27,9 +27,11 @@
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/navierstokes/boundarytypes.hh>
#include
<dumux/freeflow/navierstokes/model.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
namespace
Dumux
{
template
<
class
TypeTag
>
...
...
@@ -75,7 +77,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GridGeometry
::
LocalView
;
...
...
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