From 149f77c1bfea82208d43dab4a2bc24ef75a00f71 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Thu, 28 Jan 2016 11:45:49 +0100
Subject: [PATCH] [cleanup] Use convenience function for temperature
Implement a temperature() function in the volvars and use it
instead of volvars.fluidstate().xtemperature().
This reuqired the implementation of two template functions
to ensure that the correct temperature() function is called
depending on the number of energy equations considered.
---
.../mpnc/implicit/energy/fluxvariables.hh | 2 +-
.../mpnc/implicit/energy/localresidual.hh | 2 +-
.../mpnc/implicit/energy/vtkwriter.hh | 4 +--
.../mpnc/implicit/mass/localresidual.hh | 2 +-
.../implicit/mass/localresidualkinetic.hh | 2 +-
.../mpnc/implicit/volumevariables.hh | 28 +++++++++++++++++++
.../mpnc/implicit/combustionproblem1c.hh | 4 +--
7 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/dumux/porousmediumflow/mpnc/implicit/energy/fluxvariables.hh b/dumux/porousmediumflow/mpnc/implicit/energy/fluxvariables.hh
index 38ecf3f353..265bef607b 100644
--- a/dumux/porousmediumflow/mpnc/implicit/energy/fluxvariables.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/energy/fluxvariables.hh
@@ -141,7 +141,7 @@ public:
// index for the element volume variables
int volVarsIdx = face.fapIndices[idx];
- tmp *= elemVolVars[volVarsIdx].fluidState().temperature(/*phaseIdx=*/0);
+ tmp *= elemVolVars[volVarsIdx].temperature(/*phaseIdx=*/0);
temperatureGradient += tmp;
}
diff --git a/dumux/porousmediumflow/mpnc/implicit/energy/localresidual.hh b/dumux/porousmediumflow/mpnc/implicit/energy/localresidual.hh
index b8dc111468..dcc3cbee52 100644
--- a/dumux/porousmediumflow/mpnc/implicit/energy/localresidual.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/energy/localresidual.hh
@@ -161,7 +161,7 @@ public:
// heat stored in the rock matrix
storage[energyEqIdx] +=
- volVars.fluidState().temperature(/*phaseIdx=*/0)
+ volVars.temperature(/*phaseIdx=*/0)
* volVars.solidDensity()
* (1.0 - volVars.porosity())
* volVars.solidHeatCapacity();
diff --git a/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriter.hh b/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriter.hh
index ac725f0244..51cabb317e 100644
--- a/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriter.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/energy/vtkwriter.hh
@@ -100,7 +100,7 @@ public:
const VolumeVariables &volVars = elemVolVars[scvIdx];
if (temperatureOutput_)
- temperature_[dofIdxGlobal] = volVars.fluidState().temperature(/*phaseIdx=*/0);
+ temperature_[dofIdxGlobal] = volVars.temperature(/*phaseIdx=*/0);
}
}
@@ -190,7 +190,7 @@ public:
int gobalIdx = this->problem_.model().dofMapper().subIndex(element, scvIdx, dofCodim);
const VolumeVariables &volVars = elemVolVars[scvIdx];
- if (temperatureOutput_) temperature_[gobalIdx] = volVars.fluidState().temperature(/*phaseIdx=*/0);
+ if (temperatureOutput_) temperature_[gobalIdx] = volVars.temperature(/*phaseIdx=*/0);
for (int phaseIdx = 0; phaseIdx < numPhases; ++ phaseIdx) {
if (enthalpyOutput_)
enthalpy_[phaseIdx][gobalIdx] = volVars.enthalpy(phaseIdx);
diff --git a/dumux/porousmediumflow/mpnc/implicit/mass/localresidual.hh b/dumux/porousmediumflow/mpnc/implicit/mass/localresidual.hh
index a2f6a9347c..7ad8af1e1b 100644
--- a/dumux/porousmediumflow/mpnc/implicit/mass/localresidual.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/mass/localresidual.hh
@@ -184,7 +184,7 @@ if (!std::isfinite(volumeFlux))
+
( 1. - massUpwindWeight)*dn.molarity(phaseIdx, compIdx) );
if (!std::isfinite(flux[compIdx]))
- DUNE_THROW(NumericalProblem, "Calculated non-finite normal flux in phase " << phaseIdx << " comp " << compIdx << "T: "<< up.fluidState().temperature(phaseIdx) << "S "<<up.saturation(phaseIdx) ) ;
+ DUNE_THROW(NumericalProblem, "Calculated non-finite normal flux in phase " << phaseIdx << " comp " << compIdx << "T: "<< up.temperature(phaseIdx) << "S "<<up.saturation(phaseIdx) ) ;
}
}
}
diff --git a/dumux/porousmediumflow/mpnc/implicit/mass/localresidualkinetic.hh b/dumux/porousmediumflow/mpnc/implicit/mass/localresidualkinetic.hh
index 41ec6a67c6..19cf008fae 100644
--- a/dumux/porousmediumflow/mpnc/implicit/mass/localresidualkinetic.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/mass/localresidualkinetic.hh
@@ -195,7 +195,7 @@ public:
Valgrind::CheckDefined(mu_nPhaseWComp);
const Scalar characteristicLength = volVars.characteristicLength() ;
- const Scalar temperature = volVars.fluidState().temperature(wPhaseIdx);
+ const Scalar temperature = volVars.temperature(wPhaseIdx);
const Scalar pn = volVars.pressure(nPhaseIdx);
const Scalar henry = FluidSystem::henry(temperature) ;
const Scalar gradNinWApprox = ( mu_wPhaseNComp - mu_nPhaseNCompEquil) / characteristicLength; // very 2p2c // 1. / henry *
diff --git a/dumux/porousmediumflow/mpnc/implicit/volumevariables.hh b/dumux/porousmediumflow/mpnc/implicit/volumevariables.hh
index 56a458f0d1..705813c7fb 100644
--- a/dumux/porousmediumflow/mpnc/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/volumevariables.hh
@@ -321,6 +321,34 @@ public:
Scalar density(const int phaseIdx) const
{ return fluidState_.density(phaseIdx); }
+ /*!
+ * \brief Returns the fluid/solid phase temperature
+ * in the sub-control volume for the assumption of local thermal
+ * non-equillibrium where there is more than one energy equation
+ * and each phase and the matrix can have different temperatures
+ *
+ * \param phaseIdx The local index of the phases
+ */
+ template <class T = TypeTag>
+ typename std::enable_if<(GET_PROP_VALUE(T, NumEnergyEquations) > 1), Scalar>::type temperature(const unsigned int phaseIdx) const
+ {
+ return EnergyVolumeVariables::temperature(phaseIdx);
+ }
+
+ /*!
+ * \brief Returns the fluid/solid phase temperature
+ * in the sub-control volume for the assumption of local thermal
+ * equillibrium where there is only one or no energy equation
+ * and all phases including the matrix have the same temperature
+ *
+ * \param phaseIdx The local index of the phases
+ */
+ template <class T = TypeTag>
+ typename std::enable_if<(GET_PROP_VALUE(T, NumEnergyEquations) < 2), Scalar>::type temperature(const unsigned int phaseIdx) const
+ {
+ return fluidState_.temperature(phaseIdx);
+ }
+
/*!
* \brief Return enthalpy \f$\mathrm{[kg/m^3]}\f$ the of the fluid phase.
*/
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index beed6ad0cc..c102e01652 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -481,8 +481,8 @@ public:
const Scalar pn = elemVolVars[scvIdx].pressure(nPhaseIdx);
const Scalar pw = elemVolVars[scvIdx].pressure(wPhaseIdx);
- const Scalar Tn = elemVolVars[scvIdx].fluidState().temperature(nPhaseIdx);
- const Scalar Tw = elemVolVars[scvIdx].fluidState().temperature(wPhaseIdx);
+ const Scalar Tn = elemVolVars[scvIdx].temperature(nPhaseIdx);
+ const Scalar Tw = elemVolVars[scvIdx].temperature(wPhaseIdx);
fluidState.setPressure(nPhaseIdx, pn);
fluidState.setPressure(wPhaseIdx, pw);
--
GitLab