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
e0381ebe
Commit
e0381ebe
authored
Nov 15, 2018
by
Bernd Flemisch
Browse files
[propertysystem] replace macro GET_PROP_TYPE
parent
fd7da590
Changes
351
Hide whitespace changes
Inline
Side-by-side
dumux/adaptive/initializationindicator.hh
View file @
e0381ebe
...
...
@@ -42,16 +42,16 @@ namespace Dumux {
template
<
class
TypeTag
>
class
GridAdaptInitializationIndicator
{
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Problem
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
using
GridView
=
GetPropType
<
TypeTag
,
Properties
::
GridView
>
;
using
Element
=
typename
GridView
::
Traits
::
template
Codim
<
0
>
::
Entity
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
FVGridGeometry
=
typename
GET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
;
using
BoundaryTypes
=
typename
GET_PROP_TYPE
(
TypeTag
,
BoundaryTypes
)
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
static
constexpr
bool
isBox
=
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
discMethod
==
DiscretizationMethod
::
box
;
static
constexpr
bool
isBox
=
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
discMethod
==
DiscretizationMethod
::
box
;
public:
...
...
dumux/assembly/boxlocalassembler.hh
View file @
e0381ebe
...
...
@@ -53,12 +53,12 @@ template<class TypeTag, class Assembler, class Implementation, bool implicit>
class
BoxLocalAssemblerBase
:
public
FVLocalAssemblerBase
<
TypeTag
,
Assembler
,
Implementation
,
implicit
>
{
using
ParentType
=
FVLocalAssemblerBase
<
TypeTag
,
Assembler
,
Implementation
,
implicit
>
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
SolutionVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
SolutionVector
)
;
using
ElementVolumeVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
::
LocalView
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
SolutionVector
=
GetPropType
<
TypeTag
,
Properties
::
SolutionVector
>
;
using
ElementVolumeVariables
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>
::
LocalView
;
enum
{
numEq
=
G
ET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
numEq
()
};
enum
{
numEq
=
G
etPropType
<
TypeTag
,
Properties
::
ModelTraits
>
::
numEq
()
};
public:
...
...
@@ -256,15 +256,15 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tr
{
using
ThisType
=
BoxLocalAssembler
<
TypeTag
,
Assembler
,
DiffMethod
::
numeric
,
true
>
;
using
ParentType
=
BoxLocalAssemblerBase
<
TypeTag
,
Assembler
,
ThisType
,
true
>
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
VolumeVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
VolumeVariables
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
LocalResidual
=
typename
GET_PROP_TYPE
(
TypeTag
,
LocalResidual
)
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
LocalResidual
=
GetPropType
<
TypeTag
,
Properties
::
LocalResidual
>
;
using
ElementResidualVector
=
typename
LocalResidual
::
ElementResidualVector
;
enum
{
numEq
=
G
ET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
numEq
()
};
enum
{
dim
=
G
ET_PROP_TYPE
(
TypeTag
,
GridView
)
::
dimension
};
enum
{
numEq
=
G
etPropType
<
TypeTag
,
Properties
::
ModelTraits
>
::
numEq
()
};
enum
{
dim
=
G
etPropType
<
TypeTag
,
Properties
::
GridView
>
::
dimension
};
static
constexpr
bool
enableGridFluxVarsCache
=
GET_PROP_VALUE
(
TypeTag
,
EnableGridFluxVariablesCache
);
...
...
@@ -375,15 +375,15 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fa
{
using
ThisType
=
BoxLocalAssembler
<
TypeTag
,
Assembler
,
DiffMethod
::
numeric
,
false
>
;
using
ParentType
=
BoxLocalAssemblerBase
<
TypeTag
,
Assembler
,
ThisType
,
false
>
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
VolumeVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
VolumeVariables
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
LocalResidual
=
typename
GET_PROP_TYPE
(
TypeTag
,
LocalResidual
)
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
LocalResidual
=
GetPropType
<
TypeTag
,
Properties
::
LocalResidual
>
;
using
ElementResidualVector
=
typename
LocalResidual
::
ElementResidualVector
;
enum
{
numEq
=
G
ET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
numEq
()
};
enum
{
dim
=
G
ET_PROP_TYPE
(
TypeTag
,
GridView
)
::
dimension
};
enum
{
numEq
=
G
etPropType
<
TypeTag
,
Properties
::
ModelTraits
>
::
numEq
()
};
enum
{
dim
=
G
etPropType
<
TypeTag
,
Properties
::
GridView
>
::
dimension
};
public:
...
...
@@ -486,9 +486,9 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/t
{
using
ThisType
=
BoxLocalAssembler
<
TypeTag
,
Assembler
,
DiffMethod
::
analytic
,
true
>
;
using
ParentType
=
BoxLocalAssemblerBase
<
TypeTag
,
Assembler
,
ThisType
,
true
>
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
LocalResidual
=
typename
GET_PROP_TYPE
(
TypeTag
,
LocalResidual
)
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
LocalResidual
=
GetPropType
<
TypeTag
,
Properties
::
LocalResidual
>
;
using
ElementResidualVector
=
typename
LocalResidual
::
ElementResidualVector
;
public:
...
...
@@ -605,9 +605,9 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/f
{
using
ThisType
=
BoxLocalAssembler
<
TypeTag
,
Assembler
,
DiffMethod
::
analytic
,
false
>
;
using
ParentType
=
BoxLocalAssemblerBase
<
TypeTag
,
Assembler
,
ThisType
,
false
>
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
LocalResidual
=
typename
GET_PROP_TYPE
(
TypeTag
,
LocalResidual
)
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
LocalResidual
=
GetPropType
<
TypeTag
,
Properties
::
LocalResidual
>
;
using
ElementResidualVector
=
typename
LocalResidual
::
ElementResidualVector
;
public:
...
...
dumux/assembly/boxlocalresidual.hh
View file @
e0381ebe
...
...
@@ -43,16 +43,16 @@ template<class TypeTag>
class
BoxLocalResidual
:
public
FVLocalResidual
<
TypeTag
>
{
using
ParentType
=
FVLocalResidual
<
TypeTag
>
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Problem
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
using
GridView
=
GetPropType
<
TypeTag
,
Properties
::
GridView
>
;
using
Element
=
typename
GridView
::
template
Codim
<
0
>
::
Entity
;
using
ElementBoundaryTypes
=
typename
GET_PROP_TYPE
(
TypeTag
,
ElementBoundaryTypes
)
;
using
FVElementGeometry
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
LocalView
;
using
ElementVolumeVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
::
LocalView
;
using
ElementBoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
ElementBoundaryTypes
>
;
using
FVElementGeometry
=
typename
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
LocalView
;
using
ElementVolumeVariables
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>
::
LocalView
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
using
ElementFluxVariablesCache
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridFluxVariablesCache
)
::
LocalView
;
using
NumEqVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
ElementFluxVariablesCache
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridFluxVariablesCache
>
::
LocalView
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
public:
using
ElementResidualVector
=
typename
ParentType
::
ElementResidualVector
;
...
...
dumux/assembly/cclocalassembler.hh
View file @
e0381ebe
...
...
@@ -56,12 +56,12 @@ template<class TypeTag, class Assembler, class Implementation, bool implicit>
class
CCLocalAssemblerBase
:
public
FVLocalAssemblerBase
<
TypeTag
,
Assembler
,
Implementation
,
implicit
>
{
using
ParentType
=
FVLocalAssemblerBase
<
TypeTag
,
Assembler
,
Implementation
,
implicit
>
;
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
SolutionVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
SolutionVector
)
;
using
ElementVolumeVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
::
LocalView
;
using
NumEqVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
GridView
=
GetPropType
<
TypeTag
,
Properties
::
GridView
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
SolutionVector
=
GetPropType
<
TypeTag
,
Properties
::
SolutionVector
>
;
using
ElementVolumeVariables
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>
::
LocalView
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
public:
...
...
@@ -132,16 +132,16 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tru
{
using
ThisType
=
CCLocalAssembler
<
TypeTag
,
Assembler
,
DiffMethod
::
numeric
,
true
>
;
using
ParentType
=
CCLocalAssemblerBase
<
TypeTag
,
Assembler
,
ThisType
,
true
>
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
NumEqVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
Element
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridView
)
::
template
Codim
<
0
>
::
Entity
;
using
FVGridGeometry
=
typename
GET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
Element
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridView
>
::
template
Codim
<
0
>
::
Entity
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
;
using
FVElementGeometry
=
typename
FVGridGeometry
::
LocalView
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
enum
{
numEq
=
G
ET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
numEq
()
};
enum
{
dim
=
G
ET_PROP_TYPE
(
TypeTag
,
GridView
)
::
dimension
};
enum
{
numEq
=
G
etPropType
<
TypeTag
,
Properties
::
ModelTraits
>
::
numEq
()
};
enum
{
dim
=
G
etPropType
<
TypeTag
,
Properties
::
GridView
>
::
dimension
};
using
FluxStencil
=
Dumux
::
FluxStencil
<
FVElementGeometry
>
;
static
constexpr
int
maxElementStencilSize
=
FVGridGeometry
::
maxElementStencilSize
;
...
...
@@ -313,13 +313,13 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fal
{
using
ThisType
=
CCLocalAssembler
<
TypeTag
,
Assembler
,
DiffMethod
::
numeric
,
false
>
;
using
ParentType
=
CCLocalAssemblerBase
<
TypeTag
,
Assembler
,
ThisType
,
false
>
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
NumEqVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
Element
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridView
)
::
template
Codim
<
0
>
::
Entity
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
Element
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridView
>
::
template
Codim
<
0
>
::
Entity
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
enum
{
numEq
=
G
ET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
numEq
()
};
enum
{
numEq
=
G
etPropType
<
TypeTag
,
Properties
::
ModelTraits
>
::
numEq
()
};
public:
using
ParentType
::
ParentType
;
...
...
@@ -424,9 +424,9 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/tr
{
using
ThisType
=
CCLocalAssembler
<
TypeTag
,
Assembler
,
DiffMethod
::
analytic
,
true
>
;
using
ParentType
=
CCLocalAssemblerBase
<
TypeTag
,
Assembler
,
ThisType
,
true
>
;
using
NumEqVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
public:
using
ParentType
::
ParentType
;
...
...
@@ -503,9 +503,9 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/fa
{
using
ThisType
=
CCLocalAssembler
<
TypeTag
,
Assembler
,
DiffMethod
::
analytic
,
false
>
;
using
ParentType
=
CCLocalAssemblerBase
<
TypeTag
,
Assembler
,
ThisType
,
false
>
;
using
NumEqVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
public:
using
ParentType
::
ParentType
;
...
...
dumux/assembly/cclocalresidual.hh
View file @
e0381ebe
...
...
@@ -40,13 +40,13 @@ template<class TypeTag>
class
CCLocalResidual
:
public
FVLocalResidual
<
TypeTag
>
{
using
ParentType
=
FVLocalResidual
<
TypeTag
>
;
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
Element
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridView
)
::
template
Codim
<
0
>
::
Entity
;
using
NumEqVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
ElementBoundaryTypes
=
typename
GET_PROP_TYPE
(
TypeTag
,
ElementBoundaryTypes
)
;
using
ElementVolumeVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
::
LocalView
;
using
ElementFluxVariablesCache
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridFluxVariablesCache
)
::
LocalView
;
using
FVElementGeometry
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
LocalView
;
using
Problem
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
using
Element
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridView
>
::
template
Codim
<
0
>
::
Entity
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
ElementBoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
ElementBoundaryTypes
>
;
using
ElementVolumeVariables
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>
::
LocalView
;
using
ElementFluxVariablesCache
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridFluxVariablesCache
>
::
LocalView
;
using
FVElementGeometry
=
typename
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
LocalView
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
public:
...
...
dumux/assembly/fvassembler.hh
View file @
e0381ebe
...
...
@@ -50,14 +50,14 @@ namespace Dumux {
template
<
class
TypeTag
,
DiffMethod
diffMethod
,
bool
isImplicit
=
true
>
class
FVAssembler
{
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
LocalResidual
=
typename
GET_PROP_TYPE
(
TypeTag
,
LocalResidual
)
;
using
GridView
=
GetPropType
<
TypeTag
,
Properties
::
GridView
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
LocalResidual
=
GetPropType
<
TypeTag
,
Properties
::
LocalResidual
>
;
using
Element
=
typename
GridView
::
template
Codim
<
0
>
::
Entity
;
using
TimeLoop
=
TimeLoopBase
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
;
using
SolutionVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
SolutionVector
)
;
using
TimeLoop
=
TimeLoopBase
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
>
;
using
SolutionVector
=
GetPropType
<
TypeTag
,
Properties
::
SolutionVector
>
;
static
constexpr
DiscretizationMethod
discMethod
=
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
discMethod
;
static
constexpr
DiscretizationMethod
discMethod
=
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
discMethod
;
static
constexpr
bool
isBox
=
discMethod
==
DiscretizationMethod
::
box
;
using
ThisType
=
FVAssembler
<
TypeTag
,
diffMethod
,
isImplicit
>
;
...
...
@@ -65,10 +65,10 @@ class FVAssembler
CCLocalAssembler
<
TypeTag
,
ThisType
,
diffMethod
,
isImplicit
>>
;
public:
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
FVGridGeometry
=
typename
GET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
;
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
;
using
Problem
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
using
ResidualType
=
SolutionVector
;
...
...
dumux/assembly/fvlocalassemblerbase.hh
View file @
e0381ebe
...
...
@@ -46,24 +46,24 @@ namespace Dumux {
template
<
class
TypeTag
,
class
Assembler
,
class
Implementation
,
bool
useImplicitAssembly
>
class
FVLocalAssemblerBase
{
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
JacobianMatrix
=
typename
GET_PROP_TYPE
(
TypeTag
,
JacobianMatrix
)
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
Problem
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
using
GridView
=
GetPropType
<
TypeTag
,
Properties
::
GridView
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
JacobianMatrix
=
GetPropType
<
TypeTag
,
Properties
::
JacobianMatrix
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
SolutionVector
=
typename
Assembler
::
ResidualType
;
using
ElementBoundaryTypes
=
typename
GET_PROP_TYPE
(
TypeTag
,
ElementBoundaryTypes
)
;
using
FVElementGeometry
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
LocalView
;
using
ElementBoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
ElementBoundaryTypes
>
;
using
FVElementGeometry
=
typename
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
using
GridVolumeVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
;
using
ElementVolumeVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
::
LocalView
;
using
VolumeVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
VolumeVariables
)
;
using
ElementFluxVariablesCache
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridFluxVariablesCache
)
::
LocalView
;
using
GridVolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>
;
using
ElementVolumeVariables
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>
::
LocalView
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
ElementFluxVariablesCache
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridFluxVariablesCache
>
::
LocalView
;
using
Element
=
typename
GridView
::
template
Codim
<
0
>
::
Entity
;
public:
using
LocalResidual
=
typename
GET_PROP_TYPE
(
TypeTag
,
LocalResidual
)
;
using
LocalResidual
=
GetPropType
<
TypeTag
,
Properties
::
LocalResidual
>
;
using
ElementResidualVector
=
typename
LocalResidual
::
ElementResidualVector
;
/*!
...
...
dumux/assembly/fvlocalresidual.hh
View file @
e0381ebe
...
...
@@ -44,22 +44,22 @@ namespace Dumux {
template
<
class
TypeTag
>
class
FVLocalResidual
{
using
Implementation
=
typename
GET_PROP_TYPE
(
TypeTag
,
LocalResidual
)
;
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
;
using
Implementation
=
GetPropType
<
TypeTag
,
Properties
::
LocalResidual
>
;
using
Problem
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
GridView
=
GetPropType
<
TypeTag
,
Properties
::
GridView
>
;
using
Element
=
typename
GridView
::
template
Codim
<
0
>
::
Entity
;
using
FVElementGeometry
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
LocalView
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
FVGridGeometry
=
typename
GET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
;
using
FVElementGeometry
=
typename
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
LocalView
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
using
NumEqVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
ElementBoundaryTypes
=
typename
GET_PROP_TYPE
(
TypeTag
,
ElementBoundaryTypes
)
;
using
ElementFluxVariablesCache
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridFluxVariablesCache
)
::
LocalView
;
using
VolumeVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
VolumeVariables
)
;
using
ElementVolumeVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
::
LocalView
;
using
SolutionVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
SolutionVector
)
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
ElementBoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
ElementBoundaryTypes
>
;
using
ElementFluxVariablesCache
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridFluxVariablesCache
>
::
LocalView
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
ElementVolumeVariables
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>
::
LocalView
;
using
SolutionVector
=
GetPropType
<
TypeTag
,
Properties
::
SolutionVector
>
;
using
TimeLoop
=
TimeLoopBase
<
Scalar
>
;
public:
...
...
@@ -495,7 +495,7 @@ public:
//! Compute the derivative of the flux residual
template
<
class
PartialDerivativeMatrices
,
class
T
=
TypeTag
>
std
::
enable_if_t
<
G
ET_PROP_TYPE
(
T
,
FVGridGeometry
)
::
discMethod
!=
DiscretizationMethod
::
box
,
void
>
std
::
enable_if_t
<
G
etPropType
<
T
,
Properties
::
FVGridGeometry
>
::
discMethod
!=
DiscretizationMethod
::
box
,
void
>
addFluxDerivatives
(
PartialDerivativeMatrices
&
derivativeMatrices
,
const
Problem
&
problem
,
const
Element
&
element
,
...
...
@@ -509,7 +509,7 @@ public:
//! Compute the derivative of the flux residual for the box method
template
<
class
JacobianMatrix
,
class
T
=
TypeTag
>
std
::
enable_if_t
<
G
ET_PROP_TYPE
(
T
,
FVGridGeometry
)
::
discMethod
==
DiscretizationMethod
::
box
,
void
>
std
::
enable_if_t
<
G
etPropType
<
T
,
Properties
::
FVGridGeometry
>
::
discMethod
==
DiscretizationMethod
::
box
,
void
>
addFluxDerivatives
(
JacobianMatrix
&
A
,
const
Problem
&
problem
,
const
Element
&
element
,
...
...
dumux/assembly/staggeredfvassembler.hh
View file @
e0381ebe
...
...
@@ -60,12 +60,12 @@ class StaggeredFVAssembler: public MultiDomainFVAssembler<StaggeredMultiDomainTr
StaggeredCouplingManager
<
StaggeredMultiDomainTraits
<
TypeTag
,
TypeTag
>>
,
diffMethod
>
;
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
GridVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridVariables
)
;
using
TimeLoop
=
TimeLoopBase
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
;
using
Problem
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
TimeLoop
=
TimeLoopBase
<
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
>
;
public:
using
FVGridGeometry
=
typename
GET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
;
using
CouplingManager
=
typename
ParentType
::
CouplingManager
;
//! The constructor for stationary problems
...
...
dumux/assembly/staggeredlocalresidual.hh
View file @
e0381ebe
...
...
@@ -38,30 +38,30 @@ namespace Dumux {
template
<
class
TypeTag
>
class
StaggeredLocalResidual
{
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
;
using
GridView
=
GetPropType
<
TypeTag
,
Properties
::
GridView
>
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
Implementation
=
typename
GET_PROP_TYPE
(
TypeTag
,
LocalResidual
)
;
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Implementation
=
GetPropType
<
TypeTag
,
Properties
::
LocalResidual
>
;
using
Problem
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
using
Element
=
typename
GridView
::
template
Codim
<
0
>
::
Entity
;
using
ElementBoundaryTypes
=
typename
GET_PROP_TYPE
(
TypeTag
,
ElementBoundaryTypes
)
;
using
ElementVolumeVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
::
LocalView
;
using
ElementFluxVariablesCache
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridFluxVariablesCache
)
::
LocalView
;
using
FVElementGeometry
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
LocalView
;
using
ElementBoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
ElementBoundaryTypes
>
;
using
ElementVolumeVariables
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>
::
LocalView
;
using
ElementFluxVariablesCache
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridFluxVariablesCache
>
::
LocalView
;
using
FVElementGeometry
=
typename
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
using
CellCenterPrimaryVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
CellCenterPrimaryVariables
)
;
using
SolutionVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
SolutionVector
)
;
using
CellCenterPrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
CellCenterPrimaryVariables
>
;
using
SolutionVector
=
GetPropType
<
TypeTag
,
Properties
::
SolutionVector
>
;
using
CellCenterResidual
=
typename
GET_PROP_TYPE
(
TypeTag
,
CellCenterPrimaryVariables
)
;
using
FaceResidual
=
typename
GET_PROP_TYPE
(
TypeTag
,
FacePrimaryVariables
)
;
using
ElementFaceVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridFaceVariables
)
::
LocalView
;
using
CellCenterResidual
=
GetPropType
<
TypeTag
,
Properties
::
CellCenterPrimaryVariables
>
;
using
FaceResidual
=
GetPropType
<
TypeTag
,
Properties
::
FacePrimaryVariables
>
;
using
ElementFaceVariables
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridFaceVariables
>
::
LocalView
;
using
TimeLoop
=
TimeLoopBase
<
Scalar
>
;
public:
using
CellCenterResidualValue
=
typename
GET_PROP_TYPE
(
TypeTag
,
CellCenterPrimaryVariables
)
;
using
FaceResidualValue
=
typename
GET_PROP_TYPE
(
TypeTag
,
FacePrimaryVariables
)
;
using
CellCenterResidualValue
=
GetPropType
<
TypeTag
,
Properties
::
CellCenterPrimaryVariables
>
;
using
FaceResidualValue
=
GetPropType
<
TypeTag
,
Properties
::
FacePrimaryVariables
>
;
using
ElementResidualVector
=
CellCenterResidualValue
;
//! the constructor
...
...
dumux/common/fvproblem.hh
View file @
e0381ebe
...
...
@@ -48,21 +48,21 @@ namespace Dumux {
template
<
class
TypeTag
>
class
FVProblem
{
using
Implementation
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
;
using
PrimaryVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
PrimaryVariables
)
;
using
NumEqVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
FVGridGeometry
=
typename
GET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
;
using
FVElementGeometry
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
LocalView
;
using
Implementation
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
using
GridView
=
GetPropType
<
TypeTag
,
Properties
::
GridView
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
;
using
FVElementGeometry
=
typename
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
using
BoundaryTypes
=
typename
GET_PROP_TYPE
(
TypeTag
,
BoundaryTypes
)
;
using
PointSource
=
typename
GET_PROP_TYPE
(
TypeTag
,
PointSource
)
;
using
PointSourceHelper
=
typename
GET_PROP_TYPE
(
TypeTag
,
PointSourceHelper
)
;
using
SolutionVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
SolutionVector
)
;
using
VolumeVariables
=
typename
GET_PROP_TYPE
(
TypeTag
,
VolumeVariables
)
;
using
ElementVolumeVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
::
LocalView
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
PointSource
=
GetPropType
<
TypeTag
,
Properties
::
PointSource
>
;
using
PointSourceHelper
=
GetPropType
<
TypeTag
,
Properties
::
PointSourceHelper
>
;
using
SolutionVector
=
GetPropType
<
TypeTag
,
Properties
::
SolutionVector
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
ElementVolumeVariables
=
typename
G
etPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>
::
LocalView
;
enum
{
dim
=
GridView
::
dimension
...
...
@@ -71,8 +71,8 @@ class FVProblem
using
Element
=
typename
GridView
::
template
Codim
<
0
>
::
Entity
;
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
static
constexpr
bool
isBox
=
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
discMethod
==
DiscretizationMethod
::
box
;
static
constexpr
bool
isStaggered
=
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
discMethod
==
DiscretizationMethod
::
staggered
;
static
constexpr
bool
isBox
=
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
discMethod
==
DiscretizationMethod
::
box
;
static
constexpr
bool
isStaggered
=
G
etPropType
<
TypeTag
,
Properties
::
FVGridGeometry
>
::
discMethod
==
DiscretizationMethod
::
staggered
;
using
PointSourceMap
=
std
::
map
<
std
::
pair
<
std
::
size_t
,
std
::
size_t
>
,
std
::
vector
<
PointSource
>
>
;
...
...
dumux/common/pointsource.hh
View file @
e0381ebe
...
...
@@ -203,15 +203,15 @@ private:
* \brief A point source class for time dependent point sources
*/
template
<
class
TypeTag
>
class
SolDependentPointSource
:
public
PointSource
<
Dune
::
FieldVector
<
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridView
)
::
ctype
,
G
ET_PROP_TYPE
(
TypeTag
,
GridView
)
::
dimensionworld
>
,
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
>
class
SolDependentPointSource
:
public
PointSource
<
Dune
::
FieldVector
<
typename
G
etPropType
<
TypeTag
,
Properties
::
GridView
>
::
ctype
,
G
etPropType
<
TypeTag
,
Properties
::
GridView
>
::
dimensionworld
>
,
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
>
{
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
;
using
SourceValues
=
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
;
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
;
using
ElementVolumeVariables
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
GridVolumeVariables
)
::
LocalView
;
using
FVElementGeometry
=
typename
G
ET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
)
::
LocalView
;
using
GridView
=
GetPropType
<
TypeTag
,
Properties
::
GridView
>
;
using
SourceValues
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;