From b63f85b996c1ea22614f87f2e58b7e44b579f487 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Fri, 4 Oct 2019 11:34:32 +0200
Subject: [PATCH] [fickslaw][referencesystem] Move convenience functions to
referencesys header
---
dumux/flux/fickslaw.hh | 21 ---------------------
dumux/flux/referencesystemformulation.hh | 22 ++++++++++++++++++++++
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/dumux/flux/fickslaw.hh b/dumux/flux/fickslaw.hh
index d2375066ca..ad5aa09ed9 100644
--- a/dumux/flux/fickslaw.hh
+++ b/dumux/flux/fickslaw.hh
@@ -43,27 +43,6 @@ class FicksLawImplementation;
template <class TypeTag, ReferenceSystemFormulation referenceSystem = ReferenceSystemFormulation::massAveraged>
using FicksLaw = FicksLawImplementation<TypeTag, GetPropType<TypeTag, Properties::FVGridGeometry>::discMethod, referenceSystem>;
-/*!
- * \ingroup Flux
- * \brief evaluates the density to be used in Fick's law based on the reference system
- */
-template<class VolumeVariables>
-typename VolumeVariables::PrimaryVariables::value_type
-massOrMolarDensity(const VolumeVariables& volVars, ReferenceSystemFormulation referenceSys, const int phaseIdx)
-{
- return (referenceSys == ReferenceSystemFormulation::massAveraged) ? volVars.density(phaseIdx) : volVars.molarDensity(phaseIdx);
-}
-
-/*!
- * \ingroup Flux
- * \brief returns the mass or mole fraction to be used in Fick's law based on the reference system
- */
-template<class VolumeVariables>
-typename VolumeVariables::PrimaryVariables::value_type massOrMoleFraction(const VolumeVariables& volVars, ReferenceSystemFormulation referenceSys, const int phaseIdx, const int compIdx)
-{
- return (referenceSys == ReferenceSystemFormulation::massAveraged) ? volVars.massFraction(phaseIdx, compIdx) : volVars.moleFraction(phaseIdx, compIdx);
-}
-
} // end namespace Dumux
#include <dumux/flux/cctpfa/fickslaw.hh>
diff --git a/dumux/flux/referencesystemformulation.hh b/dumux/flux/referencesystemformulation.hh
index ed54ef1649..da9dc576b8 100644
--- a/dumux/flux/referencesystemformulation.hh
+++ b/dumux/flux/referencesystemformulation.hh
@@ -46,6 +46,28 @@ enum class ReferenceSystemFormulation
massAveraged, molarAveraged
};
+/*!
+ * \ingroup Flux
+ * \brief evaluates the density to be used in Fick's law based on the reference system
+ */
+template<class VolumeVariables>
+typename VolumeVariables::PrimaryVariables::value_type
+massOrMolarDensity(const VolumeVariables& volVars, ReferenceSystemFormulation referenceSys, const int phaseIdx)
+{
+ return (referenceSys == ReferenceSystemFormulation::massAveraged) ? volVars.density(phaseIdx) : volVars.molarDensity(phaseIdx);
+}
+
+/*!
+ * \ingroup Flux
+ * \brief returns the mass or mole fraction to be used in Fick's law based on the reference system
+ */
+template<class VolumeVariables>
+typename VolumeVariables::PrimaryVariables::value_type
+massOrMoleFraction(const VolumeVariables& volVars, ReferenceSystemFormulation referenceSys, const int phaseIdx, const int compIdx)
+{
+ return (referenceSys == ReferenceSystemFormulation::massAveraged) ? volVars.massFraction(phaseIdx, compIdx) : volVars.moleFraction(phaseIdx, compIdx);
+}
+
} // end namespace Dumux
#endif
--
GitLab