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
Commits
89e2a70c
Commit
89e2a70c
authored
Jul 20, 2018
by
Timo Koch
Browse files
Remove property PhaseIdx
parent
50117b37
Changes
4
Hide whitespace changes
Inline
Side-by-side
dumux/common/properties.hh
View file @
89e2a70c
...
...
@@ -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/navierstokes/model.hh
View file @
89e2a70c
...
...
@@ -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
...
...
dumux/freeflow/properties.hh
View file @
89e2a70c
...
...
@@ -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
));
...
...
test/freeflow/rans/pipelauferproblem.hh
View file @
89e2a70c
...
...
@@ -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
.
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