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
f073736c
Commit
f073736c
authored
Apr 11, 2018
by
Timo Koch
Browse files
[cleanup] Remove numMajorComp->numPhases and numSecComp->numComp-numPhases
parent
cfa58d0f
Changes
8
Hide whitespace changes
Inline
Side-by-side
dumux/common/properties.hh
View file @
f073736c
...
...
@@ -128,7 +128,6 @@ NEW_PROP_TAG(EvaluatePermeabilityAtScvfIP);
// Additional properties used by the 2pnc and 2pncmin models:
//////////////////////////////////////////////////////////////
NEW_PROP_TAG
(
Chemistry
);
//!< The chemistry class with which solves equlibrium reactions
NEW_PROP_TAG
(
NumMajorComponents
);
//!< Number of major fluid components which are considered in the calculation of the phase density
NEW_PROP_TAG
(
SetMoleFractionsForWettingPhase
);
//!< Set the mole fraction in the wetting or non-wetting phase
//////////////////////////////////////////////////////////////
...
...
dumux/material/fluidsystems/brineair.hh
View file @
f073736c
...
...
@@ -74,7 +74,6 @@ public:
/****************************************
* Fluid phase related static parameters
****************************************/
static
const
int
numSecComponents
=
0
;
//needed to set property not used for 2pncMin model
static
const
int
numPhases
=
2
;
// liquid and gas phases
static
const
int
numSPhases
=
1
;
// precipitated solid phases
static
const
int
lPhaseIdx
=
0
;
// index of the liquid phase
...
...
@@ -185,7 +184,6 @@ public:
* Component related static parameters
****************************************/
static
const
int
numComponents
=
3
;
// H2O, Air, NaCl
static
const
int
numMajorComponents
=
2
;
// H2O, Air
static
const
int
H2OIdx
=
wCompIdx
;
//0
static
const
int
AirIdx
=
nCompIdx
;
//1
...
...
dumux/material/fluidsystems/h2on2o2.hh
View file @
f073736c
...
...
@@ -180,9 +180,6 @@ public:
//! Number of components in the fluid system
static
constexpr
int
numComponents
=
3
;
// There are no secondary components (still 2pNc model needs this parameter)
static
const
int
numSecComponents
=
1
;
static
const
int
numMajorComponents
=
2
;
static
constexpr
int
H2OIdx
=
0
;
//first major component
static
constexpr
int
N2Idx
=
1
;
//second major component
...
...
dumux/material/fluidsystems/steamn2cao2h2.hh
View file @
f073736c
...
...
@@ -39,10 +39,9 @@
#include
<dumux/material/binarycoefficients/h2o_n2.hh>
#include
<dumux/material/components/tabulatedcomponent.hh>
namespace
Dumux
{
namespace
FluidSystems
{
namespace
Dumux
{
namespace
FluidSystems
{
/*!
* \ingroup Fluidsystems
*
...
...
@@ -181,7 +180,6 @@ public:
****************************************/
static
const
int
numComponents
=
2
;
// H2O, Air
static
const
int
numMajorComponents
=
2
;
// H2O, Air
static
const
int
numSComponents
=
2
;
// CaO2H2, CaO
...
...
dumux/porousmediumflow/2pnc/model.hh
View file @
f073736c
...
...
@@ -124,7 +124,6 @@ struct TwoPNCModelTraits
static
constexpr
int
numEq
()
{
return
nComp
;
}
static
constexpr
int
numPhases
()
{
return
2
;
}
static
constexpr
int
numComponents
()
{
return
nComp
;
}
static
constexpr
int
numMajorComponents
()
{
return
2
;
}
static
constexpr
bool
enableAdvection
()
{
return
true
;
}
static
constexpr
bool
enableMolecularDiffusion
()
{
return
true
;
}
...
...
dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
View file @
f073736c
...
...
@@ -51,7 +51,7 @@ class TwoPNCPrimaryVariableSwitch
using
Indices
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
Indices
;
static
const
int
numComponents
=
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
numComponents
();
static
const
int
numMajorComponents
=
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
num
MajorComponent
s
();
static
const
int
numMajorComponents
=
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
)
::
num
Phase
s
();
enum
{
...
...
dumux/porousmediumflow/2pnc/volumevariables.hh
View file @
f073736c
...
...
@@ -60,7 +60,7 @@ class TwoPNCVolumeVariables
{
numPhases
=
Traits
::
ModelTraits
::
numPhases
(),
numComponents
=
Traits
::
ModelTraits
::
numComponents
(),
numMajorComponents
=
Traits
::
ModelTraits
::
num
MajorComponent
s
(),
numMajorComponents
=
Traits
::
ModelTraits
::
num
Phase
s
(),
// phase indices
wPhaseIdx
=
FS
::
wPhaseIdx
,
...
...
test/porousmediumflow/1pncmin/implicit/modifiedsteamn2cao2h2.hh
View file @
f073736c
...
...
@@ -42,10 +42,9 @@
// we use a modified implementation of the CaO component
#include
"modifiedcao.hh"
namespace
Dumux
{
namespace
FluidSystems
{
namespace
Dumux
{
namespace
FluidSystems
{
/*!
* \ingroup OnePNCMinTests
*
...
...
@@ -178,7 +177,6 @@ public:
****************************************/
static
const
int
numComponents
=
2
;
// H2O, Air
static
const
int
numMajorComponents
=
2
;
// H2O, Air
static
const
int
numSComponents
=
2
;
// CaO2H2, CaO
...
...
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