diff --git a/dumux/common/intersectionmapper.hh b/dumux/common/intersectionmapper.hh
index ff3b86a138b2a82d4476d9e5bf3161701015d95f..bddf0749b8cd130124e8ebbe397a8734d0eab948 100644
--- a/dumux/common/intersectionmapper.hh
+++ b/dumux/common/intersectionmapper.hh
@@ -62,8 +62,8 @@ public:
int faceIdx = 0;
- IntersectionIterator isItEnd = gridView_.iend(*eIt);
- for (IntersectionIterator isIt = gridView_.ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(*eIt);
+ for (IntersectionIterator isIt = gridView_.ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int idxInInside = isIt->indexInInside();
@@ -149,15 +149,15 @@ public:
intersectionMapLocal_.clear();
intersectionMapLocal_.resize(elementMapper_.size());
- ElementIterator eItEnd = gridView_.template end<0>();
- for (ElementIterator eIt = gridView_.template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = gridView_.template end<0>();
+ for (ElementIterator eIt = gridView_.template begin<0>(); eIt != eEndIt; ++eIt)
{
int globalIdx = map(*eIt);
int faceIdx = 0;
// run through all intersections with neighbors
- IntersectionIterator isItEnd = gridView_.iend(*eIt);
- for (IntersectionIterator isIt = gridView_.ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(*eIt);
+ for (IntersectionIterator isIt = gridView_.ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int indexInInside = isIt->indexInInside();
intersectionMapLocal_[globalIdx][faceIdx] = indexInInside;
@@ -167,14 +167,14 @@ public:
}
int globalIntersectionIdx = 0;
- for (ElementIterator eIt = gridView_.template begin<0>(); eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = gridView_.template begin<0>(); eIt != eEndIt; ++eIt)
{
int globalIdx = map(*eIt);
int faceIdx = 0;
// run through all intersections with neighbors
- IntersectionIterator isItEnd = gridView_.iend(*eIt);
- for (IntersectionIterator isIt = gridView_.ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(*eIt);
+ for (IntersectionIterator isIt = gridView_.ibegin(*eIt); isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
{
diff --git a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
index 9970c551f39ac5d9d7ef11dda0c02055bf19e5a9..0d8e7ea1683f0d6b9c0d720a283e3b866b91e9eb 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
@@ -114,8 +114,8 @@ public:
problem_.gridView().size(0)));
// compute update vector
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdx = problem_.variables().index(*eIt);
@@ -125,10 +125,10 @@ public:
Dune::FieldVector<Scalar, 2*dim> flux(0);
// run through all intersections with neighbors and boundary
IntersectionIterator
- isItEnd = problem_.gridView().iend(*eIt);
+ isEndIt = problem_.gridView().iend(*eIt);
for (IntersectionIterator
isIt = problem_.gridView().ibegin(*eIt); isIt
- !=isItEnd; ++isIt)
+ !=isEndIt; ++isIt)
{
int isIndex = isIt->indexInInside();
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
index 866a522c2a3cc0cf00649ef155bee79b9e4c7a7f..bbd8291bde73515450263946ac2e24582d58a1d2 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
@@ -287,8 +287,8 @@ public:
void storePressureSolution()
{
// iterate through leaf grid
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
storePressureSolution(*eIt);
}
@@ -1031,8 +1031,8 @@ const Intersection& intersection, const CellData& cellData, const bool first)
template<class TypeTag>
void FVPressure2P<TypeTag>::updateMaterialLaws()
{
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
index 2f7c1049fb2ea097f36be3dfb35ddcc9c96ee13b..4dbdaae8065c64f75ef646d371ee5fe3c9323c16 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
@@ -195,8 +195,8 @@ public:
*(writer.template allocateManagedBuffer<Scalar, dim>(problem_.gridView().size(0)));
// compute update vector
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdx = problem_.variables().index(*eIt);
@@ -206,8 +206,8 @@ public:
Dune::FieldVector < Scalar, 2 * dim > fluxW(0);
Dune::FieldVector < Scalar, 2 * dim > fluxNw(0);
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int isIndex = isIt->indexInInside();
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh
index b1522fda28d038a4a373623b8120ce98e3fb6956..beb3910b8073854adb410518621b1b0e29f85786 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh
@@ -212,8 +212,8 @@ public:
void storePressureSolution()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
storePressureSolution(*eIt);
}
@@ -348,8 +348,8 @@ public:
ScalarSolutionType *pc = writer.allocateManagedBuffer(size);
ElementIterator eItBegin = problem_.gridView().template begin<0>();
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
int idx = problem_.variables().index(*eIt);
CellData& cellData = problem_.variables().cellData(idx);
@@ -522,8 +522,8 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
{
// determine matrix row sizes
ElementIterator eItBegin = problem_.gridView().template begin<0>();
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -533,8 +533,8 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// run through all intersections with neighbors
IntersectionIterator isItBegin = problem_.gridView().ibegin(*eIt);
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = isItBegin; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = isItBegin; isIt != isEndIt; ++isIt)
{
IntersectionIterator tempisIt = isIt;
IntersectionIterator tempisItBegin = isItBegin;
@@ -548,13 +548,13 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// for SGrid
case GridTypeIndices::sGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
else
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -565,7 +565,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = isItBegin;
}
@@ -573,7 +573,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -584,7 +584,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// for ALUGrid
case GridTypeIndices::aluGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -592,7 +592,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// for UGGrid
case GridTypeIndices::ugGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -644,7 +644,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
this->A_.endrowsizes();
// determine position of matrix entries
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -654,8 +654,8 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// run through all intersections with neighbors
IntersectionIterator isItBegin = problem_.gridView().ibegin(*eIt);
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = isItBegin; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = isItBegin; isIt != isEndIt; ++isIt)
{
IntersectionIterator tempisIt = isIt;
IntersectionIterator tempisItBegin = isItBegin;
@@ -670,7 +670,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// for SGrid
case GridTypeIndices::sGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = isItBegin;
}
@@ -678,7 +678,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -689,7 +689,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = isItBegin;
}
@@ -697,7 +697,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -708,7 +708,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// for ALUGrid
case GridTypeIndices::aluGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -716,7 +716,7 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
// for UGGrid
case GridTypeIndices::ugGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -802,8 +802,8 @@ void FvMpfaL2dPressure2p<TypeTag>::storeInteractionVolumeInfo()
BoundaryTypes bcType;
// run through all elements
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// get common geometry information for the following computation
@@ -1348,8 +1348,8 @@ void FvMpfaL2dPressure2p<TypeTag>::assemble()
this->f_ = 0;
// run through all vertices
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
@@ -1988,8 +1988,8 @@ void FvMpfaL2dPressure2p<TypeTag>::assemble()
if (problem_.gridView().comm().size() > 1)
{
// set ghost and overlap element entries
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
if (eIt->partitionType() == Dune::InteriorEntity)
continue;
@@ -2326,8 +2326,8 @@ template<class TypeTag>
void FvMpfaL2dPressure2p<TypeTag>::updateMaterialLaws()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2padaptive.hh
index 836e9b75cf1920015032cf255688738bec7e4f3a..26ea43072ed6de874f108fe4cb90ce472d7133e5 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2padaptive.hh
@@ -226,8 +226,8 @@ public:
void storePressureSolution()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
storePressureSolution(*eIt);
}
@@ -389,8 +389,8 @@ public:
ScalarSolutionType *pc = writer.allocateManagedBuffer(size);
ElementIterator eItBegin = problem_.gridView().template begin<0>();
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
int idx = problem_.variables().index(*eIt);
CellData& cellData = problem_.variables().cellData(idx);
@@ -568,8 +568,8 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
{
// determine matrix row sizes
ElementIterator eItBegin = problem_.gridView().template begin<0>();
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -579,8 +579,8 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// run through all intersections with neighbors
IntersectionIterator isItBegin = problem_.gridView().ibegin(*eIt);
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = isItBegin; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = isItBegin; isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
{
@@ -598,13 +598,13 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// for SGrid
case GridTypeIndices::sGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
else
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -615,7 +615,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = isItBegin;
}
@@ -623,7 +623,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -634,7 +634,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// for ALUGrid
case GridTypeIndices::aluGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -642,7 +642,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// for UGGrid
case GridTypeIndices::ugGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -713,7 +713,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// indicate that size of all rows is defined
this->A_.endrowsizes();
// determine position of matrix entries
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -723,8 +723,8 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// run through all intersections with neighbors
IntersectionIterator isItBegin = problem_.gridView().ibegin(*eIt);
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = isItBegin; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = isItBegin; isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
{
@@ -754,7 +754,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// for SGrid
case GridTypeIndices::sGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = isItBegin;
}
@@ -762,7 +762,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -773,7 +773,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = isItBegin;
}
@@ -781,7 +781,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -792,7 +792,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// for ALUGrid
case GridTypeIndices::aluGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -800,7 +800,7 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
// for UGGrid
case GridTypeIndices::ugGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -901,8 +901,8 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::storeInteractionVolumeInfo()
BoundaryTypes bcType;
// run through all elements
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// get index
int globalIdx1 = problem_.variables().index(*eIt);
@@ -1843,8 +1843,8 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::storeInteractionVolumeInfo()
template<class TypeTag>
void FvMpfaL2dPressure2pAdaptive<TypeTag>::printInteractionVolumes()
{
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
@@ -1898,8 +1898,8 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::assemble()
this->f_ = 0;
// run through all vertices
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
@@ -2806,8 +2806,8 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::assemble()
if (problem_.gridView().comm().size() > 1)
{
// set ghost and overlap element entries
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
if (eIt->partitionType() == Dune::InteriorEntity)
continue;
@@ -3376,8 +3376,8 @@ template<class TypeTag>
void FvMpfaL2dPressure2pAdaptive<TypeTag>::updateMaterialLaws()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh
index 520a6717bd76887700dd315267cb96aaa219d9c8..5d944a059c9d710e5107ef0a632c0075da405812 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh
@@ -227,8 +227,8 @@ public:
*(writer.template allocateManagedBuffer<Scalar, dim>(problem_.gridView().size(0)));
// compute update vector
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdx = problem_.variables().index(*eIt);
@@ -238,8 +238,8 @@ public:
Dune::FieldVector < Scalar, 2 * dim > fluxW(0);
Dune::FieldVector < Scalar, 2 * dim > fluxNw(0);
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int isIndex = isIt->indexInInside();
@@ -312,8 +312,8 @@ template<class TypeTag>
void FvMpfaL2dPressureVelocity2p<TypeTag>::calculateVelocity()
{
// run through all elements
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh
index d511377b92d7dd48a3de58aeb4a5a4988569bfda..e1ebac067681653c203a019371dbe26f2ac3da3c 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh
@@ -236,8 +236,8 @@ public:
*(writer.template allocateManagedBuffer<Scalar, dim>(problem_.gridView().size(0)));
// compute update vector
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdx = problem_.variables().index(*eIt);
@@ -247,8 +247,8 @@ public:
Dune::FieldVector < Scalar, 2 * dim > fluxW(0);
Dune::FieldVector < Scalar, 2 * dim > fluxNw(0);
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int isIndex = isIt->indexInInside();
@@ -340,8 +340,8 @@ void FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity()
// std::cout<<"\n";
// }
// run through all elements
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh
index eb171fbb73d7e70ee35034d5ef7b2eb3a87df21c..5a499c16b29d1172c4914aaa0eccd65389de53ff 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh
@@ -264,8 +264,8 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
// run through all intersections
IntersectionIterator isIt = problem_.gridView().ibegin(element);
- IntersectionIterator isItEnd = problem_.gridView().iend(element);
- for (; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(element);
+ for (; isIt != isEndIt; ++isIt)
{
int indexInInside = isIt->indexInInside();
@@ -1889,8 +1889,8 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeInteractionVolumeInfo()
{
std::vector < std::vector<int> > elemVertMap(problem_.gridView().size(dim), std::vector<int>(8, -1));
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
ElementPointer ePtr = *eIt;
storeSubVolumeElements(*ePtr, elemVertMap);
@@ -1902,7 +1902,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeInteractionVolumeInfo()
// run through all elements
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// get common geometry information for the following computation
@@ -1911,8 +1911,8 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeInteractionVolumeInfo()
}
// run through all vertices
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh
index 4169e8815d9b7958aad826b997914ecae3321171..2be63d5d34b685163c74363d773334f0843027f2 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh
@@ -423,8 +423,8 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeHangingNodeInter
ElementPointer& element1 = interactionVolume.getSubVolumeElement(0);
IntersectionIterator isIt = problem_.gridView().ibegin(*element1);
- IntersectionIterator isItEnd = problem_.gridView().iend(*element1);
- for (; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*element1);
+ for (; isIt != isEndIt; ++isIt)
{
int idxInInside = isIt->indexInInside();
@@ -785,8 +785,8 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeHangingNodeInter
interactionVolume.setFaceArea(faceArea, 11);
IntersectionIterator isIt = problem_.gridView().ibegin(*element);
- IntersectionIterator isItEnd = problem_.gridView().iend(*element);
- for (; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*element);
+ for (; isIt != isEndIt; ++isIt)
{
if (isIt->indexInInside() == interactionVolume.getIndexOnElement(0, 2))
{
@@ -952,8 +952,8 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeHangingNodeInter
interactionVolume.setFacePosition(element7->geometry().center(), 6);
IntersectionIterator isIt = problem_.gridView().ibegin(*element5);
- IntersectionIterator isItEnd = problem_.gridView().iend(*element5);
- for (; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*element5);
+ for (; isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
{
@@ -1004,8 +1004,8 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeHangingNodeInter
interactionVolume.setFacePosition(globalPosFace, 6);
IntersectionIterator isIt = problem_.gridView().ibegin(*element5);
- IntersectionIterator isItEnd = problem_.gridView().iend(*element5);
- for (; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*element5);
+ for (; isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
{
@@ -1277,8 +1277,8 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeHangingNodeInter
bool hasFaceOne = false;
bool hasFaceTwo = false;
IntersectionIterator isIt = problem_.gridView().ibegin(*element1);
- IntersectionIterator isItEnd = problem_.gridView().iend(*element1);
- for (; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*element1);
+ for (; isIt != isEndIt; ++isIt)
{
if (isIt->indexInInside() == interactionVolume.getIndexOnElement(0, 1))
{
@@ -1415,8 +1415,8 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeHangingNodeInter
ElementPointer& element3 = interactionVolume.getSubVolumeElement(2);
IntersectionIterator isIt = problem_.gridView().ibegin(*element3);
- IntersectionIterator isItEnd = problem_.gridView().iend(*element3);
- for (; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*element3);
+ for (; isIt != isEndIt; ++isIt)
{
if (isIt->indexInInside() == interactionVolume.getIndexOnElement(2, 2))
{
@@ -1526,8 +1526,8 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeInteractionVolum
{
std::vector < std::vector<int> > elemVertMap(problem_.gridView().size(dim), std::vector<int>(8, -1));
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
ElementPointer ePtr = *eIt;
this->storeSubVolumeElements(*ePtr, elemVertMap);
@@ -1539,7 +1539,7 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeInteractionVolum
// run through all elements
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// get common geometry information for the following computation
@@ -1548,8 +1548,8 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeInteractionVolum
}
// run through all vertices
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
index 7dd3e72d94729f5bb07f59883d4addcc4ef83176..356b3a52b8adb19541a1c48b43678b018ee29e7b 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
@@ -191,8 +191,8 @@ public:
void storePressureSolution()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
storePressureSolution(*eIt);
}
@@ -363,8 +363,8 @@ public:
ScalarSolutionType *pc = writer.allocateManagedBuffer(size);
ElementIterator eItBegin = problem_.gridView().template begin<0>();
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
int idx = problem_.variables().index(*eIt);
CellData& cellData = problem_.variables().cellData(idx);
@@ -497,9 +497,9 @@ template<class TypeTag>
void FvMpfaL3dPressure2p<TypeTag>::initializeMatrixRowSize()
{
// determine matrix row sizes
- ElementIterator eItEnd = problem_.gridView().template end<0>();
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
// determine position of matrix entries
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -536,9 +536,9 @@ template<class TypeTag>
void FvMpfaL3dPressure2p<TypeTag>::initializeMatrixIndices()
{
// determine matrix row sizes
- ElementIterator eItEnd = problem_.gridView().template end<0>();
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
// determine position of matrix entries
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -577,8 +577,8 @@ void FvMpfaL3dPressure2p<TypeTag>::assemble()
this->f_ = 0;
// run through all vertices
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
@@ -2428,8 +2428,8 @@ template<class TypeTag>
void FvMpfaL3dPressure2p<TypeTag>::updateMaterialLaws()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
index e300fcd601586e70c876dd0be2ed126a4c538355..f173e080a7bb2175d057815e4c9114df684c517d 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
@@ -252,9 +252,9 @@ template<class TypeTag>
void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixRowSize()
{
// determine matrix row sizes
- ElementIterator eItEnd = problem_.gridView().template end<0>();
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
// determine position of matrix entries
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -339,9 +339,9 @@ template<class TypeTag>
void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixIndices()
{
// determine matrix row sizes
- ElementIterator eItEnd = problem_.gridView().template end<0>();
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
// determine position of matrix entries
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -391,8 +391,8 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::assemble()
this->f_ = 0;
// run through all vertices
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
#if HAVE_MPI
if (vIt->partitionType() != Dune::InteriorEntity && vIt->partitionType() != Dune::BorderEntity)
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh
index 1af0357a286b8943ef84ee364e1ffab8a865d66e..fcf548d45d05188626a3f922cdf0af33dc78a3f5 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh
@@ -105,8 +105,8 @@ template<class TypeTag>
void FvMpfaL3dPressureVelocity2p<TypeTag>::calculateVelocity()
{
// run through all vertices
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2padaptive.hh
index cae27ac2ba60eeb09426a94b64b7213447227d9b..31a8f8a6fca6ca4cf94346920fd1dc538bcfb04c 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2padaptive.hh
@@ -104,8 +104,8 @@ template<class TypeTag>
void FvMpfaL3dPressureVelocity2pAdaptive<TypeTag>::calculateVelocity()
{
// run through all vertices
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2p.hh
index d5b352bd2c79a402d9d1404727ebda8314ab11e2..c6344b5efb9e2b4c672248fb898c06ea23e946b6 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2p.hh
@@ -173,8 +173,8 @@ public:
problem_.gridView().size(0)));
// compute update vector
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdx = problem_.variables().index(*eIt);
@@ -185,8 +185,8 @@ public:
Dune::FieldVector < Scalar, 2 * dim > fluxNw(0);
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int isIndex = isIt->indexInInside();
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh
index d91517d41dfea3cc276f483570f083ebed892210..bfbf29d6246405dcb9522ef0e3511f7a35135733 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh
@@ -246,8 +246,8 @@ public:
void storePressureSolution()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
storePressureSolution(*eIt);
}
@@ -341,8 +341,8 @@ public:
ScalarSolutionType *pc = writer.allocateManagedBuffer(size);
ElementIterator eItBegin = problem_.gridView().template begin<0>();
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
int idx = problem_.variables().index(*eIt);
CellData& cellData = problem_.variables().cellData(idx);
@@ -497,8 +497,8 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
{
// determine matrix row sizes
ElementIterator eItBegin = problem_.gridView().template begin<0>();
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -508,8 +508,8 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// run through all intersections with neighbors
IntersectionIterator isItBegin = problem_.gridView().ibegin(*eIt);
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = isItBegin; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = isItBegin; isIt != isEndIt; ++isIt)
{
IntersectionIterator tempisIt = isIt;
IntersectionIterator tempisItBegin = isItBegin;
@@ -523,13 +523,13 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// for SGrid
case GridTypeIndices::sGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
else
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -540,7 +540,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = isItBegin;
}
@@ -548,7 +548,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -559,7 +559,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// for ALUGrid
case GridTypeIndices::aluGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -567,7 +567,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// for UGGrid
case GridTypeIndices::ugGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -620,7 +620,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
this->A_.endrowsizes();
// determine position of matrix entries
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -630,8 +630,8 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// run through all intersections with neighbors
IntersectionIterator isItBegin = problem_.gridView().ibegin(*eIt);
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = isItBegin; isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = isItBegin; isIt != isEndIt; ++isIt)
{
IntersectionIterator tempisIt = isIt;
IntersectionIterator tempisItBegin = isItBegin;
@@ -646,7 +646,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// for SGrid
case GridTypeIndices::sGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = isItBegin;
}
@@ -654,7 +654,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -665,7 +665,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// for YaspGrid
case GridTypeIndices::yaspGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = isItBegin;
}
@@ -673,7 +673,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
{
nextIsIt = ++tempisIt;
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
{
nextIsIt = ++tempisItBegin;
}
@@ -684,7 +684,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// for ALUGrid
case GridTypeIndices::aluGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -692,7 +692,7 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
// for UGGrid
case GridTypeIndices::ugGrid:
{
- if (nextIsIt == isItEnd)
+ if (nextIsIt == isEndIt)
nextIsIt = isItBegin;
break;
@@ -789,8 +789,8 @@ void FvMpfaO2dPressure2p<TypeTag>::storeInteractionVolumeInfo()
BoundaryTypes bcType;
// run through all elements
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// get common geometry information for the following computation
@@ -1417,8 +1417,8 @@ void FvMpfaO2dPressure2p<TypeTag>::assemble()
this->f_ = 0;
// run through all vertices
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
@@ -2066,8 +2066,8 @@ void FvMpfaO2dPressure2p<TypeTag>::assemble()
if (problem_.gridView().comm().size() > 1)
{
// set ghost and overlap element entries
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
if (eIt->partitionType() == Dune::InteriorEntity)
continue;
@@ -2093,8 +2093,8 @@ template<class TypeTag>
void FvMpfaO2dPressure2p<TypeTag>::updateMaterialLaws()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh
index 52f2cd8a7a0c6635d58e2251a3e93ff3a1672480..505be6f4c53ee9b1743b6f41bcf62086e94d9c39 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressurevelocity2p.hh
@@ -234,8 +234,8 @@ template<class TypeTag>
void FvMpfaO2dPressureVelocity2p<TypeTag>::calculateVelocity()
{
// run through all elements
- VertexIterator vItEnd = problem_.gridView().template end<dim>();
- for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vItEnd; ++vIt)
+ VertexIterator vEndIt = problem_.gridView().template end<dim>();
+ for (VertexIterator vIt = problem_.gridView().template begin<dim>(); vIt != vEndIt; ++vIt)
{
int globalVertIdx = problem_.variables().index(*vIt);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dvelocity2p.hh
index cb519cd9aa1cf4c91e5a4adf53f3887bcd305db7..c532e653cb34cde9edf3142300f7906261033dbc 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dvelocity2p.hh
@@ -156,8 +156,8 @@ public:
problem_.gridView().size(0)));
// compute update vector
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdx = problem_.variables().index(*eIt);
@@ -168,8 +168,8 @@ public:
Dune::FieldVector < Scalar, 2 * dim > fluxNw(0);
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int isIndex = isIt->indexInInside();
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh
index d500d02805b7525d0fdfe761f9dca4e2d5a3cb18..1418783f57f286f25eaf1c9b1434cb9ac1a8f6c6 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh
@@ -267,8 +267,8 @@ public:
int globalIdx = problem_.variables().index(element);
Dune::FieldVector<Scalar, 2 * dim> faceVol(0);
- IntersectionIterator isItEnd = gridView_.iend(element);
- for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(element);
+ for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isEndIt; ++isIt)
{
faceVol[isIt->indexInInside()] = isIt->geometry().volume();
}
@@ -284,8 +284,8 @@ public:
int globalIdx = problem_.variables().index(element);
Dune::FieldVector<Scalar, 2 * dim> faceVol(0);
- IntersectionIterator isItEnd = gridView_.iend(element);
- for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(element);
+ for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isEndIt; ++isIt)
{
faceVol[isIt->indexInInside()] = isIt->geometry().volume();
}
@@ -300,8 +300,8 @@ public:
Dune::FieldVector<Scalar, 2 * dim> c(0);
Dune::FieldMatrix<Scalar, 2 * dim, 2 * dim> Pi(0);
- IntersectionIterator isItEnd = gridView_.iend(element);
- for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(element);
+ for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isEndIt; ++isIt)
{
// local number of facet
int idx = isIt->indexInInside();
@@ -471,8 +471,8 @@ void MimeticTwoPLocalStiffness<TypeTag>::assembleElementMatrices(const Element&
Scalar gravPot = (problem_.bBoxMax() - centerGlobal) * problem_.gravity() * (density_[nPhaseIdx] - density_[wPhaseIdx]);
int i = -1;
- IntersectionIterator isItEnd = gridView_.iend(element);
- for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(element);
+ for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isEndIt; ++isIt)
{
// local number of facet
i = isIt->indexInInside();
@@ -607,7 +607,7 @@ void MimeticTwoPLocalStiffness<TypeTag>::assembleElementMatrices(const Element&
// std::cout << "Pi = \dim" << Pi << "c = " << c << ", F = " << F << std::endl;
//accumulate fluxes due to capillary potential (pc + gravity!)
- for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isItEnd; ++isIt)
+ for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isEndIt; ++isIt)
{
int idx = isIt->indexInInside();
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh b/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
index 0df7644fdbb3474677c243b9b7b8250c4dec9f0c..22567712c7a31fb23fad09b79ba6bc1a06de5932 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
@@ -294,8 +294,8 @@ public:
Dune::FieldVector<Scalar, 2*dim> faceVolumeReal(0.0);
int idx = 0;
- IntersectionIterator isItEnd = gridView_.iend(element);
- for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(element);
+ for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isEndIt; ++isIt)
{
faceVol[idx] = isIt->geometry().volume();
int indexInInside = isIt->indexInInside();
@@ -326,8 +326,8 @@ public:
Dune::DynamicMatrix<Scalar> Pi(numFaces, numFaces);
int idx = 0;
- IntersectionIterator isItEnd = gridView_.iend(element);
- for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(element);
+ for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isEndIt; ++isIt)
{
Scalar faceVol = isIt->geometry().volume();
@@ -494,8 +494,8 @@ void MimeticTwoPLocalStiffnessAdaptive<TypeTag>::assembleElementMatrices(const E
Scalar pcPot = (problem_.bBoxMax() - element.geometry().center()) * problem_.gravity() * (density_[nPhaseIdx] - density_[wPhaseIdx]);
int idx = 0;
- IntersectionIterator isItEnd = gridView_.iend(element);
- for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = gridView_.iend(element);
+ for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isEndIt; ++isIt)
{
// local number of facet
@@ -635,7 +635,7 @@ void MimeticTwoPLocalStiffnessAdaptive<TypeTag>::assembleElementMatrices(const E
//accumulate fluxes due to capillary potential (pc + gravity!)
idx = 0;
- for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isItEnd; ++isIt)
+ for (IntersectionIterator isIt = gridView_.ibegin(element); isIt != isEndIt; ++isIt)
{
Scalar fracFlow = 0;
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator2p.hh
index 1b397db8f3dffd2c96b3101a38c0329080f38016..256af8c26ae1110664fb3d55cd015a1ea831e0be 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator2p.hh
@@ -104,7 +104,7 @@ public:
// run over all level elements
ElementIterator eIt = this->gridView_.template begin<0>();
- ElementIterator eItEnd = this->gridView_.template end<0>();
+ ElementIterator eEndIt = this->gridView_.template end<0>();
FluidState fluidState;
fluidState.setPressure(wPhaseIdx, problem.referencePressure(*eIt));
@@ -122,7 +122,7 @@ public:
problem.variables().cellData(i).fluxData().resetVelocity();
}
- for (; eIt != eItEnd; ++eIt)
+ for (; eIt != eEndIt; ++eIt)
{
int globalIdx = problem.variables().index(*eIt);
@@ -131,8 +131,8 @@ public:
// get local to global id map and pressure traces
IntersectionIterator isIt = problem.gridView().template ibegin(*eIt);
- const IntersectionIterator &isItEnd = problem.gridView().template iend(*eIt);
- for (; isIt != isItEnd; ++isIt)
+ const IntersectionIterator &isEndIt = problem.gridView().template iend(*eIt);
+ for (; isIt != isEndIt; ++isIt)
{
int indexInInside = isIt->indexInInside();
@@ -208,7 +208,7 @@ public:
}
isIt = problem.gridView().template ibegin(*eIt);
- for (; isIt != isItEnd; ++isIt)
+ for (; isIt != isEndIt; ++isIt)
{
int idxInInside = isIt->indexInInside();
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator2padaptive.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator2padaptive.hh
index 89a0c96bdbb07cd1ecd9c950b324fd1d096d1c21..4eb602494437a67688a45b548566a1096677f479 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticoperator2padaptive.hh
@@ -103,7 +103,7 @@ public:
// run over all level elements
ElementIterator eIt = this->gridView_.template begin<0>();
- ElementIterator eItEnd = this->gridView_.template end<0>();
+ ElementIterator eEndIt = this->gridView_.template end<0>();
FluidState fluidState;
fluidState.setPressure(wPhaseIdx, problem.referencePressure(*eIt));
@@ -121,7 +121,7 @@ public:
problem.variables().cellData(i).fluxData().resetVelocity();
}
- for (; eIt != eItEnd; ++eIt)
+ for (; eIt != eEndIt; ++eIt)
{
int globalIdx = problem.variables().index(*eIt);
@@ -139,8 +139,8 @@ public:
int intersectionIdx = -1;
// get local to global id map and pressure traces
IntersectionIterator isIt = problem.gridView().template ibegin(*eIt);
- const IntersectionIterator &isItEnd = problem.gridView().template iend(*eIt);
- for (; isIt != isItEnd; ++isIt)
+ const IntersectionIterator &isEndIt = problem.gridView().template iend(*eIt);
+ for (; isIt != isEndIt; ++isIt)
{
++intersectionIdx;
@@ -215,7 +215,7 @@ public:
intersectionIdx = -1;
isIt = problem.gridView().template ibegin(*eIt);
- for (; isIt != isItEnd; ++isIt)
+ for (; isIt != isEndIt; ++isIt)
{
++intersectionIdx;
int idxInInside = isIt->indexInInside();
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
index ea49076410f554fea026f6e2d0cecfc89cdfe6a4..196e55b59a2a4674d436af8c36ff6c2a76a6487f 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
@@ -247,8 +247,8 @@ public:
ElementIterator eItBegin = problem_.gridView().template begin<0>();
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
CellData& cellData = problem_.variables().cellData(globalIdx);
@@ -284,8 +284,8 @@ public:
Dune::FieldVector < Scalar, 2 * dim > fluxNw(0);
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int isIndex = isIt->indexInInside();
@@ -449,8 +449,8 @@ template<class TypeTag>
void MimeticPressure2P<TypeTag>::updateMaterialLaws()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2padaptive.hh
index c1e325c7af8cefea11918df4648bfe61afe5ba28..e70d4092f7a6ad45d46f24b50f36b6c9e47e46c0 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2padaptive.hh
@@ -259,8 +259,8 @@ public:
ElementIterator eItBegin = problem_.gridView().template begin<0>();
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
CellData& cellData = problem_.variables().cellData(globalIdx);
@@ -296,8 +296,8 @@ public:
Dune::FieldVector < Scalar, 2 * dim > fluxNw(0);
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int isIndex = isIt->indexInInside();
@@ -461,8 +461,8 @@ template<class TypeTag>
void MimeticPressure2PAdaptive<TypeTag>::updateMaterialLaws()
{
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
index d61fbf69004bd5fc978747682ad3e8b0170a990c..41508c9ac03c0a604a7496162c43acaf2014acf6 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
@@ -80,10 +80,10 @@ public:
Scalar globalMax = -1e100;
Scalar globalMin = 1e100;
- ElementIterator eItEnd = problem_.gridView().template end<0>();
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
// 1) calculate Indicator -> min, maxvalues
// Schleife über alle Leaf-Elemente
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd;
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt;
++eIt)
{
// Bestimme maximale und minimale Sättigung
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh
index ec721c32a1353c734ab32504ca33bfc8b2b502ea..7131b40554d5db3b65dbd5ab3a655130b954391c 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh
@@ -83,10 +83,10 @@ public:
Scalar maxLocalDelta = 0;
- ElementIterator eItEnd = problem_.gridView().template end<0>();
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
// 1) calculate Indicator -> min, maxvalues
// Schleife über alle Leaf-Elemente
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd;
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt;
++eIt)
{
// Bestimme maximale und minimale Sättigung
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2plocalflux.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2plocalflux.hh
index 2c69fdae38917b74c68b8def024f95fce2523845..8e8c5a3872adadd77ef52ca94e0b9bfd8afceb3c 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2plocalflux.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2plocalflux.hh
@@ -152,10 +152,10 @@ public:
Scalar totalVolume = 0;
Scalar totalVolumeSat = 0;
- ElementIterator eItEnd = problem_.gridView().template end<0>();
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
// 1) calculate Indicator -> min, maxvalues
// Schleife über alle Leaf-Elemente
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd;
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt;
++eIt)
{
// Bestimme maximale und minimale Sättigung
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index 4aa9e032afbd7f9c44072c15b1218d29afdcfe53..ade938e49efc826cef4f22e4dba48b4db03ed95b 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -1069,8 +1069,8 @@ void FVSaturation2P<TypeTag>::initialize()
}
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
PrimaryVariables initSol(0.0);
problem_.initial(initSol, *eIt);
@@ -1114,8 +1114,8 @@ void FVSaturation2P<TypeTag>::updateMaterialLaws()
{
ElementIterator eItBegin = problem_.gridView().template begin<0>();
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = eItBegin; eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = eItBegin; eIt != eEndIt; ++eIt)
{
int globalIdx = problem_.variables().index(*eIt);
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh b/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh
index 5721488da4419980a4254c358b25718aad3294bc..a810aef384345e1af81edb76317c1d6526c0cfc7 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh
@@ -226,8 +226,8 @@ void FVPressure2P2CAdaptive<TypeTag>::initializeMatrix()
this->f_.resize(gridSize_);
// determine matrix row sizes
- ElementIterator eItEnd = problem().gridView().template end<0> ();
- for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem().gridView().template end<0> ();
+ for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem().variables().index(*eIt);
@@ -244,8 +244,8 @@ void FVPressure2P2CAdaptive<TypeTag>::initializeMatrix()
int numberOfIntersections = 0;
// run through all intersections with neighbors
- IntersectionIterator isItEnd = problem().gridView().template iend(*eIt);
- for (IntersectionIterator isIt = problem().gridView().template ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem().gridView().template iend(*eIt);
+ for (IntersectionIterator isIt = problem().gridView().template ibegin(*eIt); isIt != isEndIt; ++isIt)
{
cellDataI.perimeter()
+= isIt->geometry().volume();
@@ -272,7 +272,7 @@ void FVPressure2P2CAdaptive<TypeTag>::initializeMatrix()
{
bool increaseRowSize = true;
//check if additional cell is ordinary neighbor of eIt
- for (IntersectionIterator isIt2 = problem().gridView().template ibegin(*eIt); isIt2 != isItEnd; ++isIt2)
+ for (IntersectionIterator isIt2 = problem().gridView().template ibegin(*eIt); isIt2 != isEndIt; ++isIt2)
{
if(!isIt2->neighbor())
continue;
@@ -300,7 +300,7 @@ void FVPressure2P2CAdaptive<TypeTag>::initializeMatrix()
this->A_.endrowsizes();
// determine position of matrix entries
- for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem().variables().index(*eIt);
@@ -309,8 +309,8 @@ void FVPressure2P2CAdaptive<TypeTag>::initializeMatrix()
this->A_.addindex(globalIdxI, globalIdxI);
// run through all intersections with neighbors
- IntersectionIterator isItEnd = problem().gridView().template iend(*eIt);
- for (IntersectionIterator isIt = problem().gridView().template ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem().gridView().template iend(*eIt);
+ for (IntersectionIterator isIt = problem().gridView().template ibegin(*eIt); isIt != isEndIt; ++isIt)
if (isIt->neighbor())
{
// access neighbor
@@ -367,8 +367,8 @@ void FVPressure2P2CAdaptive<TypeTag>::assemble(bool first)
this->A_ = 0;
this->f_ = 0;
- ElementIterator eItEnd = problem().gridView().template end<0>();
- for (ElementIterator eIt = problem().gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem().gridView().template end<0>();
+ for (ElementIterator eIt = problem().gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// get the global index of the cell
int globalIdxI = problem().variables().index(*eIt);
@@ -387,8 +387,8 @@ void FVPressure2P2CAdaptive<TypeTag>::assemble(bool first)
/***** flux term ***********/
// iterate over all faces of the cell
- IntersectionIterator isItEnd = problem().gridView().template iend(*eIt);
- for (IntersectionIterator isIt = problem().gridView().template ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem().gridView().template iend(*eIt);
+ for (IntersectionIterator isIt = problem().gridView().template ibegin(*eIt); isIt != isEndIt; ++isIt)
{
/************* handle interior face *****************/
if (isIt->neighbor())
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
index 3eae34d98b102ddb3825c4e8c0ea7648f66a2c37..d1a71986343a833848e3f04372ca2f3a086312d8 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
@@ -256,8 +256,8 @@ void FVPressure2P2CMultiPhysics<TypeTag>::assemble(bool first)
this->A_ = 0;
this->f_ = 0;
- ElementIterator eItEnd = problem().gridView().template end<0> ();
- for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem().gridView().template end<0> ();
+ for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// get the global index of the cell
int globalIdxI = problem().variables().index(*eIt);
@@ -280,8 +280,8 @@ void FVPressure2P2CMultiPhysics<TypeTag>::assemble(bool first)
/***** flux term ***********/
// iterate over all faces of the cell
- IntersectionIterator isItEnd = problem().gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem().gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
/************* handle interior face *****************/
if (isIt->neighbor())
@@ -781,8 +781,8 @@ void FVPressure2P2CMultiPhysics<TypeTag>::updateMaterialLaws(bool postTimeStep)
nextSubdomain = -1; // reduce complexity after first TS
// Loop A) through leaf grid
- ElementIterator eItEnd = problem().gridView().template end<0> ();
- for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem().gridView().template end<0> ();
+ for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// get global coordinate of cell center
int globalIdx = problem().variables().index(*eIt);
@@ -805,8 +805,8 @@ void FVPressure2P2CMultiPhysics<TypeTag>::updateMaterialLaws(bool postTimeStep)
nextSubdomain[globalIdx] = 2;
// mark neighbors
- IntersectionIterator isItEnd = problem().gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt!=isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem().gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt!=isEndIt; ++isIt)
{
if (isIt->neighbor())
{
@@ -843,7 +843,7 @@ void FVPressure2P2CMultiPhysics<TypeTag>::updateMaterialLaws(bool postTimeStep)
// Loop B) thorugh leaf grid
// investigate cells that were "simple" in current TS
- for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
int globalIdx = problem().variables().index(*eIt);
CellData& cellData = problem().variables().cellData(globalIdx);
diff --git a/dumux/decoupled/2p2c/fvpressurecompositional.hh b/dumux/decoupled/2p2c/fvpressurecompositional.hh
index 89c9e36c26405cbe29ae29584d2b8885beffc822..b7339b73d990cb352ca7b9a36208bea753dbcddf 100644
--- a/dumux/decoupled/2p2c/fvpressurecompositional.hh
+++ b/dumux/decoupled/2p2c/fvpressurecompositional.hh
@@ -517,9 +517,9 @@ void FVPressureCompositional<TypeTag>::initialMaterialLaws(bool compositional)
// problem_.variables().communicatethis->pressure();
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem_.gridView().template end<0>();
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
ElementIterator eIt = problem_.gridView().template begin<0>();
- for (; eIt != eItEnd; ++eIt)
+ for (; eIt != eEndIt; ++eIt)
{
// get global coordinate of cell center
GlobalPosition globalPos = eIt->geometry().center();
@@ -670,8 +670,8 @@ void FVPressureCompositional<TypeTag>::initialMaterialLaws(bool compositional)
if(!compositional)
{
// run through all intersections with neighbors
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
cellData.perimeter()
+= isIt->geometry().volume();
@@ -700,8 +700,8 @@ void FVPressureCompositional<TypeTag>::updateMaterialLaws(bool postTimeStep)
{
Scalar maxError = 0.;
// iterate through leaf grid an evaluate c0 at cell center
- ElementIterator eItEnd = problem().gridView().template end<0> ();
- for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem().gridView().template end<0> ();
+ for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
int globalIdx = problem().variables().index(*eIt);
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index d764f0a3e50a9e80273c70d22735fa7f681d6b1a..5264b285b41531e041267f8e282c2e6eb58ba0a3 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -369,8 +369,8 @@ void FVTransport2P2C<TypeTag>::update(const Scalar t, Scalar& dt,
ComponentVector entries(0.);
EntryType timestepFlux(0.);
// compute update vector
- ElementIterator eItEnd = problem().gridView().template end<0> ();
- for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem().gridView().template end<0> ();
+ for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// get cell infos
int globalIdxI = problem().variables().index(*eIt);
@@ -381,8 +381,8 @@ void FVTransport2P2C<TypeTag>::update(const Scalar t, Scalar& dt,
double sumfactorout = 0;
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem().gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem().gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int indexInInside = isIt->indexInInside();
@@ -1169,8 +1169,8 @@ void FVTransport2P2C<TypeTag>::updatedTargetDt_(Scalar &dt)
dt = std::numeric_limits<Scalar>::max();
// update target time-step-sizes
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
#if HAVE_MPI
if (eIt->partitionType() != Dune::InteriorEntity)
@@ -1189,8 +1189,8 @@ void FVTransport2P2C<TypeTag>::updatedTargetDt_(Scalar &dt)
FaceDt faceDt;
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int indexInInside = isIt->indexInInside();
@@ -1251,8 +1251,8 @@ void FVTransport2P2C<TypeTag>::updatedTargetDt_(Scalar &dt)
localDataI.faceTargetDt[it->first] += subCFLFactor_ * it->second;
}
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
{
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh b/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
index 12d6284a6e4b8386cb7b9315ae7b76f74d290c94..a9ac27b2ce32f3cf4a1f1783cba6a6f0db5cc707 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
@@ -189,8 +189,8 @@ void FVTransport2P2CAdaptive<TypeTag>::update(const Scalar t, Scalar& dt, Transp
Dune::FieldVector<Scalar, 2> entries(0.), timestepFlux(0.);
// compute update vector
- ElementIterator eItEnd = problem().gridView().template end<0> ();
- for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem().gridView().template end<0> ();
+ for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// get cell infos
int globalIdxI = problem().variables().index(*eIt);
@@ -214,8 +214,8 @@ void FVTransport2P2CAdaptive<TypeTag>::update(const Scalar t, Scalar& dt, Transp
}
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem().gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem().gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int indexInInside = isIt->indexInInside();
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index c5a693752c4f9f2a75e45feb8e0c084e205a9dee..e87503c21d7b37420850e7761f95cbed4ec80dd6 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -142,8 +142,8 @@ void FVTransport2P2CMultiPhysics<TypeTag>::update(const Scalar t, Scalar& dt, Tr
PhaseVector entries(0.), timestepFlux(0.);
// compute update vector
- ElementIterator eItEnd = problem().gridView().template end<0> ();
- for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem().gridView().template end<0> ();
+ for (ElementIterator eIt = problem().gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// get cell infos
int globalIdxI = problem().variables().index(*eIt);
@@ -156,8 +156,8 @@ void FVTransport2P2CMultiPhysics<TypeTag>::update(const Scalar t, Scalar& dt, Tr
double sumfactorout = 0;
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem().gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem().gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem().gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int indexInInside = isIt->indexInInside();
diff --git a/dumux/decoupled/common/fv/fvpressure.hh b/dumux/decoupled/common/fv/fvpressure.hh
index 3a20368c59389e969a76fc16fa92d9658d2ae03d..da682767a882f3ca95325d6e07fd731ba57aae25 100644
--- a/dumux/decoupled/common/fv/fvpressure.hh
+++ b/dumux/decoupled/common/fv/fvpressure.hh
@@ -121,8 +121,8 @@ protected:
//!Initialization of the pressure solution vector: Initialization with meaningful values may result in better convergence of the linear solver!
void initializePressure()
{
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
PrimaryVariables initValues;
problem_.initial(initValues, *eIt);
@@ -335,8 +335,8 @@ template<class TypeTag>
void FVPressure<TypeTag>::initializeMatrixRowSize()
{
// determine matrix row sizes
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -345,8 +345,8 @@ void FVPressure<TypeTag>::initializeMatrixRowSize()
int rowSize = 1;
// run through all intersections with neighbors
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
rowSize++;
@@ -362,8 +362,8 @@ template<class TypeTag>
void FVPressure<TypeTag>::initializeMatrixIndices()
{
// determine position of matrix entries
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdxI = problem_.variables().index(*eIt);
@@ -372,8 +372,8 @@ void FVPressure<TypeTag>::initializeMatrixIndices()
A_.addindex(globalIdxI, globalIdxI);
// run through all intersections with neighbors
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
if (isIt->neighbor())
{
// access neighbor
@@ -404,8 +404,8 @@ void FVPressure<TypeTag>::assemble(bool first)
A_ = 0;
f_ = 0;
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
// get the global index of the cell
int globalIdxI = problem_.variables().index(*eIt);
@@ -424,8 +424,8 @@ void FVPressure<TypeTag>::assemble(bool first)
/***** flux term ***********/
// iterate over all faces of the cell
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
/************* handle interior face *****************/
if (isIt->neighbor())
diff --git a/dumux/decoupled/common/fv/fvtransport.hh b/dumux/decoupled/common/fv/fvtransport.hh
index 394ab20577b549d425144aaf168742b8443c500d..0613da4593c76c8af12ca4e05e43eb6f60b89c61 100644
--- a/dumux/decoupled/common/fv/fvtransport.hh
+++ b/dumux/decoupled/common/fv/fvtransport.hh
@@ -291,8 +291,8 @@ void FVTransport<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolutionT
updateVec = 0.0;
// compute update vector
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
#if HAVE_MPI
if (eIt->partitionType() != Dune::InteriorEntity)
@@ -322,8 +322,8 @@ void FVTransport<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolutionT
}
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
GlobalPosition unitOuterNormal = isIt->centerUnitOuterNormal();
if (switchNormals_)
@@ -446,8 +446,8 @@ void FVTransport<TypeTag>::updatedTargetDt_(Scalar &dt)
dt = std::numeric_limits<Scalar>::max();
// update target time-step-sizes
- ElementIterator eItEnd = problem_.gridView().template end<0>();
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt; ++eIt)
{
#if HAVE_MPI
if (eIt->partitionType() != Dune::InteriorEntity)
@@ -466,8 +466,8 @@ void FVTransport<TypeTag>::updatedTargetDt_(Scalar &dt)
FaceDt faceDt;
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
int indexInInside = isIt->indexInInside();
@@ -528,8 +528,8 @@ void FVTransport<TypeTag>::updatedTargetDt_(Scalar &dt)
localDataI.faceTargetDt[it->first] += subCFLFactor_ * it->second;
}
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
{
diff --git a/dumux/decoupled/common/fv/fvvelocity.hh b/dumux/decoupled/common/fv/fvvelocity.hh
index a345a0987a61ab7367b5292d81c5391ceba7465c..fd43de330890ffd1c717092a3e9d6579a5446a0a 100644
--- a/dumux/decoupled/common/fv/fvvelocity.hh
+++ b/dumux/decoupled/common/fv/fvvelocity.hh
@@ -98,8 +98,8 @@ private:
template<class TypeTag, class Velocity>
void FVVelocity<TypeTag, Velocity>::calculateVelocity()
{
- ElementIterator eItEnd = problem_.gridView().template end<0> ();
- for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0> ();
+ for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// cell information
int globalIdxI = problem_.variables().index(*eIt);
@@ -107,8 +107,8 @@ void FVVelocity<TypeTag, Velocity>::calculateVelocity()
/***** flux term ***********/
// iterate over all faces of the cell
- IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
- for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = problem_.gridView().iend(*eIt);
+ for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
/************* handle interior face *****************/
if (isIt->neighbor())
diff --git a/dumux/decoupled/common/gridadaptinitializationindicator.hh b/dumux/decoupled/common/gridadaptinitializationindicator.hh
index 03b5b8796c881c5858bdbed32f1c3a682479c88d..11170f40121c8c6121930e49ad42f51766896487 100644
--- a/dumux/decoupled/common/gridadaptinitializationindicator.hh
+++ b/dumux/decoupled/common/gridadaptinitializationindicator.hh
@@ -237,10 +237,10 @@ public:
if (!enableInitializationIndicator_)
return;
- ElementIterator eItEnd = problem_.gridView().template end<0>();
+ ElementIterator eEndIt = problem_.gridView().template end<0>();
// 1) calculate Indicator -> min, maxvalues
// Schleife über alle Leaf-Elemente
- for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eItEnd;
+ for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt;
++eIt)
{
int globalIdxI = problem_.variables().index(*eIt);
diff --git a/test/decoupled/1p/test_diffusionproblem.hh b/test/decoupled/1p/test_diffusionproblem.hh
index 1ea80ca54cb2bf7e7c54fb819d6e49f39c8b40b6..d327ed52f4a359094db46927b40e02e4f36a1232 100644
--- a/test/decoupled/1p/test_diffusionproblem.hh
+++ b/test/decoupled/1p/test_diffusionproblem.hh
@@ -237,8 +237,8 @@ public:
ScalarSolution *exactPressure = this->resultWriter().allocateManagedBuffer(this->gridView().size(0));
ElementIterator eIt = this->gridView().template begin<0>();
- ElementIterator eItEnd = this->gridView().template end<0>();
- for(;eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = this->gridView().template end<0>();
+ for(;eIt != eEndIt; ++eIt)
{
(*exactPressure)[this->elementMapper().map(*eIt)][0] = exact(eIt->geometry().center());
}
diff --git a/test/decoupled/1p/test_diffusionproblem3d.hh b/test/decoupled/1p/test_diffusionproblem3d.hh
index caf4507a32fcc49644d719c87a262f026acb754f..c69443c77531a0088f4d359371c4d1ecc4f07df7 100644
--- a/test/decoupled/1p/test_diffusionproblem3d.hh
+++ b/test/decoupled/1p/test_diffusionproblem3d.hh
@@ -175,8 +175,8 @@ public:
ScalarSolution *exactPressure = this->resultWriter().allocateManagedBuffer(this->gridView().size(0));
ElementIterator eIt = this->gridView().template begin<0>();
- ElementIterator eItEnd = this->gridView().template end<0>();
- for(;eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = this->gridView().template end<0>();
+ for(;eIt != eEndIt; ++eIt)
{
(*exactPressure)[this->elementMapper().map(*eIt)][0] = exact(eIt->geometry().center());
}
diff --git a/test/decoupled/1p/test_diffusionspatialparams.hh b/test/decoupled/1p/test_diffusionspatialparams.hh
index 57c4f6d6d76b85fe0def52fc73fe8d861947cf35..d33c8a5f635a6c4abe201f74160488876b874650 100644
--- a/test/decoupled/1p/test_diffusionspatialparams.hh
+++ b/test/decoupled/1p/test_diffusionspatialparams.hh
@@ -106,8 +106,8 @@ public:
permeability_.resize(gridView_.size(0));
ElementIterator eIt = gridView_.template begin<0>();
- ElementIterator eItEnd = gridView_.template end<0>();
- for(;eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = gridView_.template end<0>();
+ for(;eIt != eEndIt; ++eIt)
{
perm(permeability_[indexSet_.index(*eIt)], eIt->geometry().center());
}
@@ -122,8 +122,8 @@ public:
ScalarSolution *permYY = writer.allocateManagedBuffer(gridView_.size(0));
ElementIterator eIt = gridView_.template begin<0>();
- ElementIterator eItEnd = gridView_.template end<0>();
- for(;eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = gridView_.template end<0>();
+ for(;eIt != eEndIt; ++eIt)
{
int globalIdx = indexSet_.index(*eIt);
(*permXX)[globalIdx][0] = permeability_[globalIdx][0][0];
diff --git a/test/decoupled/2p/buckleyleverettanalyticsolution.hh b/test/decoupled/2p/buckleyleverettanalyticsolution.hh
index a03fe3985bde964d785a94b29bb07117076b39f3..ac8ae6130fa2c79f4eff5ff34066f5363dd9717a 100644
--- a/test/decoupled/2p/buckleyleverettanalyticsolution.hh
+++ b/test/decoupled/2p/buckleyleverettanalyticsolution.hh
@@ -197,8 +197,8 @@ private:
Scalar globalVolume = 0;
Scalar errorNorm = 0.0;
- ElementIterator eItEnd = problem_.gridView().template end<0> ();
- for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0> ();
+ for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// get entity
ElementPointer element = *eIt;
@@ -241,8 +241,8 @@ private:
Scalar xMax = frontParams_[0].second * time;
// iterate over vertices and get analytic saturation solution
- ElementIterator eItEnd = problem_.gridView().template end<0> ();
- for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0> ();
+ for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// get global coordinate of cell center
GlobalPosition globalPos = eIt->geometry().center();
diff --git a/test/decoupled/2p/mcwhorteranalyticsolution.hh b/test/decoupled/2p/mcwhorteranalyticsolution.hh
index 06f84e310579db59c83a7e4d0b5d563f8e06cfd5..bccf81761d391eb6d104b78cb8dcb015c133c7c9 100644
--- a/test/decoupled/2p/mcwhorteranalyticsolution.hh
+++ b/test/decoupled/2p/mcwhorteranalyticsolution.hh
@@ -96,8 +96,8 @@ private:
Scalar globalVolume = 0;
Scalar errorNorm = 0.0;
- ElementIterator eItEnd = problem_.gridView().template end<0> ();
- for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0> ();
+ for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// get entity
ElementPointer element = *eIt;
@@ -303,8 +303,8 @@ private:
// std::cout<<" xf_ = "<<xf_<<std::endl;
// iterate over vertices and get analytical saturation solution
- ElementIterator eItEnd = problem_.gridView().template end<0> ();
- for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt!= eItEnd; ++eIt)
+ ElementIterator eEndIt = problem_.gridView().template end<0> ();
+ for (ElementIterator eIt = problem_.gridView().template begin<0> (); eIt!= eEndIt; ++eIt)
{
// get global coordinate of cell center
const GlobalPosition& globalPos = eIt->geometry().center();
diff --git a/test/decoupled/2p/test_transportproblem.hh b/test/decoupled/2p/test_transportproblem.hh
index 30870cf77f6390296ec1c6cffb78a90bb0a9b96a..ab403316ea9f8ce13237b5f3cede82e503ea487b 100644
--- a/test/decoupled/2p/test_transportproblem.hh
+++ b/test/decoupled/2p/test_transportproblem.hh
@@ -150,8 +150,8 @@ public:
vel[0] = 1e-5;
// compute update vector
- ElementIterator eItEnd = this->gridView().template end<0> ();
- for (ElementIterator eIt = this->gridView().template begin<0> (); eIt != eItEnd; ++eIt)
+ ElementIterator eEndIt = this->gridView().template end<0> ();
+ for (ElementIterator eIt = this->gridView().template begin<0> (); eIt != eEndIt; ++eIt)
{
// cell index
int globalIdx = this->elementMapper().map(*eIt);
@@ -159,8 +159,8 @@ public:
CellData& cellData = this->variables().cellData(globalIdx);
// run through all intersections with neighbors and boundary
- IntersectionIterator isItEnd = this->gridView().iend(*eIt);
- for (IntersectionIterator isIt = this->gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
+ IntersectionIterator isEndIt = this->gridView().iend(*eIt);
+ for (IntersectionIterator isIt = this->gridView().ibegin(*eIt); isIt != isEndIt; ++isIt)
{
// local number of facet
int indexInInside = isIt->indexInInside();