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
c2be0703
Commit
c2be0703
authored
Jan 04, 2018
by
Timo Koch
Browse files
[cleanup] Use constexpr bool for use moles
parent
f6c53701
Changes
13
Hide whitespace changes
Inline
Side-by-side
dumux/porousmediumflow/1pnc/volumevariables.hh
View file @
c2be0703
...
...
@@ -78,7 +78,7 @@ class OnePNCVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
};
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
int
dim
=
GridView
::
dimension
;
static
const
int
dimWorld
=
GridView
::
dimensionworld
;
...
...
dumux/porousmediumflow/3pwateroil/localresidual.hh
View file @
c2be0703
...
...
@@ -77,7 +77,7 @@ protected:
};
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
public:
using
ParentType
::
ParentType
;
...
...
dumux/porousmediumflow/co2/volumevariables.hh
View file @
c2be0703
...
...
@@ -82,7 +82,7 @@ class TwoPTwoCCO2VolumeVariables : public TwoPTwoCVolumeVariables<TypeTag>
pressureIdx
=
Indices
::
pressureIdx
};
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
public:
//! The type of the object returned by the fluidState() method
...
...
dumux/porousmediumflow/richardsnc/volumevariables.hh
View file @
c2be0703
...
...
@@ -330,7 +330,7 @@ class RichardsNCVolumeVariables : public RichardsBaseVolumeVariables<TypeTag>
pressureIdx
=
Indices
::
pressureIdx
};
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
int
dim
=
GridView
::
dimension
;
static
const
int
dimWorld
=
GridView
::
dimensionworld
;
static
const
int
numComponents
=
GET_PROP_VALUE
(
TypeTag
,
NumComponents
);
...
...
test/porousmediumflow/1pnc/implicit/1p2cniconductionproblem.hh
View file @
c2be0703
...
...
@@ -134,7 +134,7 @@ class OnePTwoCNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
};
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
auto
phaseIdx
=
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
);
static
const
bool
isBox
=
GET_PROP_VALUE
(
TypeTag
,
DiscretizationMethod
)
==
DiscretizationMethods
::
Box
;
...
...
test/porousmediumflow/1pnc/implicit/1p2cniconvectionproblem.hh
View file @
c2be0703
...
...
@@ -134,7 +134,7 @@ class OnePTwoCNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
};
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
auto
phaseIdx
=
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
);
static
const
bool
isBox
=
GET_PROP_VALUE
(
TypeTag
,
DiscretizationMethod
)
==
DiscretizationMethods
::
Box
;
...
...
test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
View file @
c2be0703
...
...
@@ -129,7 +129,7 @@ class OnePTwoCTestProblem : public PorousMediumFlowProblem<TypeTag>
};
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
auto
phaseIdx
=
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
);
static
const
bool
isBox
=
GET_PROP_VALUE
(
TypeTag
,
DiscretizationMethod
)
==
DiscretizationMethods
::
Box
;
...
...
test/porousmediumflow/2p2c/implicit/waterairproblem.hh
View file @
c2be0703
...
...
@@ -143,7 +143,7 @@ class WaterAirProblem : public PorousMediumFlowProblem<TypeTag>
using
GlobalPosition
=
Dune
::
FieldVector
<
Scalar
,
dimWorld
>
;
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
public:
/*!
...
...
test/porousmediumflow/2pnc/implicit/2pncdiffusion.hh
View file @
c2be0703
...
...
@@ -108,7 +108,7 @@ class TwoPNCDiffusionProblem : public PorousMediumFlowProblem<TypeTag>
using
FVGridGeometry
=
typename
GET_PROP_TYPE
(
TypeTag
,
FVGridGeometry
);
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
public:
/*!
...
...
test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
View file @
c2be0703
...
...
@@ -168,7 +168,7 @@ class HeterogeneousProblem : public PorousMediumFlowProblem<TypeTag>
using
CO2
=
Dumux
::
CO2
<
Scalar
,
HeterogeneousCO2Tables
::
CO2Tables
>
;
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
// the discretization method we are using
static
constexpr
auto
discMethod
=
GET_PROP_VALUE
(
TypeTag
,
DiscretizationMethod
);
...
...
test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
View file @
c2be0703
...
...
@@ -146,7 +146,7 @@ class TracerTestProblem : public PorousMediumFlowProblem<TypeTag>
using
SpatialParams
=
typename
GET_PROP_TYPE
(
TypeTag
,
SpatialParams
);
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
int
dimWorld
=
GridView
::
dimensionworld
;
using
GlobalPosition
=
Dune
::
FieldVector
<
Scalar
,
dimWorld
>
;
...
...
test/porousmediumflow/tracer/constvel/tracertestproblem.hh
View file @
c2be0703
...
...
@@ -168,7 +168,7 @@ class TracerTest : public PorousMediumFlowProblem<TypeTag>
using
SpatialParams
=
typename
GET_PROP_TYPE
(
TypeTag
,
SpatialParams
);
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
int
dimWorld
=
GridView
::
dimensionworld
;
using
GlobalPosition
=
Dune
::
FieldVector
<
Scalar
,
dimWorld
>
;
...
...
test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh
View file @
c2be0703
...
...
@@ -188,7 +188,7 @@ class MaxwellStefanTestProblem : public PorousMediumFlowProblem<TypeTag>
using
ElementSolutionVector
=
typename
GET_PROP_TYPE
(
TypeTag
,
ElementSolutionVector
);
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
expr
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
static
const
int
dimWorld
=
GridView
::
dimensionworld
;
using
GlobalPosition
=
Dune
::
FieldVector
<
Scalar
,
dimWorld
>
;
...
...
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