diff --git a/dumux/freeflow/compositional/kepsilonncmodel.hh b/dumux/freeflow/compositional/kepsilonncmodel.hh index 3d272dd21ccf2adeca621c2f53f3d1857e5e84f1..757ddc59668f2037a841bc4a2eaa3aeebe81d965 100644 --- a/dumux/freeflow/compositional/kepsilonncmodel.hh +++ b/dumux/freeflow/compositional/kepsilonncmodel.hh @@ -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 diff --git a/dumux/freeflow/compositional/lowrekepsilonncmodel.hh b/dumux/freeflow/compositional/lowrekepsilonncmodel.hh index 7242e1810097ed27f542092f2e5ac0a873714e89..d09a86edaa28fec15e5ea46e7297a8547e08fb88 100644 --- a/dumux/freeflow/compositional/lowrekepsilonncmodel.hh +++ b/dumux/freeflow/compositional/lowrekepsilonncmodel.hh @@ -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 diff --git a/dumux/freeflow/compositional/navierstokesncmodel.hh b/dumux/freeflow/compositional/navierstokesncmodel.hh index fa1ec5d18b32cefaef107689dbf680590848e2bc..b2fb022b1654c2db7a1ddc34f271bea5d1215ac7 100644 --- a/dumux/freeflow/compositional/navierstokesncmodel.hh +++ b/dumux/freeflow/compositional/navierstokesncmodel.hh @@ -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); - } }; /////////////////////////////////////////////////////////////////////////// diff --git a/dumux/freeflow/navierstokes/model.hh b/dumux/freeflow/navierstokes/model.hh index 0f3aaad66fbb6d6aaffa8eb049c9145ebd170f54..c3940e3628564101450ed47cd3a605dc0115ce79 100644 --- a/dumux/freeflow/navierstokes/model.hh +++ b/dumux/freeflow/navierstokes/model.hh @@ -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"; - } }; /*! diff --git a/dumux/freeflow/rans/oneeq/model.hh b/dumux/freeflow/rans/oneeq/model.hh index e434db80ae11f5f5b2e75f579dbea4c2d3c68ccc..ac34e6be3bb512f08e2cbcf158846b6d51cf34f5 100644 --- a/dumux/freeflow/rans/oneeq/model.hh +++ b/dumux/freeflow/rans/oneeq/model.hh @@ -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"; - } }; /////////////////////////////////////////////////////////////////////////// diff --git a/dumux/freeflow/rans/twoeq/kepsilon/model.hh b/dumux/freeflow/rans/twoeq/kepsilon/model.hh index 6c99ba07ce2e89e831b13835f717640ecff310d1..9a70db5584d9403223e9f7ff0544bc8cbf84453a 100644 --- a/dumux/freeflow/rans/twoeq/kepsilon/model.hh +++ b/dumux/freeflow/rans/twoeq/kepsilon/model.hh @@ -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"; - } - } }; /////////////////////////////////////////////////////////////////////////// diff --git a/dumux/freeflow/rans/twoeq/komega/model.hh b/dumux/freeflow/rans/twoeq/komega/model.hh index 806c24338711fe53ec9d08d863d1a9cbc6f04458..7bf6db6d8c27c0ca6a20385ff280fd3bab4b512f 100644 --- a/dumux/freeflow/rans/twoeq/komega/model.hh +++ b/dumux/freeflow/rans/twoeq/komega/model.hh @@ -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"; - } - } }; /////////////////////////////////////////////////////////////////////////// diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh index 43c36f2896cbadd3b65038f39bcf89e298e67172..b1a840544b601b462679565f5e58c8d25b2a8eb4 100644 --- a/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh +++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh @@ -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"; - } - } }; ///////////////////////////////////////////////////////////////////////////