From f64b89123357bbaaf2d12e5b09a4b2ed8a0420fb Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 1 Oct 2013 17:24:44 +0000
Subject: [PATCH] implement naming convention vertIdx -> vIdx
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11593 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../lmethod/fvmpfal3dpressure2padaptive.hh | 4 ++--
.../omethod/fvmpfao2dpressurevelocity2p.hh | 4 ++--
dumux/implicit/2p/2pvolumevariables.hh | 2 +-
dumux/implicit/2p2c/2p2cvolumevariables.hh | 2 +-
dumux/implicit/box/boxfvelementgeometry.hh | 22 ++++++++---------
dumux/implicit/co2/co2volumevariables.hh | 2 +-
dumux/parallel/vertexhandles.hh | 24 +++++++++----------
7 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
index 8446769870..fffc4234b7 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
@@ -284,9 +284,9 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixRowSize()
{
if (neighbor->level() == levelI + 2)
{
- for (int vertIdx = 0; vertIdx < numCorners; vertIdx++)
+ for (int vIdx = 0; vIdx < numCorners; vIdx++)
{
- int globalVertIdxJ = problem_.variables().vertexMapper().map(*neighbor, vertIdx, dim);
+ int globalVertIdxJ = problem_.variables().vertexMapper().map(*neighbor, vIdx, dim);
if (globalVertIdxJ != globalVertIdx)
{
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh
index c9c1db2b25..52f2cd8a7a 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh
@@ -317,9 +317,9 @@ void FvMpfaO2dPressureVelocity2p<TypeTag>::calculateVelocity(const Intersection&
Dune::FieldVector<CellData, 4> cellDataTemp;
- for (int vertIdx = 0; vertIdx < numVertices; vertIdx++)
+ for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
- int localVertIdx = referenceElement.subEntity(indexInInside, dim - 1, vertIdx, dim);
+ int localVertIdx = referenceElement.subEntity(indexInInside, dim - 1, vIdx, dim);
int globalVertIdx = problem_.variables().index(
*((*elementPtrI).template subEntity < dim > (localVertIdx)));
diff --git a/dumux/implicit/2p/2pvolumevariables.hh b/dumux/implicit/2p/2pvolumevariables.hh
index 302c131e89..b783f6406f 100644
--- a/dumux/implicit/2p/2pvolumevariables.hh
+++ b/dumux/implicit/2p/2pvolumevariables.hh
@@ -255,7 +255,7 @@ protected:
const Problem &problem,
const Element &element,
const FVElementGeometry &fvGeometry,
- int vertIdx,
+ int vIdx,
bool isOldSol)
{ }
diff --git a/dumux/implicit/2p2c/2p2cvolumevariables.hh b/dumux/implicit/2p2c/2p2cvolumevariables.hh
index e4c49d66db..8b0c18d0a1 100644
--- a/dumux/implicit/2p2c/2p2cvolumevariables.hh
+++ b/dumux/implicit/2p2c/2p2cvolumevariables.hh
@@ -454,7 +454,7 @@ protected:
const Problem &problem,
const Element &element,
const FVElementGeometry &fvGeometry,
- const int vertIdx,
+ const int vIdx,
bool isOldSol)
{ }
diff --git a/dumux/implicit/box/boxfvelementgeometry.hh b/dumux/implicit/box/boxfvelementgeometry.hh
index ca6c89e70b..32f96b798e 100644
--- a/dumux/implicit/box/boxfvelementgeometry.hh
+++ b/dumux/implicit/box/boxfvelementgeometry.hh
@@ -469,7 +469,7 @@ class BoxFVElementGeometry
}
}
- void getEdgeIndices(int numVertices, int faceIdx, int vertIdx, int& leftEdge, int& rightEdge)
+ void getEdgeIndices(int numVertices, int faceIdx, int vIdx, int& leftEdge, int& rightEdge)
{
static const int faceAndVertexToLeftEdgeTet[4][4] = {
{ 0, 0, 2, -1},
@@ -530,20 +530,20 @@ class BoxFVElementGeometry
switch (numVertices) {
case 4:
- leftEdge = faceAndVertexToLeftEdgeTet[faceIdx][vertIdx];
- rightEdge = faceAndVertexToRightEdgeTet[faceIdx][vertIdx];
+ leftEdge = faceAndVertexToLeftEdgeTet[faceIdx][vIdx];
+ rightEdge = faceAndVertexToRightEdgeTet[faceIdx][vIdx];
break;
case 5:
- leftEdge = faceAndVertexToLeftEdgePyramid[faceIdx][vertIdx];
- rightEdge = faceAndVertexToRightEdgePyramid[faceIdx][vertIdx];
+ leftEdge = faceAndVertexToLeftEdgePyramid[faceIdx][vIdx];
+ rightEdge = faceAndVertexToRightEdgePyramid[faceIdx][vIdx];
break;
case 6:
- leftEdge = faceAndVertexToLeftEdgePrism[faceIdx][vertIdx];
- rightEdge = faceAndVertexToRightEdgePrism[faceIdx][vertIdx];
+ leftEdge = faceAndVertexToLeftEdgePrism[faceIdx][vIdx];
+ rightEdge = faceAndVertexToRightEdgePrism[faceIdx][vIdx];
break;
case 8:
- leftEdge = faceAndVertexToLeftEdgeHex[faceIdx][vertIdx];
- rightEdge = faceAndVertexToRightEdgeHex[faceIdx][vertIdx];
+ leftEdge = faceAndVertexToLeftEdgeHex[faceIdx][vIdx];
+ rightEdge = faceAndVertexToRightEdgeHex[faceIdx][vIdx];
break;
default:
DUNE_THROW(Dune::NotImplemented, "BoxFVElementGeometry :: getFaceIndices for numVertices = " << numVertices);
@@ -952,8 +952,8 @@ public:
JacobianInverseTransposed jacInvT =
geometry.jacobianInverseTransposed(subContVol[scvIdx].localCenter);
- for (int vertIdx = 0; vertIdx < numScv; vertIdx++)
- jacInvT.mv(localJac[vertIdx][0], subContVol[scvIdx].gradCenter[vertIdx]);
+ for (int vIdx = 0; vIdx < numScv; vIdx++)
+ jacInvT.mv(localJac[vIdx][0], subContVol[scvIdx].gradCenter[vIdx]);
}
}
}
diff --git a/dumux/implicit/co2/co2volumevariables.hh b/dumux/implicit/co2/co2volumevariables.hh
index ed6cfa7ac8..8094145dfa 100644
--- a/dumux/implicit/co2/co2volumevariables.hh
+++ b/dumux/implicit/co2/co2volumevariables.hh
@@ -425,7 +425,7 @@ protected:
const Problem &problem,
const Element &element,
const FVElementGeometry &fvGeometry,
- const int vertIdx,
+ const int vIdx,
bool isOldSol)
{ }
diff --git a/dumux/parallel/vertexhandles.hh b/dumux/parallel/vertexhandles.hh
index 8d8c5bed64..91be6b9270 100644
--- a/dumux/parallel/vertexhandles.hh
+++ b/dumux/parallel/vertexhandles.hh
@@ -68,18 +68,18 @@ public:
template<class MessageBufferImp, class EntityType>
void gather(MessageBufferImp &buff, const EntityType &e) const
{
- int vertIdx = mapper_.map(e);
- buff.write(container_[vertIdx]);
+ int vIdx = mapper_.map(e);
+ buff.write(container_[vIdx]);
}
template<class MessageBufferImp, class EntityType>
void scatter(MessageBufferImp &buff, const EntityType &e, size_t n)
{
- int vertIdx = mapper_.map(e);
+ int vIdx = mapper_.map(e);
FieldType tmp;
buff.read(tmp);
- container_[vertIdx] += tmp;
+ container_[vIdx] += tmp;
}
private:
@@ -126,18 +126,18 @@ public:
template<class MessageBufferImp, class EntityType>
void gather(MessageBufferImp &buff, const EntityType &e) const
{
- int vertIdx = mapper_.map(e);
- buff.write(container_[vertIdx]);
+ int vIdx = mapper_.map(e);
+ buff.write(container_[vIdx]);
}
template<class MessageBufferImp, class EntityType>
void scatter(MessageBufferImp &buff, const EntityType &e, size_t n)
{
- int vertIdx = mapper_.map(e);
+ int vIdx = mapper_.map(e);
FieldType tmp;
buff.read(tmp);
- container_[vertIdx] = std::max(container_[vertIdx], tmp);
+ container_[vIdx] = std::max(container_[vIdx], tmp);
}
private:
@@ -185,18 +185,18 @@ public:
template<class MessageBufferImp, class EntityType>
void gather(MessageBufferImp &buff, const EntityType &e) const
{
- int vertIdx = mapper_.map(e);
- buff.write(container_[vertIdx]);
+ int vIdx = mapper_.map(e);
+ buff.write(container_[vIdx]);
}
template<class MessageBufferImp, class EntityType>
void scatter(MessageBufferImp &buff, const EntityType &e, size_t n)
{
- int vertIdx = mapper_.map(e);
+ int vIdx = mapper_.map(e);
FieldType tmp;
buff.read(tmp);
- container_[vertIdx] = std::min(container_[vertIdx], tmp);
+ container_[vIdx] = std::min(container_[vIdx], tmp);
}
private:
--
GitLab