From a06160bf07bea7c97594e64b4dcfdae49ce771f7 Mon Sep 17 00:00:00 2001
From: Katharina Heck <katharina.heck@iws.uni-stuttgart.de>
Date: Wed, 2 Oct 2019 19:12:56 +0200
Subject: [PATCH] [fix][fickslaw] get return type of free functions out of
volumevariables so that it is always clear
---
dumux/flux/fickslaw.hh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dumux/flux/fickslaw.hh b/dumux/flux/fickslaw.hh
index 9ddd102be6..d2375066ca 100644
--- a/dumux/flux/fickslaw.hh
+++ b/dumux/flux/fickslaw.hh
@@ -48,7 +48,8 @@ using FicksLaw = FicksLawImplementation<TypeTag, GetPropType<TypeTag, Properties
* \brief evaluates the density to be used in Fick's law based on the reference system
*/
template<class VolumeVariables>
-auto massOrMolarDensity(const VolumeVariables& volVars, ReferenceSystemFormulation referenceSys, const int phaseIdx)
+typename VolumeVariables::PrimaryVariables::value_type
+massOrMolarDensity(const VolumeVariables& volVars, ReferenceSystemFormulation referenceSys, const int phaseIdx)
{
return (referenceSys == ReferenceSystemFormulation::massAveraged) ? volVars.density(phaseIdx) : volVars.molarDensity(phaseIdx);
}
@@ -58,7 +59,7 @@ auto massOrMolarDensity(const VolumeVariables& volVars, ReferenceSystemFormulati
* \brief returns the mass or mole fraction to be used in Fick's law based on the reference system
*/
template<class VolumeVariables>
-auto massOrMoleFraction(const VolumeVariables& volVars, ReferenceSystemFormulation referenceSys, const int phaseIdx, const int compIdx)
+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);
}
--
GitLab