From a5cc6080eb76f35dc70f6708b40aa1e25fbbf076 Mon Sep 17 00:00:00 2001
From: Mirka Papenheim <mirka.papenheim@googlemail.com>
Date: Mon, 17 Feb 2014 10:01:11 +0000
Subject: [PATCH] Convenience functions are used for massFraction and
moleFreaction in stokesnc(ni) and the implicit 2p2c model.
Reviewed by Klaus
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12485 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/freeflow/stokesnc/stokesncmodel.hh | 4 ++--
dumux/freeflow/stokesncni/stokesncnimodel.hh | 4 ++--
dumux/implicit/2p2c/2p2cfluxvariables.hh | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dumux/freeflow/stokesnc/stokesncmodel.hh b/dumux/freeflow/stokesnc/stokesncmodel.hh
index 058115ba39..fbb93188f3 100644
--- a/dumux/freeflow/stokesnc/stokesncmodel.hh
+++ b/dumux/freeflow/stokesnc/stokesncmodel.hh
@@ -151,8 +151,8 @@ public:
delP[globalIdx] = volVars.pressure()*scale_ - 1e5;
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
{
- (*moleFraction[compIdx])[globalIdx]= volVars.fluidState().moleFraction(phaseIdx,compIdx);
- (*massFraction[compIdx])[globalIdx]= volVars.fluidState().massFraction(phaseIdx,compIdx);
+ (*moleFraction[compIdx])[globalIdx]= volVars.moleFraction(phaseIdx,compIdx);
+ (*massFraction[compIdx])[globalIdx]= volVars.massFraction(phaseIdx,compIdx);
Valgrind::CheckDefined((*moleFraction[compIdx])[globalIdx]);
Valgrind::CheckDefined((*massFraction[compIdx])[globalIdx]);
}
diff --git a/dumux/freeflow/stokesncni/stokesncnimodel.hh b/dumux/freeflow/stokesncni/stokesncnimodel.hh
index f191da2a31..a5aafeae67 100644
--- a/dumux/freeflow/stokesncni/stokesncnimodel.hh
+++ b/dumux/freeflow/stokesncni/stokesncnimodel.hh
@@ -156,8 +156,8 @@ public:
delP[globalIdx] = volVars.pressure()*scale_ - 1e5;
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
{
- (*moleFraction[compIdx])[globalIdx]= volVars.fluidState().moleFraction(phaseIdx,compIdx);
- (*massFraction[compIdx])[globalIdx]= volVars.fluidState().massFraction(phaseIdx,compIdx);
+ (*moleFraction[compIdx])[globalIdx]= volVars.moleFraction(phaseIdx,compIdx);
+ (*massFraction[compIdx])[globalIdx]= volVars.massFraction(phaseIdx,compIdx);
Valgrind::CheckDefined((*moleFraction[compIdx])[globalIdx]);
Valgrind::CheckDefined((*massFraction[compIdx])[globalIdx]);
}
diff --git a/dumux/implicit/2p2c/2p2cfluxvariables.hh b/dumux/implicit/2p2c/2p2cfluxvariables.hh
index 9b0a0919f2..266ce7382b 100644
--- a/dumux/implicit/2p2c/2p2cfluxvariables.hh
+++ b/dumux/implicit/2p2c/2p2cfluxvariables.hh
@@ -143,12 +143,12 @@ class TwoPTwoCFluxVariables : public GET_PROP_TYPE(TypeTag, BaseFluxVariables)
// the mole fraction gradient of the wetting phase
tmp = feGrad;
- tmp *= elemVolVars[volVarsIdx].fluidState().moleFraction(wPhaseIdx, nCompIdx);
+ tmp *= elemVolVars[volVarsIdx].moleFraction(wPhaseIdx, nCompIdx);
moleFractionGrad_[wPhaseIdx] += tmp;
// the mole fraction gradient of the non-wetting phase
tmp = feGrad;
- tmp *= elemVolVars[volVarsIdx].fluidState().moleFraction(nPhaseIdx, wCompIdx);
+ tmp *= elemVolVars[volVarsIdx].moleFraction(nPhaseIdx, wCompIdx);
moleFractionGrad_[nPhaseIdx] += tmp;
}
}
--
GitLab