Commit a5cc6080 authored by Mirka Papenheim's avatar Mirka Papenheim
Browse files

Convenience functions are used for massFraction and moleFreaction in...

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
parent ce89abe3
......@@ -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]);
}
......
......@@ -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]);
}
......
......@@ -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;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment