From a17bcb8fab8f256515fe0aed1ac76a70fa9f363b Mon Sep 17 00:00:00 2001
From: Katherina Baber <katherina.baber@gmail.com>
Date: Wed, 2 May 2012 13:59:56 +0000
Subject: [PATCH] 2p2cvolumevariables: replace primaryVariables by priVars
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8185 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/2p2c/2p2cvolumevariables.hh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
index e00d88dc88..6237a19654 100644
--- a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
@@ -182,7 +182,7 @@ public:
* \copydoc BoxModel::completeFluidState
* \param isOldSol Specifies whether this is the previous solution or the current one
*/
- static void completeFluidState(const PrimaryVariables& primaryVariables,
+ static void completeFluidState(const PrimaryVariables& priVars,
const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
@@ -190,7 +190,7 @@ public:
FluidState& fluidState,
bool isOldSol = false)
{
- Scalar t = Implementation::temperature_(primaryVariables, problem, element,
+ Scalar t = Implementation::temperature_(priVars, problem, element,
fvGeometry, scvIdx);
fluidState.setTemperature(t);
@@ -208,9 +208,9 @@ public:
}
else if (phasePresence == bothPhases) {
if (formulation == pwSn)
- Sn = primaryVariables[switchIdx];
+ Sn = priVars[switchIdx];
else if (formulation == pnSw)
- Sn = 1.0 - primaryVariables[switchIdx];
+ Sn = 1.0 - priVars[switchIdx];
else DUNE_THROW(Dune::InvalidStateException, "Formulation: " << formulation << " is invalid.");
}
else DUNE_THROW(Dune::InvalidStateException, "phasePresence: " << phasePresence << " is invalid.");
@@ -227,12 +227,12 @@ public:
Scalar pC = MaterialLaw::pC(materialParams, 1 - Sn);
if (formulation == pwSn) {
- fluidState.setPressure(wPhaseIdx, primaryVariables[pressureIdx]);
- fluidState.setPressure(nPhaseIdx, primaryVariables[pressureIdx] + pC);
+ fluidState.setPressure(wPhaseIdx, priVars[pressureIdx]);
+ fluidState.setPressure(nPhaseIdx, priVars[pressureIdx] + pC);
}
else if (formulation == pnSw) {
- fluidState.setPressure(nPhaseIdx, primaryVariables[pressureIdx]);
- fluidState.setPressure(wPhaseIdx, primaryVariables[pressureIdx] - pC);
+ fluidState.setPressure(nPhaseIdx, priVars[pressureIdx]);
+ fluidState.setPressure(wPhaseIdx, priVars[pressureIdx] - pC);
}
else DUNE_THROW(Dune::InvalidStateException, "Formulation: " << formulation << " is invalid.");
@@ -259,7 +259,7 @@ public:
// extract _mass_ fractions in the nonwetting phase
Scalar massFractionN[numComponents];
- massFractionN[wCompIdx] = primaryVariables[switchIdx];
+ massFractionN[wCompIdx] = priVars[switchIdx];
massFractionN[nCompIdx] = 1 - massFractionN[wCompIdx];
// calculate average molar mass of the nonwetting phase
@@ -287,7 +287,7 @@ public:
// extract _mass_ fractions in the nonwetting phase
Scalar massFractionW[numComponents];
- massFractionW[nCompIdx] = primaryVariables[switchIdx];
+ massFractionW[nCompIdx] = priVars[switchIdx];
massFractionW[wCompIdx] = 1 - massFractionW[nCompIdx];
// calculate average molar mass of the nonwetting phase
--
GitLab