Merge pull request #209 from andlaus/remove_dune_2_3_support

remove support for dune < 2.4

ebos/collecttoiorank.hh

@@ -213,11 +213,7 @@ namespace Ewoms
                     auto elemIt = gridManager.equilGrid().leafGridView().template begin<0>();
                     const auto& elemEndIt = gridManager.equilGrid().leafGridView().template end<0>();
                     for (; elemIt != elemEndIt; ++elemIt) {
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
                         int elemIdx = equilElemMapper.index(*elemIt );
-#else
-                        int elemIdx = equilElemMapper.map(*elemIt );
-#endif
                         int cartElemIdx = gridManager.equilCartesianIndexMapper().cartesianIndex(elemIdx);
                         globalCartesianIndex_[elemIdx] = cartElemIdx;
                     }
@@ -255,11 +251,7 @@ namespace Ewoms
                      end = localGridView.template end< 0, Dune::Interior_Partition >(); it != end; ++it )
                 {
                     const auto element = *it ;
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
                     int elemIdx = elemMapper.index( element );
-#else
-                    int elemIdx = elemMapper.map( element );
-#endif
                     distributedCartesianIndex[elemIdx] = gridManager.cartesianIndex( elemIdx );
 
                     // only store interior element for collection

ebos/eclcpgridmanager.hh

@@ -170,13 +170,8 @@ public:
                     if (!is.neighbor())
                         continue;
 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
                     unsigned I = elemMapper.index(is.inside());
                     unsigned J = elemMapper.index(is.outside());
-#else
-                    unsigned I = elemMapper.map(is.inside());
-                    unsigned J = elemMapper.map(is.outside());
-#endif
 
                     // FIXME (?): this is not portable!
                     unsigned faceIdx = is.id();

ebos/eclpeacemanwell.hh

@@ -94,11 +94,7 @@ class EclPeacemanWell : public BaseAuxiliaryModule<TypeTag>
     typedef Opm::MathToolbox<Evaluation> Toolbox;
 
     typedef typename GridView::template Codim<0>::Entity        Element;
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
     typedef Element  ElementStorage;
-#else
-    typedef typename GridView::template Codim<0>::EntityPointer ElementStorage;
-#endif
 
     // the dimension of the simulator's world
     static const int dimWorld = GridView::dimensionworld;
@@ -373,11 +369,7 @@ public:
             // influence of grid on well
             auto& curBlock = matrix[wellGlobalDofIdx][gridDofIdx];
 
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
             elemCtx.updateStencil( dofVars.element );
-#else
-            elemCtx.updateStencil( *dofVars.element );
-#endif
             curBlock = 0.0;
             for (unsigned priVarIdx = 0; priVarIdx < numModelEq; ++priVarIdx) {
                 // calculate the derivative of the well equation w.r.t. the current
@@ -609,11 +601,7 @@ public:
         DofVariables& dofVars = *dofVariables_[globalDofIdx];
         wellTotalVolume_ += context.model().dofTotalVolume(globalDofIdx);
 
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
         dofVars.element = context.element();
-#else
-        dofVars.element = ElementStorage( context.element() );
-#endif
 
         dofVars.localDofIdx = dofIdx;
         dofVars.pvtRegionIdx = context.problem().pvtRegionIndex(context, dofIdx, /*timeIdx=*/0);
@@ -622,13 +610,8 @@ public:
         // determine the size of the element
         dofVars.effectiveSize.fill(0.0);
 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 4)
         // we assume all elements to be hexahedrons!
         assert(context.element().subEntities(/*codim=*/dimWorld) == 8);
-#else
-        // we assume all elements to be hexahedrons!
-        assert(context.element().template count</*codim=*/dimWorld>() == 8);
-#endif
 
         const auto& refElem = Dune::ReferenceElements<Scalar, /*dim=*/3>::cube();
 

ebos/eclproblem.hh

@@ -1102,11 +1102,7 @@ private:
         const auto& elemEndIt = gridView.template end</*codim=*/0>();
         for (; elemIt != elemEndIt; ++elemIt) {
             const Element& element = *elemIt;
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
             const unsigned int elemIdx = elemMapper.index(element);
-#else
-            const unsigned int elemIdx = elemMapper.map(element);
-#endif
 
             elementCenterDepth_[elemIdx] = cellCenterDepth( element );
         }
@@ -1662,18 +1658,9 @@ private:
         {
             const auto& elementMapper = this->model().elementMapper();
 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
             unsigned globalElemIdx = elementMapper.index(stencil.entity(localDofIdx));
-#else
-            unsigned globalElemIdx = elementMapper.map(stencil.entity(localDofIdx));
-#endif
-
             if (localDofIdx != 0) {
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
                 unsigned globalCenterElemIdx = elementMapper.index(stencil.entity(/*dofIdx=*/0));
-#else
-                unsigned globalCenterElemIdx = elementMapper.map(stencil.entity(/*dofIdx=*/0));
-#endif
                 dofData.transmissibility = transmissibilities_.transmissibility(globalCenterElemIdx, globalElemIdx);
             }
         };

ebos/eclthresholdpressure.hh

@@ -263,13 +263,8 @@ private:
                 const auto& inside = intersection.inside();
                 const auto& outside = intersection.outside();
 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
                 unsigned insideElemIdx = elementMapper.index(inside);
                 unsigned outsideElemIdx = elementMapper.index(outside);
-#else
-                unsigned insideElemIdx = elementMapper.map(*inside);
-                unsigned outsideElemIdx = elementMapper.map(*outside);
-#endif
 
                 unsigned equilRegionInside = elemEquilRegion_[insideElemIdx];
                 unsigned equilRegionOutside = elemEquilRegion_[outsideElemIdx];

ebos/ecltransmissibility.hh

@@ -129,11 +129,7 @@ public:
         const auto& elemEndIt = gridView.template end</*codim=*/ 0>();
         for (; elemIt != elemEndIt; ++elemIt) {
             const auto& elem = *elemIt;
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
             unsigned elemIdx = elemMapper.index(elem);
-#else
-            unsigned elemIdx = elemMapper.map(elem);
-#endif
 
             // compute the axis specific "centroids" used for the transmissibilities. for
             // consistency with the flow simulator, we use the element centers as
@@ -170,13 +166,8 @@ public:
 
                 const auto& inside = intersection.inside();
                 const auto& outside = intersection.outside();
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
                 unsigned insideElemIdx = elemMapper.index(inside);
                 unsigned outsideElemIdx = elemMapper.index(outside);
-#else
-                unsigned insideElemIdx = elemMapper.map(*inside);
-                unsigned outsideElemIdx = elemMapper.map(*outside);
-#endif
 
                 // we only need to calculate a face's transmissibility
                 // once...