From 44a58d14e9f71ee1cadc2b27bad62b674d2ae1b9 Mon Sep 17 00:00:00 2001 From: Johannes Hommel <johannes.hommel@iws.uni-stuttgart.de> Date: Fri, 22 Jan 2016 14:10:29 +0100 Subject: [PATCH] Added the use of convenience functions also in the 2pncminlocalresidual Added the use of convenience functions also in the 2pncminlocalresidual, which i forgot in the previous commit 2c0b5..b82c76b. --- dumux/implicit/2pnc/2pnclocalresidual.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dumux/implicit/2pnc/2pnclocalresidual.hh b/dumux/implicit/2pnc/2pnclocalresidual.hh index 1a909af347..6cbb065a1f 100644 --- a/dumux/implicit/2pnc/2pnclocalresidual.hh +++ b/dumux/implicit/2pnc/2pnclocalresidual.hh @@ -182,7 +182,7 @@ public: { storage[eqIdx] += volVars.molarDensity(phaseIdx) * volVars.saturation(phaseIdx) - * volVars.fluidState().moleFraction(phaseIdx, compIdx) + * volVars.moleFraction(phaseIdx, compIdx) * volVars.porosity(); } else @@ -249,12 +249,12 @@ public: * (massUpwindWeight_ * up.mobility(phaseIdx) * up.molarDensity(phaseIdx) - * up.fluidState().moleFraction(phaseIdx, compIdx) + * up.moleFraction(phaseIdx, compIdx) + (1.0 - massUpwindWeight_) * dn.mobility(phaseIdx) * dn.molarDensity(phaseIdx) - * dn.fluidState().moleFraction(phaseIdx, compIdx)); + * dn.moleFraction(phaseIdx, compIdx)); Valgrind::CheckDefined(fluxVars.KmvpNormal(phaseIdx)); Valgrind::CheckDefined(up.molarDensity(phaseIdx)); @@ -328,7 +328,7 @@ protected: { result[conti0EqIdx + compIdx] += volVars.density(phaseIdx) * volVars.saturation(phaseIdx) - * volVars.fluidState().massFraction(phaseIdx, compIdx) + * volVars.massFraction(phaseIdx, compIdx) * volVars.porosity(); } result *= this->fvGeometry_().subContVol[i].volume; -- GitLab