diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
index 12fe7379daa3b624b3e7dd1d905f2f312e934b3b..ec77a08f74efcdf376025c9882d0862373c900a0 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
@@ -204,7 +204,7 @@ void FVVelocity2PAdaptive<TypeTag>::calculateVelocity(const Intersection& inters
// We are looking for two things:
// IsIndexJ, the index of the interface from the neighbor-cell point of view
// GlobalIdxK, the index of the third cell
- // for efficienty this is done in one IntersectionIterator-Loop
+ // for efficienty this is done in one intersection loop
// Intersectioniterator around cell I
for (const auto& intersectionI : Dune::intersections(problem_.gridView(), elementI))
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh
index f1b092120c7a379693cc277c2af67e26c6f78661..d8d6380a68dfe2bd527a816c886bff328f8ab6ce 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2p.hh
@@ -614,12 +614,12 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
}
}
}
- } // end of 'for' IntersectionIterator
+ } // end of intersection loop
// set number of indices in row eIdxGlobalI to rowSize
this->A_.setrowsize(eIdxGlobalI, rowSize);
- } // end of 'for' ElementIterator
+ } // end of element loop
// indicate that size of all rows is defined
this->A_.endrowsizes();
@@ -671,8 +671,8 @@ void FvMpfaL2dPressure2p<TypeTag>::initializeMatrix()
}
}
}
- } // end of 'for' IntersectionIterator
- } // end of 'for' ElementIterator
+ } // end of intersection loop
+ } // end of element loop
// indicate that all indices are defined, check consistency
this->A_.endindices();
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2padaptive.hh
index 6438d6d080a7873cc92944d03b8f59c3944311c5..07246af66af8ba8a044b27ce6b6765702323eef2 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressure2padaptive.hh
@@ -634,14 +634,14 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
}
}
- } // end of 'for' IntersectionIterator
+ } // end of intersection loop
rowSize = std::min(rowSize, 13); //in 2-D
// set number of indices in row eIdxGlobalI to rowSize
this->A_.setrowsize(eIdxGlobalI, rowSize);
- } // end of 'for' ElementIterator
+ } // end of element loop
// indicate that size of all rows is defined
this->A_.endrowsizes();
@@ -725,8 +725,8 @@ void FvMpfaL2dPressure2pAdaptive<TypeTag>::initializeMatrix()
}
}
}
- } // end of 'for' IntersectionIterator
- } // end of 'for' ElementIterator
+ } // end of intersection loop
+ } // end of element loop
// indicate that all indices are defined, check consistency
this->A_.endindices();
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh
index ce27be11c4760aa1ff75be7fe50e2005e52e8cd2..9f1eb3622c53be451951fd8d7a4b3640bb50fef8 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2p.hh
@@ -73,7 +73,6 @@ template<class TypeTag> class FvMpfaL2dPressureVelocity2p: public FvMpfaL2dPress
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GridView::IndexSet IndexSet;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
typedef typename ParentType::InteractionVolume InteractionVolume;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh
index 802c20f849733ffd52eab8b9ef8306ff27d8d449..efcc16d862212ed11fe18200a9afceb73b5e1476 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dpressurevelocity2padaptive.hh
@@ -76,7 +76,6 @@ template<class TypeTag> class FvMpfaL2dPressureVelocity2pAdaptive: public FvMpfa
typedef typename GridView::Grid Grid;
typedef typename GridView::IndexSet IndexSet;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
typedef typename Grid::template Codim<0>::Entity::Geometry Geometry;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2padaptive.hh
index b01058d4501a1ceb5f6755319df6b4c0b792601c..9f6123ed8cc835359550c9ca97c978e2b4e0cc24 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2dvelocity2padaptive.hh
@@ -80,9 +80,6 @@ template<class TypeTag> class FvMpfaL2dVelocity2pAdaptive : public FvMpfaL2dVelo
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Grid Grid;
typedef typename GridView::IndexSet IndexSet;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename Element::Geometry Geometry;
typedef typename Geometry::JacobianTransposed JacobianTransposed;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
index 98fdcc42f03f5cca8dfc6057cb2d611d2eb8501a..0a018a22be2f7e84d0d8d17b6609b24af850e284 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
@@ -576,7 +576,7 @@ void FvMpfaL3dPressure2p<TypeTag>::initializeMatrixRowSize()
}
this->A_.setrowsize(eIdxGlobalI, neighborIndices.size());
- } // end of 'for' ElementIterator
+ } // end of element loop
return;
}
@@ -611,7 +611,7 @@ void FvMpfaL3dPressure2p<TypeTag>::initializeMatrixIndices()
}
}
}
- } // end of 'for' ElementIterator
+ } // end of element loop
return;
}
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
index 15298b0af3d8c6978b73586ddcad5cd43880e292..24aed8b55b3ea4adb0f5a62568e436ed6609b552 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
@@ -356,7 +356,7 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixRowSize()
}
this->A_.setrowsize(globalIdxI, neighborIndices.size());
- } // end of 'for' ElementIterator
+ } // end of element loop
return;
}
@@ -403,7 +403,7 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixIndices()
}
}
}
- } // end of 'for' ElementIterator
+ } // end of element loop
return;
}
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh
index 9d72c4c505f1d55bd187fa39fee29169959cbc6c..4dfdf48ec61964662b542ae544bc3499716f0e78 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2p.hh
@@ -83,7 +83,6 @@ template<class TypeTag> class FvMpfaL3dPressureVelocity2p: public FvMpfaL3dPress
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolume) InteractionVolume;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2padaptive.hh
index 78c8d100163296fb6fef0d9fc28b478716c77d99..6072966175125f8c426dbef5316994fc2193965a 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressurevelocity2padaptive.hh
@@ -84,7 +84,6 @@ template<class TypeTag> class FvMpfaL3dPressureVelocity2pAdaptive: public FvMpfa
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolume) InteractionVolume;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh
index f2b92037f86738884eab5886899a089d16d6dd31..2c0c116ee1041904c9f4e1944b73b756bbc2885c 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh
@@ -84,7 +84,6 @@ template<class TypeTag> class FvMpfaL3dVelocity2pAdaptive: public FvMpfaL3dVeloc
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Grid Grid;
typedef typename GridView::IndexSet IndexSet;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh
index 50932d167292e32f1197f49ee0e6b7f38de711b0..d72bc0e982684e7b0454e1bec600f300c8239a24 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2dpressure2p.hh
@@ -591,12 +591,12 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
}
}
}
- } // end of 'for' IntersectionIterator
+ } // end of intersection loop
// set number of indices in row eIdxGlobalI to rowSize
this->A_.setrowsize(eIdxGlobalI, rowSize);
- } // end of 'for' ElementIterator
+ } // end of element loop
// indicate that size of all rows is defined
this->A_.endrowsizes();
@@ -648,8 +648,8 @@ void FvMpfaO2dPressure2p<TypeTag>::initializeMatrix()
}
}
}
- } // end of 'for' IntersectionIterator
- } // end of 'for' ElementIterator
+ } // end of intersection loop
+ } // end of element loop
// indicate that all indices are defined, check consistency
this->A_.endindices();
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh b/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
index 5bec7b3bd3a55fbea5fdf6b6058ed95e149b8e8c..0d8939673ae66ba110b7a73e9898d169be7ee9d7 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
@@ -733,9 +733,7 @@ void MimeticTwoPLocalStiffnessAdaptive<TypeTag>::assembleElementMatrices(const E
template<class TypeTag>
void MimeticTwoPLocalStiffnessAdaptive<TypeTag>::assembleBC(const Element& element, int k)
{
- // evaluate boundary conditions via intersection iterator
- typedef typename GridView::IntersectionIterator IntersectionIterator;
-
+ // evaluate boundary conditions via an intersection loop
unsigned int faceIndex = 0;
for (const auto& intersection : Dune::intersections(gridView_, element))
{
diff --git a/dumux/decoupled/2p2c/fvmpfal3d2p2cinteractionvolumecontaineradaptive.hh b/dumux/decoupled/2p2c/fvmpfal3d2p2cinteractionvolumecontaineradaptive.hh
index 45ad926ab9f8034756ad33a2cba966bbb436a8db..6da5fb62301fc46d80e4dcf047f8056542b5fbad 100644
--- a/dumux/decoupled/2p2c/fvmpfal3d2p2cinteractionvolumecontaineradaptive.hh
+++ b/dumux/decoupled/2p2c/fvmpfal3d2p2cinteractionvolumecontaineradaptive.hh
@@ -68,9 +68,7 @@ class FvMpfaL3d2P2CInteractionVolumeContainerAdaptive : public FvMpfaL3dInteract
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename Element::Geometry ElementGeometry;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::Traits::template Codim<dim>::Entity Vertex;
- typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
diff --git a/dumux/freeflow/stokesnc/stokesnclocalresidual.hh b/dumux/freeflow/stokesnc/stokesnclocalresidual.hh
index 8385687c8de09d0f3f62a100e163e11768c90a3a..a766f08311da74da71f37609e8e381fa7a7e7434 100644
--- a/dumux/freeflow/stokesnc/stokesnclocalresidual.hh
+++ b/dumux/freeflow/stokesnc/stokesnclocalresidual.hh
@@ -77,7 +77,6 @@ class StokesncLocalResidual : public StokesLocalResidual<TypeTag>
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef typename GridView::Intersection Intersection;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
static const bool calculateNavierStokes = GET_PROP_VALUE(TypeTag, EnableNavierStokes);
diff --git a/dumux/implicit/cornerpoint/cpfvelementgeometry.hh b/dumux/implicit/cornerpoint/cpfvelementgeometry.hh
index cff8a81644c6113fdf813c761402e290d6936504..101a539659a73a9567f2e8a67149e54207fa5853 100644
--- a/dumux/implicit/cornerpoint/cpfvelementgeometry.hh
+++ b/dumux/implicit/cornerpoint/cpfvelementgeometry.hh
@@ -58,7 +58,6 @@ class CpFVElementGeometry
typedef typename Element::Geometry Geometry;
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
public:
struct SubControlVolume //! FV intersected with element
diff --git a/dumux/implicit/richards/richardsnewtoncontroller.hh b/dumux/implicit/richards/richardsnewtoncontroller.hh
index 67f17a84e05a5870aa0ef8c1c875e1d652eba963..e4aa3b475625cb474d7089c3fe28d33516f3a7e9 100644
--- a/dumux/implicit/richards/richardsnewtoncontroller.hh
+++ b/dumux/implicit/richards/richardsnewtoncontroller.hh
@@ -52,7 +52,6 @@ class RichardsNewtonController : public NewtonController<TypeTag>
enum { pwIdx = Indices::pwIdx };
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
enum { dim = GridView::dimension };
enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
enum { dofCodim = isBox ? dim : 0 };
diff --git a/test/decoupled/1p/resultevaluation3d.hh b/test/decoupled/1p/resultevaluation3d.hh
index e80d92d3ca81d2de26362ea61e7e8001b1ef8cf8..7efbf3ac61d66a4170b7f3176f1ae48e4b8e5267 100644
--- a/test/decoupled/1p/resultevaluation3d.hh
+++ b/test/decoupled/1p/resultevaluation3d.hh
@@ -698,8 +698,6 @@ public:
enum {dim=Grid::dimension, maxIntersections = 12};
typedef typename Grid::template Codim<0>::Entity Element;
typedef typename Element::Geometry Geometry;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElements<Scalar, dim-1> ReferenceFaces;
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index ba961971a8b11e051e7e52fc4ac4afe26099de0f..efca6ef232e6a726ff552de70efd58f3ca325f6f 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -804,9 +804,6 @@ public:
typedef typename Dune::MultipleCodimMultipleGeomTypeMapper<GridView,
Dune::MCMGVertexLayout> VertexMapper;
- typedef typename GridView::template Codim<GridView::dimension>::Iterator
- VertexIterator;
-
/*!
* \brief The constructor
*
diff --git a/test/implicit/2pncmin/dissolutionspatialparams.hh b/test/implicit/2pncmin/dissolutionspatialparams.hh
index 97a1883dffbc1ed8aec9162c893d327ede4fecde..7a35bd0646db335984b59c87363896ca6ee0df6d 100644
--- a/test/implicit/2pncmin/dissolutionspatialparams.hh
+++ b/test/implicit/2pncmin/dissolutionspatialparams.hh
@@ -89,11 +89,9 @@ class DissolutionSpatialparams : public ImplicitSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
typedef std::vector<Scalar> PermeabilityType;
typedef std::vector<MaterialLawParams> MaterialLawParamsVector;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GET_PROP(TypeTag, ParameterTree) ParameterTree;
diff --git a/test/implicit/mpnc/combustionproblem1c.hh b/test/implicit/mpnc/combustionproblem1c.hh
index c8cc5e56011b33ae9884bdd2cdebc84239af8e39..2f6083efc32345f15b621b4d89973372baed3fe9 100644
--- a/test/implicit/mpnc/combustionproblem1c.hh
+++ b/test/implicit/mpnc/combustionproblem1c.hh
@@ -219,7 +219,6 @@ class CombustionProblemOneComponent: public ImplicitPorousMediaProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
diff --git a/test/implicit/richards/richardslensproblem.hh b/test/implicit/richards/richardslensproblem.hh
index 32d68d8b06d91c371bdcf7b6f0b7bedb9daa0229..cbd9a2405f18e0222827ab32529df629b3999b3a 100644
--- a/test/implicit/richards/richardslensproblem.hh
+++ b/test/implicit/richards/richardslensproblem.hh
@@ -123,7 +123,6 @@ class RichardsLensProblem : public RichardsProblem<TypeTag>
dimWorld = GridView::dimensionworld
};
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<0>::Entity Element;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
static const bool useHead = GET_PROP_VALUE(TypeTag, UseHead);