From 5c922a8988a6f873d399d66350fb0e97a605ce2c Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 19 Dec 2012 13:54:19 +0000
Subject: [PATCH] merge from implicit branch: deprecate numFAP and numSCV and
replace by numFap and numScv. Reviewed by gruenich.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9884 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/implicit/1p/1pmodel.hh | 2 +-
dumux/implicit/1p2c/1p2cfluxvariables.hh | 2 +-
dumux/implicit/1p2c/1p2cmodel.hh | 2 +-
dumux/implicit/2p/2pmodel.hh | 4 +--
dumux/implicit/2p2c/2p2cfluxvariables.hh | 4 +--
dumux/implicit/2p2c/2p2clocalresidual.hh | 4 +--
dumux/implicit/2p2c/2p2cmodel.hh | 6 ++--
dumux/implicit/2p2cni/2p2cnifluxvariables.hh | 2 +-
dumux/implicit/2pdfm/2pdfmfluxvariables.hh | 2 +-
dumux/implicit/2pni/2pnifluxvariables.hh | 2 +-
dumux/implicit/3p3c/3p3cfluxvariables.hh | 2 +-
dumux/implicit/3p3c/3p3cmodel.hh | 4 +--
dumux/implicit/3p3cni/3p3cnifluxvariables.hh | 2 +-
dumux/implicit/box/boxfvelementgeometry.hh | 14 +++++---
.../cellcentered/ccfvelementgeometry.hh | 34 +++++++++++--------
dumux/implicit/co2/co2model.hh | 2 +-
.../common/implicitdarcyfluxvariables.hh | 2 +-
.../implicit/common/implicitlocaljacobian.hh | 2 +-
.../implicit/common/implicitlocalresidual.hh | 22 ++++++------
dumux/implicit/common/implicitmodel.hh | 2 +-
.../implicit/mpnc/diffusion/fluxvariables.hh | 2 +-
.../mpnc/energy/mpncfluxvariablesenergy.hh | 2 +-
.../mpnc/energy/mpncvtkwriterenergy.hh | 4 +--
dumux/implicit/mpnc/mass/mpncvtkwritermass.hh | 2 +-
dumux/implicit/mpnc/mpnclocalresidual.hh | 4 +--
dumux/implicit/mpnc/mpncvtkwritercommon.hh | 2 +-
dumux/implicit/richards/richardsmodel.hh | 2 +-
.../richards/richardsnewtoncontroller.hh | 2 +-
28 files changed, 72 insertions(+), 64 deletions(-)
diff --git a/dumux/implicit/1p/1pmodel.hh b/dumux/implicit/1p/1pmodel.hh
index a422c957f6..c60097c8ce 100644
--- a/dumux/implicit/1p/1pmodel.hh
+++ b/dumux/implicit/1p/1pmodel.hh
@@ -95,7 +95,7 @@ public:
fvGeometry.update(this->gridView_(), *elemIt);
elemBcTypes.update(this->problem_(), *elemIt, fvGeometry);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
diff --git a/dumux/implicit/1p2c/1p2cfluxvariables.hh b/dumux/implicit/1p2c/1p2cfluxvariables.hh
index ce408eee06..57ce503d8b 100644
--- a/dumux/implicit/1p2c/1p2cfluxvariables.hh
+++ b/dumux/implicit/1p2c/1p2cfluxvariables.hh
@@ -267,7 +267,7 @@ protected:
// use finite-element gradients
tmp = 0.0;
for (int idx = 0;
- idx < fvGeometry_.numFAP;
+ idx < fvGeometry_.numFap;
idx++) // loop over adjacent vertices
{
// FE gradient at vertex idx
diff --git a/dumux/implicit/1p2c/1p2cmodel.hh b/dumux/implicit/1p2c/1p2cmodel.hh
index f347ef16c1..0a52459dcd 100644
--- a/dumux/implicit/1p2c/1p2cmodel.hh
+++ b/dumux/implicit/1p2c/1p2cmodel.hh
@@ -171,7 +171,7 @@ public:
fvGeometry.update(this->gridView_(), *elemIt);
elemBcTypes.update(this->problem_(), *elemIt, fvGeometry);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
diff --git a/dumux/implicit/2p/2pmodel.hh b/dumux/implicit/2p/2pmodel.hh
index c6b2375aa3..3a981ad98e 100644
--- a/dumux/implicit/2p/2pmodel.hh
+++ b/dumux/implicit/2p/2pmodel.hh
@@ -171,7 +171,7 @@ public:
fvGeometry.update(this->gridView_(), *elemIt);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
@@ -276,7 +276,7 @@ public:
= elemIt->geometry().jacobianTransposed(localPos);
// transform vertex velocities from local to global coordinates
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
// calculate the subcontrolvolume velocity by the Piola transformation
diff --git a/dumux/implicit/2p2c/2p2cfluxvariables.hh b/dumux/implicit/2p2c/2p2cfluxvariables.hh
index f93b15a39b..39586a9305 100644
--- a/dumux/implicit/2p2c/2p2cfluxvariables.hh
+++ b/dumux/implicit/2p2c/2p2cfluxvariables.hh
@@ -109,7 +109,7 @@ protected:
// calculate densities at the integration points of the face
DimVector tmp(0.0);
for (int idx = 0;
- idx < this->fvGeometry_.numFAP;
+ idx < this->fvGeometry_.numFap;
idx++) // loop over adjacent vertices
{
// index for the element volume variables
@@ -135,7 +135,7 @@ protected:
// calculate gradients
DimVector tmp(0.0);
for (int idx = 0;
- idx < this->fvGeometry_.numFAP;
+ idx < this->fvGeometry_.numFap;
idx++) // loop over adjacent vertices
{
// FE gradient at vertex idx
diff --git a/dumux/implicit/2p2c/2p2clocalresidual.hh b/dumux/implicit/2p2c/2p2clocalresidual.hh
index f1b2932659..1773cb484f 100644
--- a/dumux/implicit/2p2c/2p2clocalresidual.hh
+++ b/dumux/implicit/2p2c/2p2clocalresidual.hh
@@ -105,7 +105,7 @@ class TwoPTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
ElementVolumeVariables elemVolVars;
elemVolVars.update(this->problem_(), element, fvGeometry, false);
- this->storageTerm_.resize(fvGeometry.numSCV);
+ this->storageTerm_.resize(fvGeometry.numScv);
this->storageTerm_ = 0;
this->elemPtr_ = &element;
@@ -310,7 +310,7 @@ class TwoPTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
void evalPhaseStorage_(const int phaseIdx)
{
// evaluate the storage terms of a single phase
- for (int i=0; i < this->fvGeometry_().numSCV; i++) {
+ for (int i=0; i < this->fvGeometry_().numScv; i++) {
PrimaryVariables &storage = this->storageTerm_[i];
const ElementVolumeVariables &elemVolVars = this->curVolVars_();
const VolumeVariables &volVars = elemVolVars[i];
diff --git a/dumux/implicit/2p2c/2p2cmodel.hh b/dumux/implicit/2p2c/2p2cmodel.hh
index 0888a42310..1d97824668 100644
--- a/dumux/implicit/2p2c/2p2cmodel.hh
+++ b/dumux/implicit/2p2c/2p2cmodel.hh
@@ -346,7 +346,7 @@ public:
(*rank)[idx] = this->gridView_().comm().rank();
fvGeometry.update(this->gridView_(), *elemIt);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
@@ -461,7 +461,7 @@ public:
elemIt->geometry().jacobianTransposed(localPos);
// transform vertex velocities from local to global coordinates
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
// calculate the subcontrolvolume velocity by the Piola transformation
@@ -584,7 +584,7 @@ public:
for (; elemIt != elemEndIt; ++elemIt)
{
fvGeometry.update(this->gridView_(), *elemIt);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
diff --git a/dumux/implicit/2p2cni/2p2cnifluxvariables.hh b/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
index 6e429ad7e1..499d7250a6 100644
--- a/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
@@ -103,7 +103,7 @@ protected:
// gradients
temperatureGrad_ = 0;
DimVector tmp(0.0);
- for (int idx = 0; idx < this->fvGeometry_.numFAP; idx++)
+ for (int idx = 0; idx < this->fvGeometry_.numFap; idx++)
{
tmp = this->face().grad[idx];
diff --git a/dumux/implicit/2pdfm/2pdfmfluxvariables.hh b/dumux/implicit/2pdfm/2pdfmfluxvariables.hh
index 958a06f317..5f10e4ee6f 100644
--- a/dumux/implicit/2pdfm/2pdfmfluxvariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmfluxvariables.hh
@@ -199,7 +199,7 @@ private:
int faceIdx)
{
// calculate gradients, loop over adjacent vertices
- for (int idx = 0; idx < this->fvGeometry_.numFAP; idx++)
+ for (int idx = 0; idx < this->fvGeometry_.numFap; idx++)
{
int i = this->face().i;
int j = this->face().j;
diff --git a/dumux/implicit/2pni/2pnifluxvariables.hh b/dumux/implicit/2pni/2pnifluxvariables.hh
index ca7496b340..5683986a41 100644
--- a/dumux/implicit/2pni/2pnifluxvariables.hh
+++ b/dumux/implicit/2pni/2pnifluxvariables.hh
@@ -86,7 +86,7 @@ public:
// calculate temperature gradient using finite element
// gradients
Vector temperatureGrad(0);
- for (int idx = 0; idx < fvGeometry.numFAP; idx++)
+ for (int idx = 0; idx < fvGeometry.numFap; idx++)
{
Vector feGrad = this->face().grad[idx];
diff --git a/dumux/implicit/3p3c/3p3cfluxvariables.hh b/dumux/implicit/3p3c/3p3cfluxvariables.hh
index a687fb3d64..14ecd1c27d 100644
--- a/dumux/implicit/3p3c/3p3cfluxvariables.hh
+++ b/dumux/implicit/3p3c/3p3cfluxvariables.hh
@@ -126,7 +126,7 @@ private:
// calculate gradients
DimVector tmp(0.0);
for (int idx = 0;
- idx < this->fvGeometry_.numFAP;
+ idx < this->fvGeometry_.numFap;
idx++) // loop over adjacent vertices
{
// FE gradient at vertex idx
diff --git a/dumux/implicit/3p3c/3p3cmodel.hh b/dumux/implicit/3p3c/3p3cmodel.hh
index e80cbe387d..800680b03a 100644
--- a/dumux/implicit/3p3c/3p3cmodel.hh
+++ b/dumux/implicit/3p3c/3p3cmodel.hh
@@ -321,7 +321,7 @@ public:
(*rank)[idx] = this->gridView_().comm().rank();
fvGeometry.update(this->gridView_(), *elemIt);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
@@ -450,7 +450,7 @@ public:
for (; elemIt != elemEndIt; ++elemIt)
{
fvGeometry.update(this->gridView_(), *elemIt);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
diff --git a/dumux/implicit/3p3cni/3p3cnifluxvariables.hh b/dumux/implicit/3p3cni/3p3cnifluxvariables.hh
index b2ddd93321..9fbbd3edc3 100644
--- a/dumux/implicit/3p3cni/3p3cnifluxvariables.hh
+++ b/dumux/implicit/3p3cni/3p3cnifluxvariables.hh
@@ -89,7 +89,7 @@ public:
// gradients
DimVector temperatureGrad(0);
DimVector tmp(0.0);
- for (int vertIdx = 0; vertIdx < fvGeometry.numFAP; vertIdx++)
+ for (int vertIdx = 0; vertIdx < fvGeometry.numFap; vertIdx++)
{
tmp = this->face().grad[vertIdx];
diff --git a/dumux/implicit/box/boxfvelementgeometry.hh b/dumux/implicit/box/boxfvelementgeometry.hh
index 8f0811b440..086f7f18ca 100644
--- a/dumux/implicit/box/boxfvelementgeometry.hh
+++ b/dumux/implicit/box/boxfvelementgeometry.hh
@@ -586,9 +586,11 @@ public:
int numVertices; //!< number of verts
int numEdges; //!< number of edges
int numFaces; //!< number of faces (0 in < 3D)
- int numSCV; //!< number of subcontrol volumes
+ int numScv; //!< number of subcontrol volumes
+ int numSCV; //!< \deprecated number of subcontrol volumes
int numNeighbors; //!< needed for compatibility with cc models
- int numFAP; //!< number of flux approximation points
+ int numFap; //!< number of flux approximation points
+ int numFAP; //!< \deprecated number of flux approximation points
std::vector<ElementPointer> neighbors; //!< needed for compatibility with cc models
const LocalFiniteElementCache feCache_;
@@ -614,15 +616,17 @@ public:
numVertices = referenceElement.size(dim);
numEdges = referenceElement.size(dim-1);
numFaces = (dim<3)?0:referenceElement.size(1);
- numSCV = numVertices;
+ numScv = numVertices;
+ numSCV = numScv;
numNeighbors = 0;
bool useTwoPointFlux
= GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, UseTwoPointFlux);
if (useTwoPointFlux)
- numFAP = 2;
+ numFap = 2;
else
- numFAP = numVertices;
+ numFap = numVertices;
+ numFAP = numFap;
// corners:
for (int vert = 0; vert < numVertices; vert++) {
diff --git a/dumux/implicit/cellcentered/ccfvelementgeometry.hh b/dumux/implicit/cellcentered/ccfvelementgeometry.hh
index 719f0c675f..8bde74b915 100644
--- a/dumux/implicit/cellcentered/ccfvelementgeometry.hh
+++ b/dumux/implicit/cellcentered/ccfvelementgeometry.hh
@@ -110,24 +110,28 @@ public:
int numVertices; //!< number of verts
int numEdges; //!< number of edges
int numFaces; //!< number of faces (0 in < 3D)
- int numSCV; //!< number of subcontrol volumes
+ int numScv; //!< number of subcontrol volumes
+ int numSCV; //!< \deprecated number of subcontrol volumes
int numNeighbors; //!< number of neighboring elements including the element itself
- int numFAP; //!< number of flux approximation points
+ int numFap; //!< number of flux approximation points
+ int numFAP; //!< \deprecated number of flux approximation points
std::vector<ElementPointer> neighbors; //!< stores pointers for the neighboring elements
- void updateInner(const Element& e)
+ void updateInner(const Element& element)
{
- const Geometry& geometry = e.geometry();
+ const Geometry& geometry = element.geometry();
elementVolume = geometry.volume();
elementGlobal = geometry.center();
elementLocal = geometry.local(elementGlobal);
- numVertices = e.template count<dim>();
- numEdges = e.template count<dim-1>();
- numFaces = (dim<3)? 0 : e.template count<1>();
- numSCV = 1;
- numFAP = 2;
+ numVertices = element.template count<dim>();
+ numEdges = element.template count<dim-1>();
+ numFaces = (dim<3)? 0 : element.template count<1>();
+ numScv = 1;
+ numSCV = numScv;
+ numFap = 2;
+ numFAP = numFap;
subContVol[0].local = elementLocal;
subContVol[0].global = elementGlobal;
@@ -138,19 +142,19 @@ public:
numNeighbors = 1;
neighbors.clear();
neighbors.reserve(maxNE);
- ElementPointer elementPointer(e);
+ ElementPointer elementPointer(element);
neighbors.push_back(elementPointer);
}
- void update(const GridView& gridView, const Element& e)
+ void update(const GridView& gridView, const Element& element)
{
- updateInner(e);
+ updateInner(element);
- const Geometry& geometry = e.geometry();
+ const Geometry& geometry = element.geometry();
// fill neighbor information and control volume face data:
- IntersectionIterator endit = gridView.iend(e);
- for (IntersectionIterator it = gridView.ibegin(e); it != endit; ++it)
+ IntersectionIterator endit = gridView.iend(element);
+ for (IntersectionIterator it = gridView.ibegin(element); it != endit; ++it)
{
// neighbor information and inner cvf data:
if (it->neighbor())
diff --git a/dumux/implicit/co2/co2model.hh b/dumux/implicit/co2/co2model.hh
index 31b2fa649f..840d8dc153 100644
--- a/dumux/implicit/co2/co2model.hh
+++ b/dumux/implicit/co2/co2model.hh
@@ -127,7 +127,7 @@ public:
for (; elemIt != elemEndIt; ++elemIt)
{
fvGeometry.update(this->gridView_(), *elemIt);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
diff --git a/dumux/implicit/common/implicitdarcyfluxvariables.hh b/dumux/implicit/common/implicitdarcyfluxvariables.hh
index 9507d03a89..b0e7a77842 100644
--- a/dumux/implicit/common/implicitdarcyfluxvariables.hh
+++ b/dumux/implicit/common/implicitdarcyfluxvariables.hh
@@ -183,7 +183,7 @@ protected:
{
gradPotential_[phaseIdx]= 0.0 ;
for (int idx = 0;
- idx < fvGeometry_.numFAP;
+ idx < fvGeometry_.numFap;
idx++) // loop over adjacent vertices
{
// FE gradient at vertex idx
diff --git a/dumux/implicit/common/implicitlocaljacobian.hh b/dumux/implicit/common/implicitlocaljacobian.hh
index d686de8c02..8a21d9cc36 100644
--- a/dumux/implicit/common/implicitlocaljacobian.hh
+++ b/dumux/implicit/common/implicitlocaljacobian.hh
@@ -545,7 +545,7 @@ protected:
}
}
- for (int i = 0; i < fvElemGeom_.numSCV; i++)
+ for (int i = 0; i < fvElemGeom_.numScv; i++)
{
// Green vertices are not to be changed!
if (!isBox || jacAsm_().vertexColor(element_(), i) != Green) {
diff --git a/dumux/implicit/common/implicitlocalresidual.hh b/dumux/implicit/common/implicitlocalresidual.hh
index f020e8bbd1..3651153588 100644
--- a/dumux/implicit/common/implicitlocalresidual.hh
+++ b/dumux/implicit/common/implicitlocalresidual.hh
@@ -178,7 +178,7 @@ public:
ElementBoundaryTypes bcTypes;
bcTypes.update(problem_(), element, fvGeometry_());
- residual_.resize(fvGeometry_().numSCV);
+ residual_.resize(fvGeometry_().numScv);
residual_ = 0;
bcTypesPtr_ = &bcTypes;
@@ -226,9 +226,9 @@ public:
curVolVarsPtr_ = &curVolVars;
// resize the vectors for all terms
- int numSCV = fvGeometry_().numSCV;
- residual_.resize(numSCV);
- storageTerm_.resize(numSCV);
+ int numScv = fvGeometry_().numScv;
+ residual_.resize(numScv);
+ storageTerm_.resize(numScv);
residual_ = 0.0;
storageTerm_ = 0.0;
@@ -236,14 +236,14 @@ public:
asImp_().evalFluxes_();
#if !defined NDEBUG && HAVE_VALGRIND
- for (int i=0; i < fvGeometry_().numSCV; i++)
+ for (int i=0; i < fvGeometry_().numScv; i++)
Valgrind::CheckDefined(residual_[i]);
#endif // HAVE_VALGRIND
asImp_().evalVolumeTerms_();
#if !defined NDEBUG && HAVE_VALGRIND
- for (int i=0; i < fvGeometry_().numSCV; i++) {
+ for (int i=0; i < fvGeometry_().numScv; i++) {
Valgrind::CheckDefined(residual_[i]);
}
#endif // HAVE_VALGRIND
@@ -252,7 +252,7 @@ public:
asImp_().evalBoundary_();
#if !defined NDEBUG && HAVE_VALGRIND
- for (int i=0; i < fvGeometry_().numSCV; i++)
+ for (int i=0; i < fvGeometry_().numScv; i++)
Valgrind::CheckDefined(residual_[i]);
#endif // HAVE_VALGRIND
}
@@ -310,7 +310,7 @@ protected:
if (bcTypes_().hasNeumann() || bcTypes_().hasOutflow())
asImp_().evalBoundaryFluxes_();
#if !defined NDEBUG && HAVE_VALGRIND
- for (int i=0; i < fvGeometry_().numSCV; i++)
+ for (int i=0; i < fvGeometry_().numScv; i++)
Valgrind::CheckDefined(residual_[i]);
#endif // HAVE_VALGRIND
@@ -324,12 +324,12 @@ protected:
*/
void evalStorage_()
{
- storageTerm_.resize(fvGeometry_().numSCV);
+ storageTerm_.resize(fvGeometry_().numScv);
storageTerm_ = 0;
// calculate the amount of conservation each quantity inside
// all sub control volumes
- for (int scvIdx = 0; scvIdx < fvGeometry_().numSCV; scvIdx++) {
+ for (int scvIdx = 0; scvIdx < fvGeometry_().numScv; scvIdx++) {
Valgrind::SetUndefined(storageTerm_[scvIdx]);
asImp_().computeStorage(storageTerm_[scvIdx], scvIdx, /*isOldSol=*/false);
storageTerm_[scvIdx] *=
@@ -347,7 +347,7 @@ protected:
void evalVolumeTerms_()
{
// evaluate the volume terms (storage + source terms)
- for (int scvIdx = 0; scvIdx < fvGeometry_().numSCV; scvIdx++)
+ for (int scvIdx = 0; scvIdx < fvGeometry_().numScv; scvIdx++)
{
Scalar extrusionFactor =
curVolVars_(scvIdx).extrusionFactor();
diff --git a/dumux/implicit/common/implicitmodel.hh b/dumux/implicit/common/implicitmodel.hh
index 1b45cb14e9..1bb905fa78 100644
--- a/dumux/implicit/common/implicitmodel.hh
+++ b/dumux/implicit/common/implicitmodel.hh
@@ -883,7 +883,7 @@ protected:
fvGeometry.update(gridView_(), *eIt);
// loop over all element vertices, i.e. sub control volumes
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; scvIdx++)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; scvIdx++)
{
// get the global index of the degree of freedom
int globalIdx = dofMapper().map(*eIt, scvIdx, dofCodim);
diff --git a/dumux/implicit/mpnc/diffusion/fluxvariables.hh b/dumux/implicit/mpnc/diffusion/fluxvariables.hh
index 7ed8570e08..5ec0a5617e 100644
--- a/dumux/implicit/mpnc/diffusion/fluxvariables.hh
+++ b/dumux/implicit/mpnc/diffusion/fluxvariables.hh
@@ -75,7 +75,7 @@ public:
DimVector tmp ;
for (int idx = 0;
- idx < fvGeometry.numFAP;
+ idx < fvGeometry.numFap;
idx++) // loop over adjacent vertices
{
// FE gradient at vertex idx
diff --git a/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh b/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
index 59a856b399..d1c6e914a0 100644
--- a/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
+++ b/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
@@ -107,7 +107,7 @@ public:
// gradients
DimVector tmp(0.0);
DimVector temperatureGradient(0.);
- for (int idx = 0; idx < fvGeometry.numFAP; idx++)
+ for (int idx = 0; idx < fvGeometry.numFap; idx++)
{
tmp = face.grad[idx];
diff --git a/dumux/implicit/mpnc/energy/mpncvtkwriterenergy.hh b/dumux/implicit/mpnc/energy/mpncvtkwriterenergy.hh
index ab71e76017..dee82d4f83 100644
--- a/dumux/implicit/mpnc/energy/mpncvtkwriterenergy.hh
+++ b/dumux/implicit/mpnc/energy/mpncvtkwriterenergy.hh
@@ -90,7 +90,7 @@ public:
const ElementVolumeVariables &elemVolVars,
const ElementBoundaryTypes &elemBcTypes)
{
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx) {
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx) {
const unsigned int globalIdx = this->problem_.model().dofMapper().map(element, scvIdx, dofCodim);
const VolumeVariables &volVars = elemVolVars[scvIdx];
@@ -176,7 +176,7 @@ public:
const ElementVolumeVariables &elemVolVars,
const ElementBoundaryTypes &elemBcTypes)
{
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx) {
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx) {
int gobalIdx = this->problem_.model().dofMapper().map(element, scvIdx, dofCodim);
const VolumeVariables &volVars = elemVolVars[scvIdx];
diff --git a/dumux/implicit/mpnc/mass/mpncvtkwritermass.hh b/dumux/implicit/mpnc/mass/mpncvtkwritermass.hh
index e20077b6d3..dd01a043a2 100644
--- a/dumux/implicit/mpnc/mass/mpncvtkwritermass.hh
+++ b/dumux/implicit/mpnc/mass/mpncvtkwritermass.hh
@@ -88,7 +88,7 @@ public:
const ElementVolumeVariables &elemVolVars,
const ElementBoundaryTypes &elemBcTypes)
{
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx) {
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx) {
const unsigned int globalIdx = this->problem_.model().dofMapper().map(element, scvIdx, dofCodim);
const VolumeVariables &volVars = elemVolVars[scvIdx];
diff --git a/dumux/implicit/mpnc/mpnclocalresidual.hh b/dumux/implicit/mpnc/mpnclocalresidual.hh
index f67fed5862..007c7d1bc5 100644
--- a/dumux/implicit/mpnc/mpnclocalresidual.hh
+++ b/dumux/implicit/mpnc/mpnclocalresidual.hh
@@ -115,7 +115,7 @@ public:
// calculate the phase storage for all sub-control volumes
for (int scvIdx=0;
- scvIdx < fvGeometry.numSCV;
+ scvIdx < fvGeometry.numScv;
scvIdx++)
{
PrimaryVariables tmpPriVars(0.0);
@@ -219,7 +219,7 @@ public:
curVolVars,
bcType);
- for (int i = 0; i < this->fvGeometry_().numSCV; ++i) {
+ for (int i = 0; i < this->fvGeometry_().numScv; ++i) {
// add the two auxiliary equations, make sure that the
// dirichlet boundary condition is conserved
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
diff --git a/dumux/implicit/mpnc/mpncvtkwritercommon.hh b/dumux/implicit/mpnc/mpncvtkwritercommon.hh
index dcb98d07fe..402a4d7e48 100644
--- a/dumux/implicit/mpnc/mpncvtkwritercommon.hh
+++ b/dumux/implicit/mpnc/mpncvtkwritercommon.hh
@@ -129,7 +129,7 @@ public:
const ElementVolumeVariables &elemVolVars,
const ElementBoundaryTypes &elemBcTypes)
{
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->problem_.model().dofMapper().map(element, scvIdx, dofCodim);
diff --git a/dumux/implicit/richards/richardsmodel.hh b/dumux/implicit/richards/richardsmodel.hh
index 7551403fc7..5b1e22d429 100644
--- a/dumux/implicit/richards/richardsmodel.hh
+++ b/dumux/implicit/richards/richardsmodel.hh
@@ -167,7 +167,7 @@ public:
fvGeometry.update(this->gridView_(), *elemIt);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
diff --git a/dumux/implicit/richards/richardsnewtoncontroller.hh b/dumux/implicit/richards/richardsnewtoncontroller.hh
index 5513dcf5af..0b8bbd62ab 100644
--- a/dumux/implicit/richards/richardsnewtoncontroller.hh
+++ b/dumux/implicit/richards/richardsnewtoncontroller.hh
@@ -95,7 +95,7 @@ public:
const ElementIterator elemEndIt = gridView.template end<0>();
for (; elemIt != elemEndIt; ++elemIt) {
fvGeometry.update(gridView, *elemIt);
- for (int scvIdx = 0; scvIdx < fvGeometry.numSCV; ++scvIdx)
+ for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
int globalIdx = this->model_().dofMapper().map(*elemIt, scvIdx, dofCodim);
--
GitLab