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
c1660c75
Commit
c1660c75
authored
Jul 23, 2018
by
Kilian Weishaupt
Browse files
Merge branch 'fix/remove-phase-idx' into 'master'
Fix/remove phase idx Closes
#529
See merge request
!1125
parents
d6659eef
89e2a70c
Changes
20
Hide whitespace changes
Inline
Side-by-side
dumux/common/properties.hh
View file @
c1660c75
...
...
@@ -103,7 +103,6 @@ NEW_PROP_TAG(SolutionDependentMolecularDiffusion); //!< specifies if the paramet
NEW_PROP_TAG
(
HeatConductionType
);
//!< The type for the calculation of the heat conduction fluxes
NEW_PROP_TAG
(
SolutionDependentHeatConduction
);
//!< specifies if the parameters for the heat conduction fluxes depend on the solution
NEW_PROP_TAG
(
PhaseIdx
);
//!< A phase index to allow using a two-phase fluidsystem for one-phase models
NEW_PROP_TAG
(
SpatialParams
);
//!< The type of the spatial parameters object
NEW_PROP_TAG
(
FluidSystem
);
//!< The type of the fluid system to use
NEW_PROP_TAG
(
FluidState
);
//!< The type of the fluid state to use
...
...
dumux/freeflow/compositional/kepsilonncmodel.hh
View file @
c1660c75
...
...
@@ -94,6 +94,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NCVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
@@ -161,6 +166,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NCVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
dumux/freeflow/compositional/komegancmodel.hh
View file @
c1660c75
...
...
@@ -99,6 +99,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NCVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
@@ -166,6 +171,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NCVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
dumux/freeflow/compositional/lowrekepsilonncmodel.hh
View file @
c1660c75
...
...
@@ -99,6 +99,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NCVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
@@ -166,6 +171,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NCVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
dumux/freeflow/compositional/navierstokesncmodel.hh
View file @
c1660c75
...
...
@@ -155,6 +155,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
public:
using
type
=
FreeflowNCVolumeVariables
<
Traits
>
;
...
...
dumux/freeflow/compositional/oneeqncmodel.hh
View file @
c1660c75
...
...
@@ -99,6 +99,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NCVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
@@ -166,6 +171,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NCVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
dumux/freeflow/compositional/zeroeqncmodel.hh
View file @
c1660c75
...
...
@@ -87,6 +87,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
CompositionalVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
@@ -136,6 +141,11 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NCVolVars
=
FreeflowNCVolumeVariables
<
Traits
>
;
public:
...
...
dumux/freeflow/navierstokes/model.hh
View file @
c1660c75
...
...
@@ -145,7 +145,6 @@ NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes));
///////////////////////////////////////////////////////////////////////////
// default property values for the isothermal single phase model
///////////////////////////////////////////////////////////////////////////
SET_INT_PROP
(
NavierStokes
,
PhaseIdx
,
0
);
//!< The default phase index
SET_BOOL_PROP
(
NavierStokes
,
EnableInertiaTerms
,
true
);
//!< Consider inertia terms by default
SET_BOOL_PROP
(
NavierStokes
,
NormalizePressure
,
true
);
//!< Normalize the pressure term in the momentum balance by default
...
...
@@ -185,8 +184,9 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
public:
...
...
dumux/freeflow/properties.hh
View file @
c1660c75
...
...
@@ -30,10 +30,9 @@
#include
<dumux/common/properties/model.hh>
#include
<dumux/discretization/fourierslaw.hh>
namespace
Dumux
{
namespace
Properties
{
namespace
Dumux
{
namespace
Properties
{
//! Type tag for free-flow models
NEW_TYPE_TAG
(
FreeFlow
,
INHERITS_FROM
(
ModelProperties
));
...
...
dumux/freeflow/rans/oneeq/model.hh
View file @
c1660c75
...
...
@@ -158,6 +158,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
@@ -200,6 +204,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
dumux/freeflow/rans/twoeq/kepsilon/model.hh
View file @
c1660c75
...
...
@@ -145,6 +145,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
@@ -187,6 +191,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
dumux/freeflow/rans/twoeq/komega/model.hh
View file @
c1660c75
...
...
@@ -152,6 +152,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
@@ -195,6 +199,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
View file @
c1660c75
...
...
@@ -161,6 +161,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
@@ -203,6 +207,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
dumux/freeflow/rans/zeroeq/model.hh
View file @
c1660c75
...
...
@@ -62,6 +62,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
@@ -84,6 +88,10 @@ private:
using
FST
=
typename
GET_PROP_TYPE
(
TypeTag
,
FluidState
);
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
static_assert
(
!
FSY
::
isMiscible
(),
"The Navier-Stokes model only works with immiscible fluid systems."
);
using
Traits
=
NavierStokesVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
MT
>
;
using
NSVolVars
=
NavierStokesVolumeVariables
<
Traits
>
;
public:
...
...
dumux/porousmediumflow/1pncmin/model.hh
View file @
c1660c75
...
...
@@ -82,10 +82,8 @@ v = - \frac{k_{r}}{\mu} \mbox{\bf K}
#include
<dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh>
#include
<dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
namespace
Dumux
{
namespace
Properties
{
namespace
Dumux
{
namespace
Properties
{
//////////////////////////////////////////////////////////////////
// Type tags
//////////////////////////////////////////////////////////////////
...
...
@@ -108,6 +106,11 @@ private:
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
using
PT
=
typename
GET_PROP_TYPE
(
TypeTag
,
SpatialParams
)
::
PermeabilityType
;
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
OnePNCVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
SSY
,
SST
,
PT
,
MT
>
;
using
NonMinVolVars
=
OnePNCVolumeVariables
<
Traits
>
;
public:
...
...
dumux/porousmediumflow/richardsnc/model.hh
View file @
c1660c75
...
...
@@ -141,9 +141,6 @@ public:
using
type
=
RichardsNCModelTraits
<
FluidSystem
::
numComponents
,
GET_PROP_VALUE
(
TypeTag
,
UseMoles
),
GET_PROP_VALUE
(
TypeTag
,
ReplaceCompEqIdx
)
>
;
};
//! The default phase index to access the fluid system
SET_INT_PROP
(
RichardsNC
,
PhaseIdx
,
0
);
//! Define that per default mole fractions are used in the balance equations
SET_BOOL_PROP
(
RichardsNC
,
UseMoles
,
true
);
...
...
@@ -166,6 +163,11 @@ private:
using
MT
=
typename
GET_PROP_TYPE
(
TypeTag
,
ModelTraits
);
using
PT
=
typename
GET_PROP_TYPE
(
TypeTag
,
SpatialParams
)
::
PermeabilityType
;
static_assert
(
FSY
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid system"
);
static_assert
(
FST
::
numComponents
==
MT
::
numComponents
(),
"Number of components mismatch between model and fluid state"
);
static_assert
(
FSY
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid system"
);
static_assert
(
FST
::
numPhases
==
MT
::
numPhases
(),
"Number of phases mismatch between model and fluid state"
);
using
Traits
=
RichardsVolumeVariablesTraits
<
PV
,
FSY
,
FST
,
SSY
,
SST
,
PT
,
MT
>
;
public:
using
type
=
RichardsNCVolumeVariables
<
Traits
>
;
...
...
test/freeflow/navierstokesnc/channeltestproblem.hh
View file @
c1660c75
...
...
@@ -28,19 +28,19 @@
#include
<dumux/material/components/simpleh2o.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/compositional/navierstokesncmodel.hh>
namespace
Dumux
{
namespace
Dumux
{
template
<
class
TypeTag
>
class
ChannelNCTestProblem
;
namespace
Properties
{
namespace
Properties
{
#if !NONISOTHERMAL
NEW_TYPE_TAG
(
ChannelNCTestTypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
));
...
...
@@ -48,16 +48,15 @@ NEW_TYPE_TAG(ChannelNCTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierS
NEW_TYPE_TAG
(
ChannelNCTestTypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNCNI
));
#endif
NEW_PROP_TAG
(
FluidSystem
);
// Select the fluid system
SET_TYPE_PROP
(
ChannelNCTestTypeTag
,
FluidSystem
,
FluidSystems
::
H2OAir
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
);
SET_INT_PROP
(
ChannelNCTestTypeTag
,
PhaseIdx
,
GET_PROP_TYPE
(
TypeTag
,
FluidSystem
)
::
liquidPhaseIdx
);
SET_PROP
(
ChannelNCTestTypeTag
,
FluidSystem
)
{
using
H2OAir
=
FluidSystems
::
H2OAir
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
;
static
constexpr
int
phaseIdx
=
H2OAir
::
liquidPhaseIdx
;
using
type
=
FluidSystems
::
OnePAdapter
<
H2OAir
,
phaseIdx
>
;
};
SET_INT_PROP
(
ChannelNCTestTypeTag
,
ReplaceCompEqIdx
,
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
)
);
SET_INT_PROP
(
ChannelNCTestTypeTag
,
ReplaceCompEqIdx
,
0
);
// Set the grid type
SET_TYPE_PROP
(
ChannelNCTestTypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
...
...
test/freeflow/navierstokesnc/densityflowproblem.hh
View file @
c1660c75
...
...
@@ -28,31 +28,31 @@
#include
<dumux/material/components/simpleh2o.hh>
#include
<dumux/material/fluidsystems/h2oair.hh>
#include
<dumux/material/fluidsystems/1padapter.hh>
#include
<dumux/discretization/staggered/freeflow/properties.hh>
#include
<dumux/freeflow/compositional/navierstokesncmodel.hh>
#include
<dumux/freeflow/navierstokes/problem.hh>
namespace
Dumux
{
namespace
Dumux
{
template
<
class
TypeTag
>
class
DensityDrivenFlowProblem
;
namespace
Properties
{
NEW_TYPE_TAG
(
DensityDrivenFlowTypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
));
namespace
Properties
{
NEW_
PROP
_TAG
(
FluidSystem
);
NEW_
TYPE
_TAG
(
DensityDrivenFlowTypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
)
);
// Select the fluid system
SET_TYPE_PROP
(
DensityDrivenFlowTypeTag
,
FluidSystem
,
FluidSystems
::
H2OAir
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
);
SET_INT_PROP
(
DensityDrivenFlowTypeTag
,
PhaseIdx
,
GET_PROP_TYPE
(
TypeTag
,
FluidSystem
)
::
liquidPhaseIdx
);
SET_PROP
(
DensityDrivenFlowTypeTag
,
FluidSystem
)
{
using
H2OAir
=
FluidSystems
::
H2OAir
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
>
;
static
constexpr
int
phaseIdx
=
H2OAir
::
liquidPhaseIdx
;
using
type
=
FluidSystems
::
OnePAdapter
<
H2OAir
,
phaseIdx
>
;
};
SET_INT_PROP
(
DensityDrivenFlowTypeTag
,
ReplaceCompEqIdx
,
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
)
);
SET_INT_PROP
(
DensityDrivenFlowTypeTag
,
ReplaceCompEqIdx
,
0
);
// Set the grid type
SET_TYPE_PROP
(
DensityDrivenFlowTypeTag
,
Grid
,
Dune
::
YaspGrid
<
2
>
);
...
...
test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
View file @
c1660c75
...
...
@@ -46,8 +46,6 @@ namespace Properties {
NEW_TYPE_TAG
(
MaxwellStefanNCTestTypeTag
,
INHERITS_FROM
(
StaggeredFreeFlowModel
,
NavierStokesNC
));
NEW_PROP_TAG
(
FluidSystem
);
SET_INT_PROP
(
MaxwellStefanNCTestTypeTag
,
ReplaceCompEqIdx
,
0
);
// Set the grid type
...
...
@@ -76,7 +74,8 @@ SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, MolecularDiffusionType, MaxwellStefans
* \todo doc me!
*/
template
<
class
TypeTag
>
class
MaxwellStefanFluidSystem
:
public
FluidSystems
::
BaseFluidSystem
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
MaxwellStefanFluidSystem
<
TypeTag
>>
class
MaxwellStefanFluidSystem
:
public
FluidSystems
::
BaseFluidSystem
<
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
),
MaxwellStefanFluidSystem
<
TypeTag
>>
{
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
...
...
test/freeflow/rans/pipelauferproblem.hh
View file @
c1660c75
...
...
@@ -141,7 +141,6 @@ class PipeLauferProblem : public ZeroEqProblem<TypeTag>
using
TimeLoopPtr
=
std
::
shared_ptr
<
CheckPointTimeLoop
<
Scalar
>>
;
static
const
unsigned
int
phaseIdx
=
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
);
static
constexpr
auto
dimWorld
=
FVGridGeometry
::
GridView
::
dimensionworld
;
public:
...
...
@@ -161,10 +160,10 @@ public:
FluidSystem
::
init
();
Dumux
::
TurbulenceProperties
<
Scalar
,
dimWorld
,
true
>
turbulenceProperties
;
FluidState
fluidState
;
fluidState
.
setPressure
(
phaseIdx
,
1e5
);
fluidState
.
setPressure
(
0
,
1e5
);
fluidState
.
setTemperature
(
inletTemperature_
);
Scalar
density
=
FluidSystem
::
density
(
fluidState
,
phaseIdx
);
Scalar
kinematicViscosity
=
FluidSystem
::
viscosity
(
fluidState
,
phaseIdx
)
/
density
;
Scalar
density
=
FluidSystem
::
density
(
fluidState
,
0
);
Scalar
kinematicViscosity
=
FluidSystem
::
viscosity
(
fluidState
,
0
)
/
density
;
Scalar
diameter
=
this
->
fvGridGeometry
().
bBoxMax
()[
1
]
-
this
->
fvGridGeometry
().
bBoxMin
()[
1
];
// ideally the viscosityTilde parameter as inflow for the Spalart-Allmaras model should be zero
viscosityTilde_
=
getParam
<
Scalar
>
(
"Problem.InletViscosityTilde"
,
...
...
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