Skip to content
GitLab
Menu
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-course
Commits
0b722bd4
Commit
0b722bd4
authored
Jul 16, 2018
by
Melanie Lipp
Browse files
Sustitute useComplexRelations with fluid system policies.
parent
378b5f51
Changes
8
Hide whitespace changes
Inline
Side-by-side
exercises/exercise-basic/injection2p2cproblem.hh
View file @
0b722bd4
...
...
@@ -53,7 +53,7 @@ SET_TYPE_PROP(Injection2p2cTypeTag, SpatialParams,
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
);
// Set fluid configuration
SET_TYPE_PROP
(
Injection2p2cTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
/*useComplex
Relations=*/
false
>
);
SET_TYPE_PROP
(
Injection2p2cTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplified
Relations=*/
true
>
>
);
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP
(
Injection2p2cTypeTag
,
UseMoles
,
true
);
...
...
exercises/exercise-basic/injection2pproblem.hh
View file @
0b722bd4
...
...
@@ -55,7 +55,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
);
// Set fluid configuration
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
/*useComplex
Relations=*/
false
>
);
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplified
Relations=*/
true
>
>
);
}
// end namespace Properties
/*!
...
...
exercises/exercise-grids/injection2pproblem.hh
View file @
0b722bd4
...
...
@@ -58,7 +58,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
);
// Set fluid configuration
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
/*useComplex
Relations=*/
false
>
);
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplified
Relations=*/
true
>
>
);
}
// end namespace Properties
/*!
...
...
exercises/exercise-properties/injection2p2cproblem.hh
View file @
0b722bd4
...
...
@@ -62,7 +62,7 @@ SET_TYPE_PROP(Injection2p2cTypeTag, SpatialParams,
// Set fluid configuration
SET_TYPE_PROP
(
Injection2p2cTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
false
/*useComplex
Relations*/
>
);
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplified
Relations
=
*/
true
>
>
);
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP
(
Injection2p2cTypeTag
,
UseMoles
,
true
);
...
...
exercises/exercise-runtimeparams/injection2pproblem.hh
View file @
0b722bd4
...
...
@@ -55,7 +55,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
);
// Set fluid configuration
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
/*useComplex
Relations=*/
fals
e
>
);
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplified
Relations=*/
tru
e
>
);
}
// end namespace Properties
/*!
...
...
exercises/solution/ex2/injection2p2cproblem.hh
View file @
0b722bd4
...
...
@@ -60,7 +60,7 @@ SET_TYPE_PROP(Injection2p2cTypeTag, LocalResidual, MyCompositionalLocalResidual<
// Set fluid configuration
SET_TYPE_PROP
(
Injection2p2cTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
false
/*useComplex
Relations*/
>
);
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplified
Relations
=
*/
true
>
>
);
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP
(
Injection2p2cTypeTag
,
UseMoles
,
true
);
...
...
exercises/solution/exercise-grids/injection2pproblem.hh
View file @
0b722bd4
...
...
@@ -63,7 +63,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
);
// Set fluid configuration
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
/*useComplex
Relations=*/
false
>
);
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplified
Relations=*/
true
>
>
);
}
// end namespace Properties
/*!
...
...
exercises/solution/exercise-runtimeparams/injection2pproblem.hh
View file @
0b722bd4
...
...
@@ -55,7 +55,7 @@ SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
);
// Set fluid configuration
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
/*useComplex
Relations=*/
false
>
);
SET_TYPE_PROP
(
Injection2pTypeTag
,
FluidSystem
,
FluidSystems
::
H2ON2
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
FluidSystems
::
H2ON2DefaultPolicy
<
/*fastButSimplified
Relations=*/
true
>
>
);
}
// end namespace Properties
/*!
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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