diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh index 40ad7ebaf0b9a6b959c5dfb944491d3d2b4c80b7..6da4fbb22370f5f98ad6ff1aa73b1c298493079e 100644 --- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh +++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh @@ -335,8 +335,8 @@ protected: // use two-point gradients const GlobalPosition &posI = element.geometry().corner(face().i); const GlobalPosition &posJ = element.geometry().corner(face().j); - for (int i = 0; i < Vector::dimension; ++ i) - tmp[i] = posI[i] - posJ[i]; + tmp = posI; + tmp -= posJ; Scalar dist = tmp.two_norm(); tmp = face().normal; diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh index 32547f639eca91fd7d5f4f901fae8ff25b7ea285..87abf3f604e707e4541779d57ec810e151b59308 100644 --- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh +++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh @@ -249,10 +249,7 @@ public: if(!useMoles) { // diffusive flux of the second component - massfraction - tmp = 0; - for (int i = 0; i < Vector::dimension; ++ i) - tmp += fluxVars.massFracGrad(comp1Idx)[i]*fluxVars.face().normal[i]; - tmp *= -1; + tmp = -(fluxVars.massFracGrad(comp1Idx)*fluxVars.face().normal); tmp *= fluxVars.porousDiffCoeff() * fluxVars.densityAtIP(); flux[transEqIdx] += tmp;// * FluidSystem::molarMass(comp1Idx); @@ -260,10 +257,7 @@ public: else { // diffusive flux of the second component - molefraction - tmp = 0; - for (int i = 0; i < Vector::dimension; ++ i) - tmp += fluxVars.moleFracGrad(comp1Idx)[i]*fluxVars.face().normal[i]; - tmp *= -1; + tmp = -(fluxVars.moleFracGrad(comp1Idx)*fluxVars.face().normal); tmp *= fluxVars.porousDiffCoeff() * fluxVars.molarDensityAtIP(); // dispersive flux of second component - molefraction @@ -416,10 +410,7 @@ protected: *vertVars.fluidState().massFraction(phaseIdx, comp1Idx); // diffusive flux of comp1 component in phase0 - Scalar tmp = 0; - for (int i = 0; i < Vector::dimension; ++ i) - tmp += boundaryVars.massFracGrad(comp1Idx)[i]*boundaryVars.boundaryFace().normal[i]; - tmp *= -1; + Scalar tmp = -(boundaryVars.massFracGrad(comp1Idx)*boundaryVars.boundaryFace().normal); tmp *= boundaryVars.porousDiffCoeff()*boundaryVars.densityAtIP(); values[transEqIdx] += tmp;//* FluidSystem::molarMass(comp1Idx); @@ -432,10 +423,7 @@ protected: *vertVars.fluidState().moleFraction(phaseIdx, comp1Idx); // diffusive flux of comp1 component in phase0 - Scalar tmp = 0; - for (int i = 0; i < Vector::dimension; ++ i) - tmp += boundaryVars.moleFracGrad(comp1Idx)[i]*boundaryVars.boundaryFace().normal[i]; - tmp *= -1; + Scalar tmp = -(boundaryVars.moleFracGrad(comp1Idx)*boundaryVars.boundaryFace().normal); tmp *= boundaryVars.porousDiffCoeff()*boundaryVars.molarDensityAtIP(); values[transEqIdx] += tmp; diff --git a/dumux/boxmodels/2pni/2pnilocalresidual.hh b/dumux/boxmodels/2pni/2pnilocalresidual.hh index d863be68d35eda8b2426e713e0aa732391af89d8..206c96686ea8006567cfb22e5cdac75f2b8e29a3 100644 --- a/dumux/boxmodels/2pni/2pnilocalresidual.hh +++ b/dumux/boxmodels/2pni/2pnilocalresidual.hh @@ -147,10 +147,7 @@ public: // current sub control volume face fluxVars.intrinsicPermeability().mv(fluxVars.potentialGrad(phaseIdx), tmpVec); - Scalar normalFlux = 0; - for (int i = 0; i < Vector::dimension; ++i) - normalFlux += tmpVec[i]*fluxVars.face().normal[i]; - normalFlux *= -1; + Scalar normalFlux = -(tmpVec*fluxVars.face().normal); // data attached to upstream and the downstream vertices // of the current phase