Commit db2ce8d0 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

[propertysystem] replace macro GET_PROP_VALUE by getPropValue

parent e0381ebe
......@@ -266,7 +266,7 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tr
enum { numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq() };
enum { dim = GetPropType<TypeTag, Properties::GridView>::dimension };
static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache);
static constexpr bool enableGridFluxVarsCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
public:
......
......@@ -145,7 +145,7 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tru
using FluxStencil = Dumux::FluxStencil<FVElementGeometry>;
static constexpr int maxElementStencilSize = FVGridGeometry::maxElementStencilSize;
static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache);
static constexpr bool enableGridFluxVarsCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
public:
......
......@@ -285,11 +285,11 @@ protected:
const Implementation &asImp_() const
{ return *static_cast<const Implementation*>(this); }
template<class T = TypeTag, typename std::enable_if_t<!GET_PROP_VALUE(T, EnableGridVolumeVariablesCache), int> = 0>
template<class T = TypeTag, typename std::enable_if_t<!getPropValue<T, Properties::EnableGridVolumeVariablesCache>(), int> = 0>
VolumeVariables& getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
{ return elemVolVars[scv]; }
template<class T = TypeTag, typename std::enable_if_t<GET_PROP_VALUE(T, EnableGridVolumeVariablesCache), int> = 0>
template<class T = TypeTag, typename std::enable_if_t<getPropValue<T, Properties::EnableGridVolumeVariablesCache>(), int> = 0>
VolumeVariables& getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
{ return gridVolVars.volVars(scv); }
......
......@@ -69,8 +69,8 @@ class StaggeredFVProblem : public FVProblem<TypeTag>
static constexpr auto cellCenterIdx = FVGridGeometry::cellCenterIdx();
static constexpr auto faceIdx = FVGridGeometry::faceIdx();
static constexpr auto numEqCellCenter = GET_PROP_VALUE(TypeTag, NumEqCellCenter);
static constexpr auto numEqFace = GET_PROP_VALUE(TypeTag, NumEqFace);
static constexpr auto numEqCellCenter = getPropValue<TypeTag, Properties::NumEqCellCenter>();
static constexpr auto numEqFace = getPropValue<TypeTag, Properties::NumEqFace>();
public:
/*!
......
......@@ -64,7 +64,7 @@ class FouriersLawNonEquilibriumImplementation<TypeTag, DiscretizationMethod::box
enum { dim = GridView::dimension} ;
enum { dimWorld = GridView::dimensionworld} ;
enum { numPhases = GetPropType<TypeTag, Properties::ModelTraits>::numPhases()} ;
enum { numEnergyEqFluid = GET_PROP_VALUE(TypeTag, NumEnergyEqFluid) };
enum { numEnergyEqFluid = getPropValue<TypeTag, Properties::NumEnergyEqFluid>() };
enum {sPhaseIdx = FluidSystem::numPhases};
using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
......
......@@ -56,7 +56,7 @@ struct BoxModel { using InheritsFrom = std::tuple<FiniteVolumeModel>; };
SET_PROP(BoxModel, FVGridGeometry)
{
private:
static constexpr bool enableCache = GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache);
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableFVGridGeometryCache>();
using GridView = GetPropType<TypeTag, Properties::GridView>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
......@@ -67,7 +67,7 @@ public:
SET_PROP(BoxModel, GridVolumeVariables)
{
private:
static constexpr bool enableCache = GET_PROP_VALUE(TypeTag, EnableGridVolumeVariablesCache);
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridVolumeVariablesCache>();
using Problem = GetPropType<TypeTag, Properties::Problem>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
public:
......@@ -78,7 +78,7 @@ public:
SET_PROP(BoxModel, GridFluxVariablesCache)
{
private:
static constexpr bool enableCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache);
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
using Problem = GetPropType<TypeTag, Properties::Problem>;
using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>;
public:
......
......@@ -69,9 +69,9 @@ class CCMpfaFluxVariablesCacheFiller
static constexpr bool doDiffusion = ModelTraits::enableMolecularDiffusion();
static constexpr bool doHeatConduction = ModelTraits::enableEnergyBalance();
static constexpr bool soldependentAdvection = GET_PROP_VALUE(TypeTag, SolutionDependentAdvection);
static constexpr bool soldependentDiffusion = GET_PROP_VALUE(TypeTag, SolutionDependentMolecularDiffusion);
static constexpr bool soldependentHeatConduction = GET_PROP_VALUE(TypeTag, SolutionDependentHeatConduction);
static constexpr bool soldependentAdvection = getPropValue<TypeTag, Properties::SolutionDependentAdvection>();
static constexpr bool soldependentDiffusion = getPropValue<TypeTag, Properties::SolutionDependentMolecularDiffusion>();
static constexpr bool soldependentHeatConduction = getPropValue<TypeTag, Properties::SolutionDependentHeatConduction>();
public:
//! This cache filler is always solution-dependent, as it updates the
......
......@@ -98,14 +98,14 @@ private:
using NodalIndexSet = GetPropType<TypeTag, Properties::DualGridNodalIndexSet>;
using Traits = CCMpfaFVGridGeometryTraits<GridView, NodalIndexSet, PrimaryIV, SecondaryIV>;
public:
using type = CCMpfaFVGridGeometry<GridView, Traits, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>;
using type = CCMpfaFVGridGeometry<GridView, Traits, getPropValue<TypeTag, Properties::EnableFVGridGeometryCache>()>;
};
//! The grid volume variables vector class
SET_PROP(CCMpfaModel, GridVolumeVariables)
{
private:
static constexpr bool enableCache = GET_PROP_VALUE(TypeTag, EnableGridVolumeVariablesCache);
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridVolumeVariablesCache>();
using Problem = GetPropType<TypeTag, Properties::Problem>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
public:
......@@ -116,7 +116,7 @@ public:
SET_PROP(CCMpfaModel, GridFluxVariablesCache)
{
private:
static constexpr bool enableCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache);
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
using Problem = GetPropType<TypeTag, Properties::Problem>;
using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>;
using FluxVariablesCacheFiller = CCMpfaFluxVariablesCacheFiller<TypeTag>;
......
......@@ -51,9 +51,9 @@ class CCTpfaFluxVariablesCacheFiller
static constexpr bool doDiffusion = ModelTraits::enableMolecularDiffusion();
static constexpr bool doHeatConduction = ModelTraits::enableEnergyBalance();
static constexpr bool soldependentAdvection = GET_PROP_VALUE(TypeTag, SolutionDependentAdvection);
static constexpr bool soldependentDiffusion = GET_PROP_VALUE(TypeTag, SolutionDependentMolecularDiffusion);
static constexpr bool soldependentHeatConduction = GET_PROP_VALUE(TypeTag, SolutionDependentHeatConduction);
static constexpr bool soldependentAdvection = getPropValue<TypeTag, Properties::SolutionDependentAdvection>();
static constexpr bool soldependentDiffusion = getPropValue<TypeTag, Properties::SolutionDependentMolecularDiffusion>();
static constexpr bool soldependentHeatConduction = getPropValue<TypeTag, Properties::SolutionDependentHeatConduction>();
public:
static constexpr bool isSolDependent = (doAdvection && soldependentAdvection) ||
......
......@@ -55,7 +55,7 @@ struct CCTpfaModel { using InheritsFrom = std::tuple<FiniteVolumeModel>; };
SET_PROP(CCTpfaModel, FVGridGeometry)
{
private:
static constexpr bool enableCache = GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache);
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableFVGridGeometryCache>();
using GridView = GetPropType<TypeTag, Properties::GridView>;
public:
using type = CCTpfaFVGridGeometry<GridView, enableCache>;
......@@ -65,7 +65,7 @@ public:
SET_PROP(CCTpfaModel, GridVolumeVariables)
{
private:
static constexpr bool enableCache = GET_PROP_VALUE(TypeTag, EnableGridVolumeVariablesCache);
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridVolumeVariablesCache>();
using Problem = GetPropType<TypeTag, Properties::Problem>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
public:
......@@ -76,7 +76,7 @@ public:
SET_PROP(CCTpfaModel, GridFluxVariablesCache)
{
private:
static constexpr bool enableCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache);
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
using Problem = GetPropType<TypeTag, Properties::Problem>;
using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>;
using FluxVariablesCacheFiller = CCTpfaFluxVariablesCacheFiller<TypeTag>;
......
......@@ -65,7 +65,7 @@ class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethod::staggered >
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
static const int numComponents = ModelTraits::numComponents();
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
using ReducedComponentVector = Dune::FieldVector<Scalar, numComponents-1>;
using ReducedComponentMatrix = Dune::FieldMatrix<Scalar, numComponents-1, numComponents-1>;
......
......@@ -83,7 +83,7 @@ SET_PROP(StaggeredFreeFlowModel, FVGridGeometry)
private:
using GridView = GetPropType<TypeTag, Properties::GridView>;
using Traits = StaggeredFreeFlowDefaultFVGridGeometryTraits<GridView>;
static constexpr bool enableCache = GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache);
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableFVGridGeometryCache>();
public:
using type = StaggeredFVGridGeometry<GridView, enableCache, Traits>;
};
......@@ -104,7 +104,7 @@ SET_PROP(StaggeredFreeFlowModel, GridVolumeVariables)
private:
using Problem = GetPropType<TypeTag, Properties::Problem>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
static constexpr auto enableCache = GET_PROP_VALUE(TypeTag, EnableGridVolumeVariablesCache);
static constexpr auto enableCache = getPropValue<TypeTag, Properties::EnableGridVolumeVariablesCache>();
using Traits = StaggeredGridDefaultGridVolumeVariablesTraits<Problem, VolumeVariables>;
public:
using type = StaggeredGridVolumeVariables<Traits, enableCache>;
......
......@@ -67,7 +67,7 @@ SET_PROP(StaggeredModel, GridFaceVariables)
private:
using Problem = GetPropType<TypeTag, Properties::Problem>;
using FaceVariables = GetPropType<TypeTag, Properties::FaceVariables>;
static constexpr auto enableCache = GET_PROP_VALUE(TypeTag, EnableGridFaceVariablesCache);
static constexpr auto enableCache = getPropValue<TypeTag, Properties::EnableGridFaceVariablesCache>();
public:
using type = StaggeredGridFaceVariables<Problem, FaceVariables, enableCache>;
};
......@@ -79,7 +79,7 @@ SET_BOOL_PROP(StaggeredModel, EnableGridFaceVariablesCache, true);
SET_PROP(StaggeredModel, GridFluxVariablesCache)
{
private:
static constexpr auto enableCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache);
static constexpr auto enableCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
using Problem = GetPropType<TypeTag, Properties::Problem>;
using FluxVariablesCache = GetPropType<TypeTag, Properties::FluxVariablesCache>;
using FluxVariablesCacheFiller = FluxVariablesCaching::EmptyCacheFiller;
......@@ -118,13 +118,13 @@ SET_TYPE_PROP(StaggeredModel, BaseLocalResidual, StaggeredLocalResidual<TypeTag>
SET_TYPE_PROP(StaggeredModel,
CellCenterPrimaryVariables,
Dune::FieldVector<GetPropType<TypeTag, Properties::Scalar>,
GET_PROP_VALUE(TypeTag, NumEqCellCenter)>);
getPropValue<TypeTag, Properties::NumEqCellCenter>()>);
//! The face primary variables
SET_TYPE_PROP(StaggeredModel,
FacePrimaryVariables,
Dune::FieldVector<GetPropType<TypeTag, Properties::Scalar>,
GET_PROP_VALUE(TypeTag, NumEqFace)>);
getPropValue<TypeTag, Properties::NumEqFace>()>);
//! Boundary types at a single degree of freedom
SET_TYPE_PROP(StaggeredModel, BoundaryTypes, Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>);
......@@ -158,8 +158,8 @@ SET_PROP(StaggeredModel, JacobianMatrix)
private:
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
static constexpr auto numEqCellCenter = GET_PROP_VALUE(TypeTag, NumEqCellCenter);
static constexpr auto numEqFace = GET_PROP_VALUE(TypeTag, NumEqFace);
static constexpr auto numEqCellCenter = getPropValue<TypeTag, Properties::NumEqCellCenter>();
static constexpr auto numEqFace = getPropValue<TypeTag, Properties::NumEqFace>();
public:
// the sub-blocks
......
......@@ -82,8 +82,8 @@ private:
static constexpr int dimension = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
public:
using type = KEpsilonNCModelTraits<dimension, numComponents, useMoles, replaceCompEqIdx>;
};
......@@ -147,8 +147,8 @@ private:
static constexpr int dim = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
using IsothermalModelTraits = KEpsilonNCModelTraits<dim, numComponents, useMoles, replaceCompEqIdx>;
public:
using type = FreeflowNIModelTraits<IsothermalModelTraits>;
......
......@@ -100,8 +100,8 @@ private:
static constexpr int dimension = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
public:
using type = KOmegaNCModelTraits<dimension, numComponents, useMoles, replaceCompEqIdx>;
};
......@@ -165,8 +165,8 @@ private:
static constexpr int dim = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
using IsothermalModelTraits = KOmegaNCModelTraits<dim, numComponents, useMoles, replaceCompEqIdx>;
public:
using type = FreeflowNIModelTraits<IsothermalModelTraits>;
......
......@@ -87,8 +87,8 @@ private:
static constexpr int dimension = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
public:
using type = LowReKEpsilonNCModelTraits<dimension, numComponents, useMoles, replaceCompEqIdx>;
};
......@@ -152,8 +152,8 @@ private:
static constexpr int dim = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
using IsothermalModelTraits = LowReKEpsilonNCModelTraits<dim, numComponents, useMoles, replaceCompEqIdx>;
public:
using type = FreeflowNIModelTraits<IsothermalModelTraits>;
......
......@@ -134,8 +134,8 @@ private:
static constexpr int dim = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
public:
using type = NavierStokesNCModelTraits<dim, numComponents, useMoles, replaceCompEqIdx>;
......@@ -206,8 +206,8 @@ private:
static constexpr int dim = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
using IsothermalModelTraits = NavierStokesNCModelTraits<dim, numComponents, useMoles, replaceCompEqIdx>;
public:
using type = FreeflowNIModelTraits<IsothermalModelTraits>;
......
......@@ -98,8 +98,8 @@ private:
static constexpr int dimension = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
public:
using type = OneEqNCModelTraits<dimension, numComponents, useMoles, replaceCompEqIdx>;
};
......@@ -163,8 +163,8 @@ private:
static constexpr int dim = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
using IsothermalModelTraits = OneEqNCModelTraits<dim, numComponents, useMoles, replaceCompEqIdx>;
public:
using type = FreeflowNIModelTraits<IsothermalModelTraits>;
......
......@@ -59,7 +59,7 @@ class FreeflowNCResidualImpl<TypeTag, DiscretizationMethod::staggered>
static constexpr int numComponents =ModelTraits::numComponents();
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr auto cellCenterOffset = ParentType::cellCenterOffset;
using EnergyLocalResidual = typename ParentType::EnergyLocalResidual;
......
......@@ -75,8 +75,8 @@ private:
static constexpr int dim = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
public:
using type = ZeroEqNCModelTraits<dim, numComponents, useMoles, replaceCompEqIdx>;
};
......@@ -122,8 +122,8 @@ private:
static constexpr int dim = GridView::dimension;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
static constexpr int numComponents = FluidSystem::numComponents;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
static constexpr int replaceCompEqIdx = getPropValue<TypeTag, Properties::ReplaceCompEqIdx>();
using IsothermalModelTraits = ZeroEqNCModelTraits<dim, numComponents, useMoles, replaceCompEqIdx>;
public:
using type = FreeflowNIModelTraits<IsothermalModelTraits>;
......
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