Commit 4aa41755 authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

[freeflow][model] Remove priVarNames from ModelTraits

parent 6f801baf
......@@ -69,19 +69,6 @@ struct KEpsilonNCModelTraits : NavierStokesNCModelTraits<dimension, nComp, useMo
//! the indices
using Indices = KEpsilonIndices<dimension, nComp>;
//! return the names of the primary variables in cells
template <class FluidSystem>
static std::string primaryVariableNameCell(int pvIdx, int state = 0)
{
using ParentType = NavierStokesNCModelTraits<dimension, nComp, useMoles, replaceCompEqIdx>;
if (pvIdx < nComp)
return ParentType::template primaryVariableNameCell<FluidSystem>(pvIdx, state);
else if (pvIdx == nComp)
return "k";
else
return "epsilon";
}
};
//!< states some specifics of the isothermal multi-component low-Reynolds k-epsilon model
......
......@@ -74,19 +74,6 @@ struct LowReKEpsilonNCModelTraits : NavierStokesNCModelTraits<dimension, nComp,
//! the indices
using Indices = LowReKEpsilonIndices<dimension, nComp>;
//! return the names of the primary variables in cells
template <class FluidSystem>
static std::string primaryVariableNameCell(int pvIdx, int state = 0)
{
using ParentType = NavierStokesNCModelTraits<dimension, nComp, useMoles, replaceCompEqIdx>;
if (pvIdx < nComp)
return ParentType::template primaryVariableNameCell<FluidSystem>(pvIdx, state);
else if (pvIdx == nComp)
return "k";
else
return "epsilon";
}
};
//!< states some specifics of the isothermal multi-component low-Reynolds k-epsilon model
......
......@@ -102,18 +102,6 @@ struct NavierStokesNCModelTraits : NavierStokesModelTraits<dimension>
//! the indices
using Indices = NavierStokesIndices<dimension>;
//! return the names of the primary variables in cells
template <class FluidSystem>
static std::string primaryVariableNameCell(int pvIdx = 0, int state = 0)
{
const std::string xString = useMoles() ? "x" : "X";
if (pvIdx == 0)
return NavierStokesModelTraits<dimension>::template primaryVariableNameCell<FluidSystem>(pvIdx, state);
else
return xString + "^" + FluidSystem::componentName(pvIdx)
+ "_" + FluidSystem::phaseName(0);
}
};
///////////////////////////////////////////////////////////////////////////
......
......@@ -103,20 +103,6 @@ struct NavierStokesModelTraits
//! the indices
using Indices = NavierStokesIndices<dim()>;
//! return the names of the primary variables in cells
template <class FluidSystem = void>
static std::string primaryVariableNameCell(int pvIdx = 0, int state = 0)
{
return "p";
}
//! return the names of the primary variables on faces
template <class FluidSystem = void>
static std::string primaryVariableNameFace(int pvIdx = 0, int state = 0)
{
return "v";
}
};
/*!
......
......@@ -113,17 +113,6 @@ struct OneEqModelTraits : RANSModelTraits<dimension>
//! the indices
using Indices = OneEqIndices<dim(), numComponents()>;
//! return the names of the primary variables in cells
template <class FluidSystem = void>
static std::string primaryVariableNameCell(int pvIdx, int state = 0)
{
using ParentType = RANSModelTraits<dimension>;
if (pvIdx == 0)
return ParentType::template primaryVariableNameCell<FluidSystem>(pvIdx, state);
else
return "nu_tilde";
}
};
///////////////////////////////////////////////////////////////////////////
......
......@@ -99,21 +99,6 @@ struct KEpsilonModelTraits : RANSModelTraits<dimension>
//! the indices
using Indices = KEpsilonIndices<dim(), numComponents()>;
//! return the names of the primary variables in cells
template<class FluidSystem = void>
static std::string primaryVariableNameCell(int pvIdx, int state = 0)
{
using ParentType = RANSModelTraits<dimension>;
switch (pvIdx) {
case 0:
return ParentType::template primaryVariableNameCell<FluidSystem>(pvIdx, state);
case 1:
return "k";
default:
return "epsilon";
}
}
};
///////////////////////////////////////////////////////////////////////////
......
......@@ -106,21 +106,6 @@ struct KOmegaModelTraits : RANSModelTraits<dimension>
//! The indices
using Indices = KOmegaIndices<dim(), numComponents()>;
//! return the names of the primary variables in cells
template<class FluidSystem = void>
static std::string primaryVariableNameCell(int pvIdx, int state = 0)
{
using ParentType = RANSModelTraits<dimension>;
switch (pvIdx) {
case 0:
return ParentType::template primaryVariableNameCell<FluidSystem>(pvIdx, state);
case 1:
return "k";
default:
return "omega";
}
}
};
///////////////////////////////////////////////////////////////////////////
......
......@@ -115,21 +115,6 @@ struct LowReKEpsilonModelTraits : RANSModelTraits<dimension>
//! the indices
using Indices = LowReKEpsilonIndices<dim(), numComponents()>;
//! return the names of the primary variables in cells
template<class FluidSystem = void>
static std::string primaryVariableNameCell(int pvIdx, int state = 0)
{
using ParentType = RANSModelTraits<dimension>;
switch (pvIdx) {
case 0:
return ParentType::template primaryVariableNameCell<FluidSystem>(pvIdx, state);
case 1:
return "k";
default:
return "epsilon";
}
}
};
///////////////////////////////////////////////////////////////////////////
......
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