From 2d8674460b5c8bd75c4061d09be9bb3b0ce583c0 Mon Sep 17 00:00:00 2001
From: Sina Ackermann <sina.ackermann@iws.uni-stuttgart.de>
Date: Thu, 5 Apr 2018 12:35:05 +0200
Subject: [PATCH] [localresidual] Rename ResidualVector to NumEqVector for
consistency
2p1c, 3p3c, 3pwateroil, compositional, immiscible, mineralization, nonequilibrium, nonisothermal, richards
---
dumux/porousmediumflow/2p1c/localresidual.hh | 10 ++++----
dumux/porousmediumflow/3p3c/localresidual.hh | 10 ++++----
.../3pwateroil/localresidual.hh | 10 ++++----
.../compositional/localresidual.hh | 10 ++++----
.../immiscible/localresidual.hh | 10 ++++----
.../mineralization/localresidual.hh | 4 ++--
.../nonequilibrium/localresidual.hh | 24 +++++++++----------
.../nonequilibrium/thermal/localresidual.hh | 24 +++++++++----------
.../nonisothermal/localresidual.hh | 20 ++++++++--------
.../richards/localresidual.hh | 10 ++++----
10 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/dumux/porousmediumflow/2p1c/localresidual.hh b/dumux/porousmediumflow/2p1c/localresidual.hh
index 7a892ae017..c1d0ec016f 100644
--- a/dumux/porousmediumflow/2p1c/localresidual.hh
+++ b/dumux/porousmediumflow/2p1c/localresidual.hh
@@ -39,7 +39,7 @@ class TwoPOneCLocalResidual : public ImmiscibleLocalResidual<TypeTag>
{
using ParentType = ImmiscibleLocalResidual<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
@@ -62,11 +62,11 @@ public:
//! Evaluate the storage term within a given scv
- ResidualVector computeStorage(const Problem& problem,
+ NumEqVector computeStorage(const Problem& problem,
const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
- ResidualVector storage(0.0);
+ NumEqVector storage(0.0);
// Compute storage term of all components within all phases
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
{
@@ -84,7 +84,7 @@ public:
}
//! Evaluate the fluxes over a face of a sub control volume
- ResidualVector computeFlux(const Problem& problem,
+ NumEqVector computeFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
@@ -94,7 +94,7 @@ public:
FluxVariables fluxVars;
fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- ResidualVector flux;
+ NumEqVector flux;
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
{
// The physical quantities for which we perform upwinding
diff --git a/dumux/porousmediumflow/3p3c/localresidual.hh b/dumux/porousmediumflow/3p3c/localresidual.hh
index b3c76110a0..53bf9ea7fc 100644
--- a/dumux/porousmediumflow/3p3c/localresidual.hh
+++ b/dumux/porousmediumflow/3p3c/localresidual.hh
@@ -46,7 +46,7 @@ class ThreePThreeCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -88,11 +88,11 @@ public:
* \param scv The sub control volume
* \param volVars The volume variables
*/
- ResidualVector computeStorage(const Problem& problem,
+ NumEqVector computeStorage(const Problem& problem,
const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
- ResidualVector storage(0.0);
+ NumEqVector storage(0.0);
// compute storage term of all components within all phases
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
@@ -127,7 +127,7 @@ public:
* \param scvf The sub control volume face
* \param elemFluxVarsCache The element flux variables cache
*/
- ResidualVector computeFlux(const Problem& problem,
+ NumEqVector computeFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
@@ -138,7 +138,7 @@ public:
fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
// get upwind weights into local scope
- ResidualVector flux(0.0);
+ NumEqVector flux(0.0);
// advective fluxes
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
diff --git a/dumux/porousmediumflow/3pwateroil/localresidual.hh b/dumux/porousmediumflow/3pwateroil/localresidual.hh
index 2a6e504db3..0cbff1a0ef 100644
--- a/dumux/porousmediumflow/3pwateroil/localresidual.hh
+++ b/dumux/porousmediumflow/3pwateroil/localresidual.hh
@@ -48,7 +48,7 @@ protected:
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -90,11 +90,11 @@ public:
* \param scvIdx The SCV (sub-control-volume) index
* \param usePrevSol Evaluate function with solution of current or previous time step
*/
- ResidualVector computeStorage(const Problem& problem,
+ NumEqVector computeStorage(const Problem& problem,
const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
- ResidualVector storage(0.0);
+ NumEqVector storage(0.0);
const auto massOrMoleDensity = [](const auto& volVars, const int phaseIdx)
{ return useMoles ? volVars.molarDensity(phaseIdx) : volVars.density(phaseIdx); };
@@ -133,7 +133,7 @@ public:
* \param onBoundary A boolean variable to specify whether the flux variables
* are calculated for interior SCV faces or boundary faces, default=false
*/
- ResidualVector computeFlux(const Problem& problem,
+ NumEqVector computeFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
@@ -144,7 +144,7 @@ public:
fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
// get upwind weights into local scope
- ResidualVector flux(0.0);
+ NumEqVector flux(0.0);
const auto massOrMoleDensity = [](const auto& volVars, const int phaseIdx)
{ return useMoles ? volVars.molarDensity(phaseIdx) : volVars.density(phaseIdx); };
diff --git a/dumux/porousmediumflow/compositional/localresidual.hh b/dumux/porousmediumflow/compositional/localresidual.hh
index dcb303ec83..6d1cbc05bb 100644
--- a/dumux/porousmediumflow/compositional/localresidual.hh
+++ b/dumux/porousmediumflow/compositional/localresidual.hh
@@ -45,7 +45,7 @@ class CompositionalLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidua
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -81,11 +81,11 @@ public:
* \param scv The sub control volume
* \param volVars The current or previous volVars
*/
- ResidualVector computeStorage(const Problem& problem,
+ NumEqVector computeStorage(const Problem& problem,
const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
- ResidualVector storage(0.0);
+ NumEqVector storage(0.0);
const auto massOrMoleDensity = [](const auto& volVars, const int phaseIdx)
{ return useMoles ? volVars.molarDensity(phaseIdx) : volVars.density(phaseIdx); };
@@ -133,7 +133,7 @@ public:
* \param scvf The sub control volume face to compute the flux on
* \param elemFluxVarsCache The cache related to flux compuation
*/
- ResidualVector computeFlux(const Problem& problem,
+ NumEqVector computeFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
@@ -143,7 +143,7 @@ public:
FluxVariables fluxVars;
fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
// get upwind weights into local scope
- ResidualVector flux(0.0);
+ NumEqVector flux(0.0);
const auto massOrMoleDensity = [](const auto& volVars, const int phaseIdx)
{ return useMoles ? volVars.molarDensity(phaseIdx) : volVars.density(phaseIdx); };
diff --git a/dumux/porousmediumflow/immiscible/localresidual.hh b/dumux/porousmediumflow/immiscible/localresidual.hh
index 200079cc4f..3055d82759 100644
--- a/dumux/porousmediumflow/immiscible/localresidual.hh
+++ b/dumux/porousmediumflow/immiscible/localresidual.hh
@@ -40,7 +40,7 @@ class ImmiscibleLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
using ParentType = typename GET_PROP_TYPE(TypeTag, BaseLocalResidual);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
@@ -71,12 +71,12 @@ public:
* \note The volVars can be different to allow computing
* the implicit euler time derivative here
*/
- ResidualVector computeStorage(const Problem& problem,
+ NumEqVector computeStorage(const Problem& problem,
const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
// partial time derivative of the phase mass
- ResidualVector storage;
+ NumEqVector storage;
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
{
auto eqIdx = conti0EqIdx + phaseIdx;
@@ -105,7 +105,7 @@ public:
* \param scvf The sub control volume face to compute the flux on
* \param elemFluxVarsCache The cache related to flux compuation
*/
- ResidualVector computeFlux(const Problem& problem,
+ NumEqVector computeFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
@@ -115,7 +115,7 @@ public:
FluxVariables fluxVars;
fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- ResidualVector flux;
+ NumEqVector flux;
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
{
// the physical quantities for which we perform upwinding
diff --git a/dumux/porousmediumflow/mineralization/localresidual.hh b/dumux/porousmediumflow/mineralization/localresidual.hh
index 0eddfe8366..d11bebcd26 100644
--- a/dumux/porousmediumflow/mineralization/localresidual.hh
+++ b/dumux/porousmediumflow/mineralization/localresidual.hh
@@ -38,7 +38,7 @@ template<class TypeTag>
class MineralizationLocalResidual: public CompositionalLocalResidual<TypeTag>
{
using ParentType = CompositionalLocalResidual<TypeTag>;
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
@@ -70,7 +70,7 @@ public:
* \param volVars The volume variables (primary/secondary variables) in the scv
* \return Amount per volume of the conserved quantities
*/
- ResidualVector computeStorage(const Problem& problem,
+ NumEqVector computeStorage(const Problem& problem,
const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
diff --git a/dumux/porousmediumflow/nonequilibrium/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/localresidual.hh
index 20d59a876f..268df54329 100644
--- a/dumux/porousmediumflow/nonequilibrium/localresidual.hh
+++ b/dumux/porousmediumflow/nonequilibrium/localresidual.hh
@@ -47,7 +47,7 @@ class NonEquilibriumLocalResidualImplementation<TypeTag, true, false>: public GE
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using ParentType = typename GET_PROP_TYPE(TypeTag, EquilibriumLocalResidual);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
@@ -74,7 +74,7 @@ public:
*
*/
- ResidualVector computeFlux(const Problem& problem,
+ NumEqVector computeFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
@@ -84,7 +84,7 @@ public:
FluxVariables fluxVars;
fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
// get upwind weights into local scope
- ResidualVector flux(0.0);
+ NumEqVector flux(0.0);
const auto moleDensity = [](const auto& volVars, const int phaseIdx)
{ return volVars.molarDensity(phaseIdx); };
@@ -122,13 +122,13 @@ public:
}
- ResidualVector computeSource(const Problem& problem,
+ NumEqVector computeSource(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolume &scv) const
{
- ResidualVector source(0.0);
+ NumEqVector source(0.0);
// add contributions from volume flux sources
source += problem.source(element, fvGeometry, elemVolVars, scv);
@@ -161,7 +161,7 @@ class NonEquilibriumLocalResidualImplementation<TypeTag, true, true>: public GET
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -194,11 +194,11 @@ public:
* \param storage The mass of the component within the sub-control volume
* \param volVars The volume variables
*/
- ResidualVector computeStorage(const Problem& problem,
+ NumEqVector computeStorage(const Problem& problem,
const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
- ResidualVector storage(0.0);
+ NumEqVector storage(0.0);
// compute storage term of all components within all phases
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
@@ -226,7 +226,7 @@ public:
* \param fluxVars The flux Variables
* \param elemVolVars The volume variables of the current element
*/
- ResidualVector computeFlux(const Problem& problem,
+ NumEqVector computeFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
@@ -236,7 +236,7 @@ public:
FluxVariables fluxVars;
fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
// get upwind weights into local scope
- ResidualVector flux(0.0);
+ NumEqVector flux(0.0);
// advective fluxes
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
@@ -268,13 +268,13 @@ public:
}
- ResidualVector computeSource(const Problem& problem,
+ NumEqVector computeSource(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolume &scv) const
{
- ResidualVector source(0.0);
+ NumEqVector source(0.0);
// In the case of a kinetic consideration, mass transfer
// between phases is realized via source terms there is a
// balance equation for each component in each phase
diff --git a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
index 0b92e94363..ee8c297617 100644
--- a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
+++ b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
@@ -44,7 +44,7 @@ template<class TypeTag>
class EnergyLocalResidualNonEquilibrium<TypeTag, 1/*numEnergyEqFluid*/>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -70,7 +70,7 @@ public:
//! The energy storage in the fluid phase with index phaseIdx
- static void fluidPhaseStorage(ResidualVector& storage,
+ static void fluidPhaseStorage(NumEqVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars,
int phaseIdx)
@@ -85,7 +85,7 @@ public:
//! The energy storage in the solid matrix
- static void solidPhaseStorage(ResidualVector& storage,
+ static void solidPhaseStorage(NumEqVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars)
{
@@ -100,14 +100,14 @@ public:
}
// this is to make nonequilibrium work with compositional local residual, compositional calls that for non-isothermal models
- static void heatConvectionFlux(ResidualVector& flux,
+ static void heatConvectionFlux(NumEqVector& flux,
FluxVariables& fluxVars,
int phaseIdx)
{}
//! The advective phase energy fluxes
- static void heatConvectionFlux(ResidualVector& flux,
+ static void heatConvectionFlux(NumEqVector& flux,
FluxVariables& fluxVars,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf,
@@ -142,7 +142,7 @@ public:
}
//! The diffusive energy fluxes
- static void heatConductionFlux(ResidualVector& flux,
+ static void heatConductionFlux(NumEqVector& flux,
FluxVariables& fluxVars)
{
//in case we have one energy equation for more than one fluid phase we use an effective law in the nonequilibrium fourierslaw
@@ -157,7 +157,7 @@ public:
*
* \param scv The sub-control volume over which we integrate the source term
*/
- static void computeSourceEnergy(ResidualVector& source,
+ static void computeSourceEnergy(NumEqVector& source,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
@@ -313,7 +313,7 @@ class EnergyLocalResidualNonEquilibrium<TypeTag, 2 /*numEnergyEqFluid*/>
: public EnergyLocalResidualNonEquilibrium<TypeTag, 1 /*numEnergyEqFluid*/>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -342,7 +342,7 @@ class EnergyLocalResidualNonEquilibrium<TypeTag, 2 /*numEnergyEqFluid*/>
public:
//! The energy storage in the fluid phase with index phaseIdx
- static void fluidPhaseStorage(ResidualVector& storage,
+ static void fluidPhaseStorage(NumEqVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars,
int phaseIdx)
@@ -355,7 +355,7 @@ public:
//! The advective phase energy fluxes
- static void heatConvectionFlux(ResidualVector& flux,
+ static void heatConvectionFlux(NumEqVector& flux,
FluxVariables& fluxVars,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf,
@@ -390,7 +390,7 @@ public:
}
//! The diffusive energy fluxes
- static void heatConductionFlux(ResidualVector& flux,
+ static void heatConductionFlux(NumEqVector& flux,
FluxVariables& fluxVars)
{
@@ -406,7 +406,7 @@ public:
*
* \param scv The sub-control volume over which we integrate the source term
*/
- static void computeSourceEnergy(ResidualVector& source,
+ static void computeSourceEnergy(NumEqVector& source,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
diff --git a/dumux/porousmediumflow/nonisothermal/localresidual.hh b/dumux/porousmediumflow/nonisothermal/localresidual.hh
index cba5152c46..115d3569ae 100644
--- a/dumux/porousmediumflow/nonisothermal/localresidual.hh
+++ b/dumux/porousmediumflow/nonisothermal/localresidual.hh
@@ -44,7 +44,7 @@ template<class TypeTag>
class EnergyLocalResidualImplementation<TypeTag, false>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -59,7 +59,7 @@ public:
* \param volVars The volume variables
* \param phaseIdx The phase index
*/
- static void fluidPhaseStorage(ResidualVector& storage,
+ static void fluidPhaseStorage(NumEqVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars,
int phaseIdx)
@@ -72,7 +72,7 @@ public:
* \param scv The sub-control volume
* \param volVars The volume variables
*/
- static void solidPhaseStorage(ResidualVector& storage,
+ static void solidPhaseStorage(NumEqVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars)
{}
@@ -84,7 +84,7 @@ public:
* \param fluxVars The flux variables.
* \param phaseIdx The phase index
*/
- static void heatConvectionFlux(ResidualVector& flux,
+ static void heatConvectionFlux(NumEqVector& flux,
FluxVariables& fluxVars,
int phaseIdx)
{}
@@ -95,7 +95,7 @@ public:
* \param flux TODO docme!
* \param fluxVars The flux variables.
*/
- static void heatConductionFlux(ResidualVector& flux,
+ static void heatConductionFlux(NumEqVector& flux,
FluxVariables& fluxVars)
{}
};
@@ -108,7 +108,7 @@ template<class TypeTag>
class EnergyLocalResidualImplementation<TypeTag, true>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -127,7 +127,7 @@ public:
* \param volVars The volume variables
* \param phaseIdx The phase index
*/
- static void fluidPhaseStorage(ResidualVector& storage,
+ static void fluidPhaseStorage(NumEqVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars,
int phaseIdx)
@@ -145,7 +145,7 @@ public:
* \param scv The sub-control volume
* \param volVars The volume variables
*/
- static void solidPhaseStorage(ResidualVector& storage,
+ static void solidPhaseStorage(NumEqVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars)
{
@@ -162,7 +162,7 @@ public:
* \param fluxVars The flux variables.
* \param phaseIdx The phase index
*/
- static void heatConvectionFlux(ResidualVector& flux,
+ static void heatConvectionFlux(NumEqVector& flux,
FluxVariables& fluxVars,
int phaseIdx)
{
@@ -178,7 +178,7 @@ public:
* \param flux TODO docme!
* \param fluxVars The flux variables.
*/
- static void heatConductionFlux(ResidualVector& flux,
+ static void heatConductionFlux(NumEqVector& flux,
FluxVariables& fluxVars)
{
flux[energyEqIdx] += fluxVars.heatConductionFlux();
diff --git a/dumux/porousmediumflow/richards/localresidual.hh b/dumux/porousmediumflow/richards/localresidual.hh
index 85f2d4af63..817c3d9e5c 100644
--- a/dumux/porousmediumflow/richards/localresidual.hh
+++ b/dumux/porousmediumflow/richards/localresidual.hh
@@ -42,7 +42,7 @@ class RichardsLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
using ParentType = typename GET_PROP_TYPE(TypeTag, BaseLocalResidual);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
@@ -81,12 +81,12 @@ public:
* \note The volVars can be different to allow computing
* the implicit euler time derivative here
*/
- ResidualVector computeStorage(const Problem& problem,
+ NumEqVector computeStorage(const Problem& problem,
const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
// partial time derivative of the phase mass
- ResidualVector storage(0.0);
+ NumEqVector storage(0.0);
storage[conti0EqIdx] = volVars.porosity()
* volVars.density(wPhaseIdx)
* volVars.saturation(wPhaseIdx);
@@ -118,7 +118,7 @@ public:
* \param scvf The sub control volume face to compute the flux on
* \param elemFluxVarsCache The cache related to flux compuation
*/
- ResidualVector computeFlux(const Problem& problem,
+ NumEqVector computeFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
@@ -128,7 +128,7 @@ public:
FluxVariables fluxVars;
fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- ResidualVector flux(0.0);
+ NumEqVector flux(0.0);
// the physical quantities for which we perform upwinding
auto upwindTerm = [](const auto& volVars)
{ return volVars.density(wPhaseIdx)*volVars.mobility(wPhaseIdx); };
--
GitLab