From a156e0675b814e3817bb784d08b47ce9ff0a6913 Mon Sep 17 00:00:00 2001
From: hommel <johannes.hommel@iws.uni-stuttgart.de>
Date: Tue, 31 Jan 2017 12:14:51 +0100
Subject: [PATCH] [2pncmin] generalized comments and variable names, replaced
"water" by more general expressions
---
dumux/porousmediumflow/2pncmin/implicit/model.hh | 2 +-
.../porousmediumflow/2pncmin/implicit/volumevariables.hh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dumux/porousmediumflow/2pncmin/implicit/model.hh b/dumux/porousmediumflow/2pncmin/implicit/model.hh
index 59884fc075..3f20df868d 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/model.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/model.hh
@@ -444,7 +444,7 @@ protected:
else if (phasePresence == nPhaseOnly)
{
Scalar sumxw = 0;
- //Calculate sum of mole fractions (water and air) in the hypothetical wetting phase
+ //Calculate sum of mole fractions in the hypothetical wetting phase
for (int compIdx = 0; compIdx < numComponents; compIdx++)
{
sumxw += volVars.moleFraction(wPhaseIdx, compIdx);
diff --git a/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh b/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh
index d1e8f39617..b83bfd9003 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh
@@ -352,13 +352,13 @@ public:
moleFrac[compIdx] = priVars[compIdx];
}
moleFrac[nCompIdx] = priVars[switchIdx];
- Scalar sumMoleFracNotWater = 0;
+ Scalar sumMoleFracOtherComponents = 0;
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
{
- sumMoleFracNotWater+=moleFrac[compIdx];
+ sumMoleFracOtherComponents+=moleFrac[compIdx];
}
- sumMoleFracNotWater += moleFrac[nCompIdx];
- moleFrac[wCompIdx] = 1 -sumMoleFracNotWater;
+ sumMoleFracOtherComponents += moleFrac[nCompIdx];
+ moleFrac[wCompIdx] = 1 -sumMoleFracOtherComponents;
// convert mass to mole fractions and set the fluid state
for (int compIdx=0; compIdx<numComponents; ++compIdx)
--
GitLab