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
323024b1
Commit
323024b1
authored
Jan 09, 2017
by
Timo Koch
Browse files
[1p][2p][2pnc] Get perm type from spatial params
parent
40ab1e09
Changes
3
Hide whitespace changes
Inline
Side-by-side
dumux/porousmediumflow/1p/implicit/volumevariables.hh
View file @
323024b1
...
...
@@ -45,6 +45,8 @@ class OnePVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using
Implementation
=
typename
GET_PROP_TYPE
(
TypeTag
,
VolumeVariables
);
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
);
using
SpatialParams
=
typename
GET_PROP_TYPE
(
TypeTag
,
SpatialParams
);
using
PermeabilityType
=
typename
SpatialParams
::
PermeabilityType
;
using
FVElementGeometry
=
typename
GET_PROP_TYPE
(
TypeTag
,
FVElementGeometry
);
using
SubControlVolume
=
typename
GET_PROP_TYPE
(
TypeTag
,
SubControlVolume
);
using
ElementSolutionVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
ElementSolutionVector
);
...
...
@@ -58,7 +60,6 @@ class OnePVolumeVariables : public ImplicitVolumeVariables<TypeTag>
public:
using
FluidState
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
typename
ParentType
::
PermeabilityType
;
/*!
* \copydoc ImplicitVolumeVariables::update
...
...
dumux/porousmediumflow/2p/implicit/volumevariables.hh
View file @
323024b1
...
...
@@ -47,6 +47,8 @@ class TwoPVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using
Implementation
=
typename
GET_PROP_TYPE
(
TypeTag
,
VolumeVariables
);
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
);
using
SpatialParams
=
typename
GET_PROP_TYPE
(
TypeTag
,
SpatialParams
);
using
PermeabilityType
=
typename
SpatialParams
::
PermeabilityType
;
using
Indices
=
typename
GET_PROP_TYPE
(
TypeTag
,
Indices
);
using
FluidSystem
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidSystem
);
using
MaterialLaw
=
typename
GET_PROP_TYPE
(
TypeTag
,
MaterialLaw
);
...
...
@@ -74,7 +76,6 @@ class TwoPVolumeVariables : public ImplicitVolumeVariables<TypeTag>
public:
// export type of fluid state for non-isothermal models
using
FluidState
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
typename
ParentType
::
PermeabilityType
;
/*!
* \copydoc ImplicitVolumeVariables::update
...
...
dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
View file @
323024b1
...
...
@@ -56,6 +56,7 @@ class TwoPNCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
);
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
);
using
SpatialParams
=
typename
GET_PROP_TYPE
(
TypeTag
,
SpatialParams
);
using
PermeabilityType
=
typename
SpatialParams
::
PermeabilityType
;
using
FVElementGeometry
=
typename
GET_PROP_TYPE
(
TypeTag
,
FVElementGeometry
);
using
SubControlVolume
=
typename
GET_PROP_TYPE
(
TypeTag
,
SubControlVolume
);
using
ElementSolutionVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
ElementSolutionVector
);
...
...
@@ -108,7 +109,6 @@ class TwoPNCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
public:
using
FluidState
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
PermeabilityType
=
typename
SpatialParams
::
PermeabilityType
;
/*!
* \copydoc ImplicitVolumeVariables::update
...
...
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