Commit 89e2a70c authored by Timo Koch's avatar Timo Koch
Browse files

Remove property PhaseIdx

parent 50117b37
...@@ -103,7 +103,6 @@ NEW_PROP_TAG(SolutionDependentMolecularDiffusion); //!< specifies if the paramet ...@@ -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(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(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(SpatialParams); //!< The type of the spatial parameters object
NEW_PROP_TAG(FluidSystem); //!< The type of the fluid system to use NEW_PROP_TAG(FluidSystem); //!< The type of the fluid system to use
NEW_PROP_TAG(FluidState); //!< The type of the fluid state to use NEW_PROP_TAG(FluidState); //!< The type of the fluid state to use
......
...@@ -145,7 +145,6 @@ NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes)); ...@@ -145,7 +145,6 @@ NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes));
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// default property values for the isothermal single phase model // 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, EnableInertiaTerms, true); //!< Consider inertia terms by default
SET_BOOL_PROP(NavierStokes, NormalizePressure, true); //!< Normalize the pressure term in the momentum balance by default SET_BOOL_PROP(NavierStokes, NormalizePressure, true); //!< Normalize the pressure term in the momentum balance by default
......
...@@ -30,10 +30,9 @@ ...@@ -30,10 +30,9 @@
#include <dumux/common/properties/model.hh> #include <dumux/common/properties/model.hh>
#include <dumux/discretization/fourierslaw.hh> #include <dumux/discretization/fourierslaw.hh>
namespace Dumux namespace Dumux {
{ namespace Properties {
namespace Properties
{
//! Type tag for free-flow models //! Type tag for free-flow models
NEW_TYPE_TAG(FreeFlow, INHERITS_FROM(ModelProperties)); NEW_TYPE_TAG(FreeFlow, INHERITS_FROM(ModelProperties));
......
...@@ -141,7 +141,6 @@ class PipeLauferProblem : public ZeroEqProblem<TypeTag> ...@@ -141,7 +141,6 @@ class PipeLauferProblem : public ZeroEqProblem<TypeTag>
using TimeLoopPtr = std::shared_ptr<CheckPointTimeLoop<Scalar>>; using TimeLoopPtr = std::shared_ptr<CheckPointTimeLoop<Scalar>>;
static const unsigned int phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx);
static constexpr auto dimWorld = FVGridGeometry::GridView::dimensionworld; static constexpr auto dimWorld = FVGridGeometry::GridView::dimensionworld;
public: public:
...@@ -161,10 +160,10 @@ public: ...@@ -161,10 +160,10 @@ public:
FluidSystem::init(); FluidSystem::init();
Dumux::TurbulenceProperties<Scalar, dimWorld, true> turbulenceProperties; Dumux::TurbulenceProperties<Scalar, dimWorld, true> turbulenceProperties;
FluidState fluidState; FluidState fluidState;
fluidState.setPressure(phaseIdx, 1e5); fluidState.setPressure(0, 1e5);
fluidState.setTemperature(inletTemperature_); fluidState.setTemperature(inletTemperature_);
Scalar density = FluidSystem::density(fluidState, phaseIdx); Scalar density = FluidSystem::density(fluidState, 0);
Scalar kinematicViscosity = FluidSystem::viscosity(fluidState, phaseIdx) / density; Scalar kinematicViscosity = FluidSystem::viscosity(fluidState, 0) / density;
Scalar diameter = this->fvGridGeometry().bBoxMax()[1] - this->fvGridGeometry().bBoxMin()[1]; Scalar diameter = this->fvGridGeometry().bBoxMax()[1] - this->fvGridGeometry().bBoxMin()[1];
// ideally the viscosityTilde parameter as inflow for the Spalart-Allmaras model should be zero // ideally the viscosityTilde parameter as inflow for the Spalart-Allmaras model should be zero
viscosityTilde_ = getParam<Scalar>("Problem.InletViscosityTilde", viscosityTilde_ = getParam<Scalar>("Problem.InletViscosityTilde",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment