From 077015a60aa0200d69e176871d6a74862813e120 Mon Sep 17 00:00:00 2001
From: Johannes Hommel <johannes.hommel@iws.uni-stuttgart.de>
Date: Tue, 25 Nov 2014 10:41:33 +0000
Subject: [PATCH] [naming] replace nodeIdx, faceVertIdx, elemVertIdx,
innerFaceIdx, pglobal, global by vIdxGlobal, faceVertexIdx, vIdx, fIdxInner,
pGlobal, globalPos
As decided at the Dumux day.
Made by Bernd, partially reviewed by Johannes.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13784 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../fvmpfa/lmethod/fvmpfal2dvelocity2p.hh | 2 +-
.../lmethod/fvmpfal2dvelocity2padaptive.hh | 2 +-
.../fvmpfa/lmethod/fvmpfal3dpressure2p.hh | 2 +-
.../lmethod/fvmpfal3dpressure2padaptive.hh | 2 +-
.../fvmpfa/lmethod/fvmpfal3dvelocity2p.hh | 2 +-
.../lmethod/fvmpfal3dvelocity2padaptive.hh | 2 +-
.../fvmpfa/omethod/fvmpfao2dvelocity2p.hh | 2 +-
.../2p/diffusion/mimetic/mimetic2p.hh | 2 +-
.../2p/diffusion/mimetic/mimetic2padaptive.hh | 2 +-
.../mimetic/mimeticpressure2padaptive.hh | 2 +-
.../2p2c/fv3dpressure2p2cadaptive.hh | 2 +-
dumux/decoupled/2p2c/fvpressure2p2c.hh | 2 +-
dumux/freeflow/stokes/stokeslocalresidual.hh | 6 +--
dumux/freeflow/stokes/stokesmodel.hh | 4 +-
dumux/geomechanics/el2p/el2pbasemodel.hh | 12 ++---
dumux/implicit/box/boxlocalresidual.hh | 10 ++--
dumux/implicit/box/intersectiontovertexbc.hh | 6 +--
dumux/implicit/common/implicitmodel.hh | 12 ++---
.../implicit/common/implicitvelocityoutput.hh | 6 +--
dumux/io/artgridcreator.hh | 50 +++++++++----------
.../2p2ccouplinglocalresidual.hh | 10 ++--
.../2p2cnicouplinglocalresidual.hh | 10 ++--
.../stokesnccouplinglocalresidual.hh | 6 +--
.../stokesncnicouplinglocalresidual.hh | 6 +--
test/decoupled/1p/resultevaluation.hh | 6 +--
test/decoupled/1p/resultevaluation3d.hh | 24 ++++-----
26 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2p.hh
index 373f5646ed..051376a32c 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2p.hh
@@ -101,7 +101,7 @@ template<class TypeTag> class FvMpfaL2dVelocity2p
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2padaptive.hh
index b817d4a1b8..ee0f4b9b06 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2padaptive.hh
@@ -98,7 +98,7 @@ template<class TypeTag> class FvMpfaL2dVelocity2pAdaptive : public FvMpfaL2dVelo
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
index ded8ef9aef..2e54fa7605 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
@@ -104,7 +104,7 @@ class FvMpfaL3dPressure2p: public FVPressure<TypeTag>
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
index 1e44a01c11..640073acac 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
@@ -108,7 +108,7 @@ class FvMpfaL3dPressure2pAdaptive: public FvMpfaL3dPressure2p<TypeTag>
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2p.hh
index abbbb2acc7..3fea23e7cf 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2p.hh
@@ -101,7 +101,7 @@ template<class TypeTag> class FvMpfaL3dVelocity2p
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh
index b97904f4f8..c9567ae482 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh
@@ -101,7 +101,7 @@ template<class TypeTag> class FvMpfaL3dVelocity2pAdaptive: public FvMpfaL3dVeloc
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dvelocity2p.hh
index 061afbf8ea..8168e3fe6f 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dvelocity2p.hh
@@ -99,7 +99,7 @@ template<class TypeTag> class FvMpfaO2dVelocity2P
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh
index 4eb32e3fce..75af5ae4c7 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh
@@ -86,7 +86,7 @@ class MimeticTwoPLocalStiffness: public LocalStiffness<TypeTag, 1>
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh b/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
index 122a651bdf..5677a90e78 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
@@ -87,7 +87,7 @@ class MimeticTwoPLocalStiffnessAdaptive: public LocalStiffness<TypeTag, 1>
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2padaptive.hh
index 6072f8bbfb..2489545dae 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2padaptive.hh
@@ -83,7 +83,7 @@ template<class TypeTag> class MimeticPressure2PAdaptive
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNw,
vw = Indices::velocityW,
diff --git a/dumux/decoupled/2p2c/fv3dpressure2p2cadaptive.hh b/dumux/decoupled/2p2c/fv3dpressure2p2cadaptive.hh
index 54db9b6000..70cc55d913 100644
--- a/dumux/decoupled/2p2c/fv3dpressure2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/fv3dpressure2p2cadaptive.hh
@@ -107,7 +107,7 @@ template<class TypeTag> class FV3dPressure2P2CAdaptive
{
pw = Indices::pressureW,
pn = Indices::pressureN,
- pglobal = Indices::pressureGlobal,
+ pGlobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationN
};
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index b2ce43e3b6..bf72dc83fb 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -94,7 +94,7 @@ template<class TypeTag> class FVPressure2P2C
{
pw = Indices::pressureW,
pn = Indices::pressureN,
- pglobal = Indices::pressureGlobal
+ pGlobal = Indices::pressureGlobal
};
enum
{
diff --git a/dumux/freeflow/stokes/stokeslocalresidual.hh b/dumux/freeflow/stokes/stokeslocalresidual.hh
index 08fa87aee6..55e10312c2 100644
--- a/dumux/freeflow/stokes/stokeslocalresidual.hh
+++ b/dumux/freeflow/stokes/stokeslocalresidual.hh
@@ -374,15 +374,15 @@ protected:
const int numFaceVertices = refElement.size(fIdx, 1, dim);
// loop over the single vertices on the current face
- for (int faceVertIdx = 0; faceVertIdx < numFaceVertices; ++faceVertIdx)
+ for (int faceVertexIdx = 0; faceVertexIdx < numFaceVertices; ++faceVertexIdx)
{
// only evaluate, if we consider the same face vertex as in the outer
// loop over the element vertices
- if (refElement.subEntity(fIdx, 1, faceVertIdx, dim)
+ if (refElement.subEntity(fIdx, 1, faceVertexIdx, dim)
!= scvIdx)
continue;
- const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertIdx);
+ const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertexIdx);
const FluxVariables boundaryVars(this->problem_(),
this->element_(),
this->fvGeometry_(),
diff --git a/dumux/freeflow/stokes/stokesmodel.hh b/dumux/freeflow/stokes/stokesmodel.hh
index 0629d780be..2af0796c6d 100644
--- a/dumux/freeflow/stokes/stokesmodel.hh
+++ b/dumux/freeflow/stokes/stokesmodel.hh
@@ -121,7 +121,7 @@ public:
bool hasLeft = false;
bool hasRight = false;
for (int i = 0; i < fvGeometry.numScv; i++) {
- const GlobalPosition &global = fvGeometry.subContVol[i].global;
+ const GlobalPosition &globalPos = fvGeometry.subContVol[i].global;
if (globalI[axis] < coordVal)
hasLeft = true;
else if (globalI[axis] >= coordVal)
@@ -131,7 +131,7 @@ public:
continue;
for (int i = 0; i < fvGeometry.numScv; i++) {
- const GlobalPosition &global = fvGeometry.subContVol[i].global;
+ const GlobalPosition &globalPos = fvGeometry.subContVol[i].global;
if (globalI[axis] < coordVal)
flux += this->localResidual().residual(i);
}
diff --git a/dumux/geomechanics/el2p/el2pbasemodel.hh b/dumux/geomechanics/el2p/el2pbasemodel.hh
index 33598e127e..e9804f486f 100644
--- a/dumux/geomechanics/el2p/el2pbasemodel.hh
+++ b/dumux/geomechanics/el2p/el2pbasemodel.hh
@@ -971,15 +971,15 @@ protected:
// boundary vertices
int fIdx = isIt->indexInInside();
int numFaceVerts = refElement.size(fIdx, 1, dim);
- for (int faceVertIdx = 0;
- faceVertIdx < numFaceVerts;
- ++faceVertIdx)
+ for (int faceVertexIdx = 0;
+ faceVertexIdx < numFaceVerts;
+ ++faceVertexIdx)
{
- int elemVertIdx = refElement.subEntity(fIdx,
+ int vIdx = refElement.subEntity(fIdx,
1,
- faceVertIdx,
+ faceVertexIdx,
dim);
- int vIdxGlobal = vertexMapper().map(*eIt, elemVertIdx, dim);
+ int vIdxGlobal = vertexMapper().map(*eIt, vIdx, dim);
boundaryIndices_[vIdxGlobal] = true;
}
}
diff --git a/dumux/implicit/box/boxlocalresidual.hh b/dumux/implicit/box/boxlocalresidual.hh
index c0beded711..184f08c53c 100644
--- a/dumux/implicit/box/boxlocalresidual.hh
+++ b/dumux/implicit/box/boxlocalresidual.hh
@@ -126,17 +126,17 @@ protected:
// face
int fIdx = isIt->indexInInside();
int numFaceVerts = refElement.size(fIdx, 1, dim);
- for (int faceVertIdx = 0;
- faceVertIdx < numFaceVerts;
- ++faceVertIdx)
+ for (int faceVertexIdx = 0;
+ faceVertexIdx < numFaceVerts;
+ ++faceVertexIdx)
{
int scvIdx = refElement.subEntity(fIdx,
1,
- faceVertIdx,
+ faceVertexIdx,
dim);
int boundaryFaceIdx =
- this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertIdx);
+ this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertexIdx);
// add the residual of all vertices of the boundary
// segment
diff --git a/dumux/implicit/box/intersectiontovertexbc.hh b/dumux/implicit/box/intersectiontovertexbc.hh
index e2dc81a52e..e955fe05dd 100644
--- a/dumux/implicit/box/intersectiontovertexbc.hh
+++ b/dumux/implicit/box/intersectiontovertexbc.hh
@@ -80,10 +80,10 @@ public:
int fIdx = isIt->indexInInside();
int numFaceVerts = refElement.size(fIdx, 1, dim);
- for (int faceVertIdx = 0; faceVertIdx < numFaceVerts; ++faceVertIdx)
+ for (int faceVertexIdx = 0; faceVertexIdx < numFaceVerts; ++faceVertexIdx)
{
- int elemVertIdx = refElement.subEntity(fIdx, 1, faceVertIdx, dim);
- int vIdxGlobal = problem.vertexMapper().map(*eIt, elemVertIdx, dim);
+ int vIdx = refElement.subEntity(fIdx, 1, faceVertexIdx, dim);
+ int vIdxGlobal = problem.vertexMapper().map(*eIt, vIdx, dim);
for (int eqIdx = 0; eqIdx < numEq; eqIdx++)
if (bcTypes.isDirichlet(eqIdx))
diff --git a/dumux/implicit/common/implicitmodel.hh b/dumux/implicit/common/implicitmodel.hh
index d4a0141dce..9ce1ccbf82 100644
--- a/dumux/implicit/common/implicitmodel.hh
+++ b/dumux/implicit/common/implicitmodel.hh
@@ -972,15 +972,15 @@ protected:
// boundary vertices
int fIdx = isIt->indexInInside();
int numFaceVerts = refElement.size(fIdx, 1, dim);
- for (int faceVertIdx = 0;
- faceVertIdx < numFaceVerts;
- ++faceVertIdx)
+ for (int faceVertexIdx = 0;
+ faceVertexIdx < numFaceVerts;
+ ++faceVertexIdx)
{
- int elemVertIdx = refElement.subEntity(fIdx,
+ int vIdx = refElement.subEntity(fIdx,
1,
- faceVertIdx,
+ faceVertexIdx,
dim);
- int vIdxGlobal = vertexMapper().map(*eIt, elemVertIdx, dim);
+ int vIdxGlobal = vertexMapper().map(*eIt, vIdx, dim);
boundaryIndices_[vIdxGlobal] = true;
}
}
diff --git a/dumux/implicit/common/implicitvelocityoutput.hh b/dumux/implicit/common/implicitvelocityoutput.hh
index 501b97964f..6286fcefcb 100644
--- a/dumux/implicit/common/implicitvelocityoutput.hh
+++ b/dumux/implicit/common/implicitvelocityoutput.hh
@@ -192,7 +192,7 @@ public:
{
Dune::FieldVector<Scalar, 2*dim> scvVelocities(0.0);
- int innerFaceIdx = 0;
+ int fIdxInner = 0;
IntersectionIterator isEndIt = problem_.gridView().iend(element);
for (IntersectionIterator isIt = problem_.gridView().ibegin(element);
isIt != isEndIt; ++isIt)
@@ -204,13 +204,13 @@ public:
FluxVariables fluxVars(problem_,
element,
fvGeometry,
- innerFaceIdx,
+ fIdxInner,
elemVolVars);
Scalar flux = fluxVars.volumeFlux(phaseIdx);
scvVelocities[fIdx] = flux;
- innerFaceIdx++;
+ fIdxInner++;
}
else if (isIt->boundary())
{
diff --git a/dumux/io/artgridcreator.hh b/dumux/io/artgridcreator.hh
index af2f0c6100..afb37590be 100644
--- a/dumux/io/artgridcreator.hh
+++ b/dumux/io/artgridcreator.hh
@@ -274,7 +274,7 @@ public:
for (int i=0; i<faceNumber_; i++)
{
- std::vector<unsigned int> nodeIdx(3);
+ std::vector<unsigned int> vIdxGlobal(3);
Dune::FieldVector<double,3> point(0);
#if PLOT
std::cout << "=====================================" << std::endl;
@@ -283,15 +283,15 @@ public:
#endif
int edgeIdx = 0;
//first node of the element - from first edge Node 1
- nodeIdx[0] = edges_[faces_[i][edgeIdx+1]][1];
+ vIdxGlobal[0] = edges_[faces_[i][edgeIdx+1]][1];
//second node of the element- from first edge Node 2
- nodeIdx[1] = edges_[faces_[i][edgeIdx+1]][2];
+ vIdxGlobal[1] = edges_[faces_[i][edgeIdx+1]][2];
//third node of the element - from the second edge
- nodeIdx[2] = edges_[faces_[i][edgeIdx+2]][1];
+ vIdxGlobal[2] = edges_[faces_[i][edgeIdx+2]][1];
// if the nodes of the edges are identical swap
- if (nodeIdx[1] == nodeIdx[2] || nodeIdx[0] == nodeIdx[2])
+ if (vIdxGlobal[1] == vIdxGlobal[2] || vIdxGlobal[0] == vIdxGlobal[2])
{
- nodeIdx[2] = edges_[faces_[i][edgeIdx+2]][2];
+ vIdxGlobal[2] = edges_[faces_[i][edgeIdx+2]][2];
}
/* Check if the order of the nodes is trigonometric
@@ -300,36 +300,36 @@ public:
Dune::FieldVector<double, 2> v(0);
Dune::FieldVector<double, 2> w(0);
double cross1;
- v[0] = vertices_[nodeIdx[0]][0] - vertices_[nodeIdx[1]][0];
- v[1] = vertices_[nodeIdx[0]][1] - vertices_[nodeIdx[1]][1];
- w[0] = vertices_[nodeIdx[0]][0] - vertices_[nodeIdx[2]][0];
- w[1] = vertices_[nodeIdx[0]][1] - vertices_[nodeIdx[2]][1];
+ v[0] = vertices_[vIdxGlobal[0]][0] - vertices_[vIdxGlobal[1]][0];
+ v[1] = vertices_[vIdxGlobal[0]][1] - vertices_[vIdxGlobal[1]][1];
+ w[0] = vertices_[vIdxGlobal[0]][0] - vertices_[vIdxGlobal[2]][0];
+ w[1] = vertices_[vIdxGlobal[0]][1] - vertices_[vIdxGlobal[2]][1];
cross1 = v[0]*w[1]-v[1]*w[0];
//If the cross product is negative switch the order of the vertices
if (cross1 < 0)
{
- nodeIdx[0] = edges_[faces_[i][edgeIdx+1]][2]; //node 0 is node 1
- nodeIdx[1] = edges_[faces_[i][edgeIdx+1]][1]; //node 1 is node 0
+ vIdxGlobal[0] = edges_[faces_[i][edgeIdx+1]][2]; //node 0 is node 1
+ vIdxGlobal[1] = edges_[faces_[i][edgeIdx+1]][1]; //node 1 is node 0
}
- v[0] = vertices_[nodeIdx[0]][0] - vertices_[nodeIdx[1]][0];
- v[1] = vertices_[nodeIdx[0]][1] - vertices_[nodeIdx[1]][1];
- w[0] = vertices_[nodeIdx[0]][0] - vertices_[nodeIdx[2]][0];
- w[1] = vertices_[nodeIdx[0]][1] - vertices_[nodeIdx[2]][1];
+ v[0] = vertices_[vIdxGlobal[0]][0] - vertices_[vIdxGlobal[1]][0];
+ v[1] = vertices_[vIdxGlobal[0]][1] - vertices_[vIdxGlobal[1]][1];
+ w[0] = vertices_[vIdxGlobal[0]][0] - vertices_[vIdxGlobal[2]][0];
+ w[1] = vertices_[vIdxGlobal[0]][1] - vertices_[vIdxGlobal[2]][1];
factory.insertElement(Dune::GeometryType(Dune::GeometryType::simplex,2),
- nodeIdx);
+ vIdxGlobal);
#if PLOT
std::cout << "edges of the element "<< faces_[i] << std::endl;
- std::cout << "nodes of the element " << nodeIdx[0]
- << ", " << nodeIdx[1] << ", "
- << nodeIdx[2] << std::endl;
- std::cout << "1st " << nodeIdx[0]
- << "\t" << "2nd " << nodeIdx[1]
- << "\t" << "3rd " << nodeIdx[2]
+ std::cout << "nodes of the element " << vIdxGlobal[0]
+ << ", " << vIdxGlobal[1] << ", "
+ << vIdxGlobal[2] << std::endl;
+ std::cout << "1st " << vIdxGlobal[0]
+ << "\t" << "2nd " << vIdxGlobal[1]
+ << "\t" << "3rd " << vIdxGlobal[2]
<< std::endl;
#endif
- if (nodeIdx[0] == nodeIdx[1] || nodeIdx[1] == nodeIdx[2]
- || nodeIdx[0] == nodeIdx[2])
+ if (vIdxGlobal[0] == vIdxGlobal[1] || vIdxGlobal[1] == vIdxGlobal[2]
+ || vIdxGlobal[0] == vIdxGlobal[2])
{
std::cout << "Error. The node index is identical in the element"
<< std::endl;
diff --git a/dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh b/dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh
index 7b864efb33..5fb0885a98 100644
--- a/dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh
+++ b/dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh
@@ -111,13 +111,13 @@ public:
const int numFaceVertices = refElement.size(fIdx, 1, dim);
// loop over the single vertices on the current face
- for (int faceVertIdx = 0; faceVertIdx < numFaceVertices; ++faceVertIdx)
+ for (int faceVertexIdx = 0; faceVertexIdx < numFaceVertices; ++faceVertexIdx)
{
- const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertIdx);
- const int elemVertIdx = refElement.subEntity(fIdx, 1, faceVertIdx, dim);
+ const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertexIdx);
+ const int vIdx = refElement.subEntity(fIdx, 1, faceVertexIdx, dim);
// only evaluate, if we consider the same face vertex as in the outer
// loop over the element vertices
- if (elemVertIdx != idx)
+ if (vIdx != idx)
continue;
//for the corner points, the boundary flux across the vertical non-coupling boundary faces
@@ -138,7 +138,7 @@ public:
for(int i= 0; i < numVertices; i++)
{
//if vertex is on boundary and not the coupling vertex: check whether an outflow condition is set
- if(this->model_().onBoundary(this->element_(), i) && i!=elemVertIdx)
+ if(this->model_().onBoundary(this->element_(), i) && i!=vIdx)
if (!this->bcTypes_(i).isOutflow(equationIdx))
evalBoundaryFlux = true;
}
diff --git a/dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh b/dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh
index a3eab1e514..6c13400f7e 100644
--- a/dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh
+++ b/dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh
@@ -125,13 +125,13 @@ public:
const int numFaceVertices = refElement.size(fIdx, 1, dim);
// loop over the single vertices on the current face
- for (int faceVertIdx = 0; faceVertIdx < numFaceVertices; ++faceVertIdx)
+ for (int faceVertexIdx = 0; faceVertexIdx < numFaceVertices; ++faceVertexIdx)
{
- const int elemVertIdx = refElement.subEntity(fIdx, 1, faceVertIdx, dim);
- const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertIdx);
+ const int vIdx = refElement.subEntity(fIdx, 1, faceVertexIdx, dim);
+ const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertexIdx);
// only evaluate, if we consider the same face vertex as in the outer
// loop over the element vertices
- if (elemVertIdx != idx)
+ if (vIdx != idx)
continue;
//for the corner points, the boundary flux across the vertical non-coupling boundary faces
@@ -153,7 +153,7 @@ public:
{
//if vertex is on boundary and not the coupling vertex: check whether a Neumann condition is set
//in case of Neumann Null the boundary flux must not be calculated
- if(this->model_().onBoundary(this->element_(), i) && i!=elemVertIdx)
+ if(this->model_().onBoundary(this->element_(), i) && i!=vIdx)
if (!this->bcTypes_(i).isNeumann(equationIdx) && !this->bcTypes_(i).isOutflow(equationIdx))
evalBoundaryFlux = true;
}
diff --git a/dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh b/dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh
index aa2d4baa8d..1ad7467efb 100644
--- a/dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh
+++ b/dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh
@@ -136,15 +136,15 @@ public:
const int numFaceVertices = refElement.size(fIdx, 1, dim);
// loop over the single vertices on the current face
- for (int faceVertIdx = 0; faceVertIdx < numFaceVertices; ++faceVertIdx)
+ for (int faceVertexIdx = 0; faceVertexIdx < numFaceVertices; ++faceVertexIdx)
{
// only evaluate, if we consider the same face vertex as in the outer
// loop over the element vertices
- if (refElement.subEntity(fIdx, 1, faceVertIdx, dim)
+ if (refElement.subEntity(fIdx, 1, faceVertexIdx, dim)
!= idx)
continue;
- const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertIdx);
+ const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertexIdx);
const FluxVariables boundaryVars(this->problem_(),
this->element_(),
this->fvGeometry_(),
diff --git a/dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh b/dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh
index b0d1e44277..e716a4f74e 100644
--- a/dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh
+++ b/dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh
@@ -139,15 +139,15 @@ namespace Dumux
const int numFaceVertices = refElement.size(fIdx, 1, dim);
// loop over the single vertices on the current face
- for (int faceVertIdx = 0; faceVertIdx < numFaceVertices; ++faceVertIdx)
+ for (int faceVertexIdx = 0; faceVertexIdx < numFaceVertices; ++faceVertexIdx)
{
// only evaluate, if we consider the same face vertex as in the outer
// loop over the element vertices
- if (refElement.subEntity(fIdx, 1, faceVertIdx, dim)
+ if (refElement.subEntity(fIdx, 1, faceVertexIdx, dim)
!= idx)
continue;
- const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertIdx);
+ const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertexIdx);
const FluxVariables boundaryVars(this->problem_(),
this->element_(),
this->fvGeometry_(),
diff --git a/test/decoupled/1p/resultevaluation.hh b/test/decoupled/1p/resultevaluation.hh
index 5a3dc6aa1c..bf0eacb2b9 100644
--- a/test/decoupled/1p/resultevaluation.hh
+++ b/test/decoupled/1p/resultevaluation.hh
@@ -110,14 +110,14 @@ public:
Dune::GeometryType geomType = geometry.type();
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
const Dune::FieldVector<Scalar,dim>& local = ReferenceElements::general(geomType).position(0, 0);
- Dune::FieldVector<Scalar,dim> global = geometry.global(local);
+ Dune::FieldVector<Scalar,dim> globalPos = geometry.global(local);
Scalar volume = geometry.volume();
int elemIdx = problem.variables().index(element);
Scalar approxPressure = problem.variables().cellData(elemIdx).globalPressure();
- Scalar exactPressure = problem.exact(global);
+ Scalar exactPressure = problem.exact(globalPos);
numerator += volume*(approxPressure - exactPressure)*(approxPressure - exactPressure);
denominator += volume*exactPressure*exactPressure;
@@ -239,7 +239,7 @@ public:
K.solve(approximateGradient, elementVelocity);
// get the exact gradient
- exactGradient = problem.exactGrad(global);
+ exactGradient = problem.exactGrad(globalPos);
// the difference between exact and approximate gradient
Dune::FieldVector<Scalar,dim> gradDiff(exactGradient);
diff --git a/test/decoupled/1p/resultevaluation3d.hh b/test/decoupled/1p/resultevaluation3d.hh
index 2f710b0a62..77744e2a17 100644
--- a/test/decoupled/1p/resultevaluation3d.hh
+++ b/test/decoupled/1p/resultevaluation3d.hh
@@ -186,10 +186,10 @@ public:
local = ReferenceElements::general(gt).position(0,0);
// get global coordinate of cell center
- Dune::FieldVector<ct,dim> global = geometry.global(local);
+ Dune::FieldVector<ct,dim> globalPos = geometry.global(local);
// get exact solution value
- double exactValue = problem.exact(global);
+ double exactValue = problem.exact(globalPos);
// cell index
int indexi = elementmapper.map(element);
@@ -212,10 +212,10 @@ public:
double volume = geometry.volume();
// update sumf
- sumf += volume*(problem.source(global, element, local)[0]);
+ sumf += volume*(problem.source(globalPos, element, local)[0]);
// get the absolute permeability
- Dune::FieldMatrix<double,dim,dim> K = problem.spatialParams().K(global, element, local);
+ Dune::FieldMatrix<double,dim,dim> K = problem.spatialParams().K(globalPos, element, local);
numerator += volume*(exactValue - approximateValue)*(exactValue - approximateValue);
denominator += volume*exactValue*exactValue;
@@ -342,7 +342,7 @@ public:
K.solve(approximateGradient, elementVelocity);
// get the exact gradient
- exactGradient = problem.exactGrad(global);
+ exactGradient = problem.exactGrad(globalPos);
// the difference between exact and approximate gradient
Dune::FieldVector<ct,dim> gradDiff(exactGradient);
@@ -501,7 +501,7 @@ public:
Dune::GeometryType geomType = geometry.type();
const Dune::FieldVector<Scalar,dim>& local = ReferenceElements::general(geomType).position(0, 0);
- Dune::FieldVector<Scalar,dim> global = geometry.global(local);
+ Dune::FieldVector<Scalar,dim> globalPos = geometry.global(local);
Scalar volume = geometry.volume();
@@ -509,7 +509,7 @@ public:
int eIdx = problem.variables().index(element);
Scalar approxPressure = problem.variables().cellData(eIdx).globalPressure();
- Scalar exactPressure = problem.exact(global);
+ Scalar exactPressure = problem.exact(globalPos);
// evaluate exact solution vector
exactSol[eIdx] = exactPressure;
@@ -666,7 +666,7 @@ public:
K.solve(approximateGradient, elementVelocity);
// get the exact gradient
- exactGradient = problem.exactGrad(global);
+ exactGradient = problem.exactGrad(globalPos);
// the difference between exact and approximate gradient
Dune::FieldVector<Scalar,dim> gradDiff(exactGradient);
@@ -763,7 +763,7 @@ public:
Dune::GeometryType geomType = geometry.type();
const Dune::FieldVector<Scalar,dim>& local = ReferenceElements::general(geomType).position(0, 0);
- Dune::FieldVector<Scalar,dim> global = geometry.global(local);
+ Dune::FieldVector<Scalar,dim> globalPos = geometry.global(local);
Scalar volume = geometry.integrationElement(local)
*ReferenceElements::general(geomType).volume();
@@ -771,7 +771,7 @@ public:
int eIdx = elementMapper.map(element);
Scalar approxPressure = solution[eIdx];
- Scalar exactPressure = problem.exact(global);
+ Scalar exactPressure = problem.exact(globalPos);
//std::cout << global << ": p =" << exactPressure << ", p_h = " << approxPressure << std::endl;
numerator += volume*(approxPressure - exactPressure)*(approxPressure - exactPressure);
denominator += volume*exactPressure*exactPressure;
@@ -784,10 +784,10 @@ public:
uMin = std::min(uMin, approxPressure);
uMax = std::max(uMax, approxPressure);
- sumf += volume*problem.source(global, element, local)[0];
+ sumf += volume*problem.source(globalPos, element, local)[0];
// get the absolute permeability
- Dune::FieldMatrix<Scalar,dim,dim> K = problem.spatialParams().K(global, element, local);
+ Dune::FieldMatrix<Scalar,dim,dim> K = problem.spatialParams().K(globalPos, element, local);
int i = -1;
Dune::FieldVector<Scalar,dim> exactGradient;
--
GitLab