From 8362aa7144c3d0f874f0b7e1193bfe70ac1c2ffa Mon Sep 17 00:00:00 2001 From: Bernd Flemisch <bernd@iws.uni-stuttgart.de> Date: Wed, 11 Jan 2012 16:57:03 +0000 Subject: [PATCH] FieldVector: use dimension instead of size git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7347 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- dumux/boxmodels/1p2c/1p2cfluxvariables.hh | 2 +- dumux/boxmodels/1p2c/1p2clocalresidual.hh | 8 ++++---- dumux/boxmodels/2pni/2pnilocalresidual.hh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh index c1cf464a23..40ad7ebaf0 100644 --- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh +++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh @@ -335,7 +335,7 @@ 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::size; ++ i) + for (int i = 0; i < Vector::dimension; ++ i) tmp[i] = posI[i] - posJ[i]; Scalar dist = tmp.two_norm(); diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh index 3eeb2716f3..32547f639e 100644 --- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh +++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh @@ -250,7 +250,7 @@ public: { // diffusive flux of the second component - massfraction tmp = 0; - for (int i = 0; i < Vector::size; ++ i) + for (int i = 0; i < Vector::dimension; ++ i) tmp += fluxVars.massFracGrad(comp1Idx)[i]*fluxVars.face().normal[i]; tmp *= -1; tmp *= fluxVars.porousDiffCoeff() * fluxVars.densityAtIP(); @@ -261,7 +261,7 @@ public: { // diffusive flux of the second component - molefraction tmp = 0; - for (int i = 0; i < Vector::size; ++ i) + for (int i = 0; i < Vector::dimension; ++ i) tmp += fluxVars.moleFracGrad(comp1Idx)[i]*fluxVars.face().normal[i]; tmp *= -1; tmp *= fluxVars.porousDiffCoeff() * fluxVars.molarDensityAtIP(); @@ -417,7 +417,7 @@ protected: // diffusive flux of comp1 component in phase0 Scalar tmp = 0; - for (int i = 0; i < Vector::size; ++ i) + for (int i = 0; i < Vector::dimension; ++ i) tmp += boundaryVars.massFracGrad(comp1Idx)[i]*boundaryVars.boundaryFace().normal[i]; tmp *= -1; @@ -433,7 +433,7 @@ protected: // diffusive flux of comp1 component in phase0 Scalar tmp = 0; - for (int i = 0; i < Vector::size; ++ i) + for (int i = 0; i < Vector::dimension; ++ i) tmp += boundaryVars.moleFracGrad(comp1Idx)[i]*boundaryVars.boundaryFace().normal[i]; tmp *= -1; diff --git a/dumux/boxmodels/2pni/2pnilocalresidual.hh b/dumux/boxmodels/2pni/2pnilocalresidual.hh index 1fbce6bcae..d863be68d3 100644 --- a/dumux/boxmodels/2pni/2pnilocalresidual.hh +++ b/dumux/boxmodels/2pni/2pnilocalresidual.hh @@ -148,7 +148,7 @@ public: fluxVars.intrinsicPermeability().mv(fluxVars.potentialGrad(phaseIdx), tmpVec); Scalar normalFlux = 0; - for (int i = 0; i < Vector::size; ++i) + for (int i = 0; i < Vector::dimension; ++i) normalFlux += tmpVec[i]*fluxVars.face().normal[i]; normalFlux *= -1; -- GitLab