Skip to content
Snippets Groups Projects
Commit a06160bf authored by Katharina Heck's avatar Katharina Heck
Browse files

[fix][fickslaw] get return type of free functions out of volumevariables so that it is always clear

parent 5419ed54
No related branches found
No related tags found
1 merge request!1728[fix][fickslaw] get return type of free functions out of volumevariables so that it is always clear
...@@ -48,7 +48,8 @@ using FicksLaw = FicksLawImplementation<TypeTag, GetPropType<TypeTag, Properties ...@@ -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 * \brief evaluates the density to be used in Fick's law based on the reference system
*/ */
template<class VolumeVariables> 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); return (referenceSys == ReferenceSystemFormulation::massAveraged) ? volVars.density(phaseIdx) : volVars.molarDensity(phaseIdx);
} }
...@@ -58,7 +59,7 @@ auto massOrMolarDensity(const VolumeVariables& volVars, ReferenceSystemFormulati ...@@ -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 * \brief returns the mass or mole fraction to be used in Fick's law based on the reference system
*/ */
template<class VolumeVariables> 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); return (referenceSys == ReferenceSystemFormulation::massAveraged) ? volVars.massFraction(phaseIdx, compIdx) : volVars.moleFraction(phaseIdx, compIdx);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment