bump required dune version to 2.6

remove compatiblity code for older versions
2025-02-25 18:45:23 -06:00 · 2020-02-06 16:29:35 +01:00
parent 53047692e3
commit e41517a68e
35 changed files with 4 additions and 214 deletions
--- a/dune.module
+++ b/dune.module
@@ -10,4 +10,4 @@ Label: 2020.04-pre
 Maintainer: arne.morten.kvarving@sintef.no
 MaintainerName: Arne Morten Kvarving
 Url: http://opm-project.org
-Depends: dune-common (>= 2.4) dune-grid (>= 2.4) dune-istl (>= 2.4) opm-common opm-grid
+Depends: dune-common (>= 2.6) dune-grid (>= 2.6) dune-istl (>= 2.6) opm-common opm-grid
--- a/examples/aniso_implicitcap_test.cpp
+++ b/examples/aniso_implicitcap_test.cpp
@@ -39,11 +39,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/aniso_simulator_test.cpp
+++ b/examples/aniso_simulator_test.cpp
@@ -43,11 +43,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/cpchop.cpp
+++ b/examples/cpchop.cpp
@@ -23,11 +23,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

@@ -226,11 +222,7 @@ try
    }
    double residual_tolerance = param.getDefault("residual_tolerance", 1e-8);
    int linsolver_verbosity = param.getDefault("linsolver_verbosity", 0);
-#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 3) || defined(HAS_DUNE_FAST_AMG)
    int linsolver_type = param.getDefault("linsolver_type", 3);
-#else
-    int linsolver_type = param.getDefault("linsolver_type", 1);
-#endif

    //  Guarantee initialization
    double Pcmax = -DBL_MAX, Pcmin = DBL_MAX;
--- a/examples/cpchop_depthtrend.cpp
+++ b/examples/cpchop_depthtrend.cpp
@@ -23,11 +23,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/cpregularize.cpp
+++ b/examples/cpregularize.cpp
@@ -42,11 +42,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/exp_variogram.cpp
+++ b/examples/exp_variogram.cpp
@@ -34,11 +34,7 @@
 #include <opm/common/utility/platform_dependent/disable_warnings.h>

 #include <dune/common/version.hh>
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/grdecldips.cpp
+++ b/examples/grdecldips.cpp
@@ -23,11 +23,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/implicitcap_test.cpp
+++ b/examples/implicitcap_test.cpp
@@ -42,11 +42,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/known_answer_test.cpp
+++ b/examples/known_answer_test.cpp
@@ -39,11 +39,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <dune/grid/io/file/vtk/vtkwriter.hh>
 #include <dune/grid/yaspgrid.hh>
--- a/examples/mimetic_aniso_solver_test.cpp
+++ b/examples/mimetic_aniso_solver_test.cpp
@@ -42,11 +42,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <dune/grid/yaspgrid.hh>

--- a/examples/mimetic_solver_test.cpp
+++ b/examples/mimetic_solver_test.cpp
@@ -39,11 +39,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <dune/grid/io/file/vtk/vtkwriter.hh>

@@ -135,11 +131,7 @@ void test_flowsolver(const GI& g, const RI& r)
    std::vector<double> cell_pressure;
    getCellPressure(cell_pressure, g, soln);

-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
    Dune::VTKWriter<typename GI::GridType::LeafGridView> vtkwriter(g.grid().leafGridView());
-#else
-    Dune::VTKWriter<typename GI::GridType::LeafGridView> vtkwriter(g.grid().leafView());
-#endif
    vtkwriter.addCellData(cell_velocity_flat, "velocity", dim);
    vtkwriter.addCellData(cell_pressure, "pressure");
    vtkwriter.write("testsolution-" + boost::lexical_cast<std::string>(0),
--- a/examples/sim_steadystate_explicit.cpp
+++ b/examples/sim_steadystate_explicit.cpp
@@ -27,11 +27,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/steadystate_test_implicit.cpp
+++ b/examples/steadystate_test_implicit.cpp
@@ -39,11 +39,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/upscale_avg.cpp
+++ b/examples/upscale_avg.cpp
@@ -42,11 +42,7 @@
 #include <opm/common/utility/platform_dependent/disable_warnings.h>

 #include <dune/common/version.hh>
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/upscale_cap.cpp
+++ b/examples/upscale_cap.cpp
@@ -57,11 +57,7 @@
 #include <opm/common/utility/platform_dependent/disable_warnings.h>

 #include <dune/common/version.hh>
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/upscale_cond.cpp
+++ b/examples/upscale_cond.cpp
@@ -54,11 +54,7 @@
 #include <opm/common/utility/platform_dependent/disable_warnings.h>

 #include <dune/common/version.hh>
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/upscale_elasticity.cpp
+++ b/examples/upscale_elasticity.cpp
@@ -26,11 +26,7 @@
 #endif

 #include <dune/common/version.hh>
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
--- a/examples/upscale_perm.cpp
+++ b/examples/upscale_perm.cpp
@@ -49,11 +49,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/upscale_relperm.cpp
+++ b/examples/upscale_relperm.cpp
@@ -62,11 +62,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/upscale_relpermvisc.cpp
+++ b/examples/upscale_relpermvisc.cpp
@@ -71,11 +71,7 @@
 #include <opm/common/utility/platform_dependent/disable_warnings.h>

 #include <dune/common/version.hh>
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/upscale_singlephase.cpp
+++ b/examples/upscale_singlephase.cpp
@@ -26,11 +26,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/examples/upscale_steadystate_implicit.cpp
+++ b/examples/upscale_steadystate_implicit.cpp
@@ -38,11 +38,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/opm/elasticity/asmhandler_impl.hpp
+++ b/opm/elasticity/asmhandler_impl.hpp
@@ -118,13 +118,7 @@ void ASMHandler<GridType>::extractValues(Dune::FieldVector<double,comp>& v,
  v = 0;
  const LeafIndexSet& set = gv.leafGridView().indexSet();

-#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 6)
  auto ref = Dune::ReferenceElements<double,dim>::cube();
-#else
-  Dune::GeometryType gt = it->type();
-  const Dune::template ReferenceElement<double,dim> &ref =
-                      Dune::ReferenceElements<double,dim>::general(gt);
-#endif
  int vertexsize = ref.size(dim);
  int l=0;
  for (int i=0;i<vertexsize;++i) {
@@ -390,13 +384,7 @@ void ASMHandler<GridType>::determineAdjacencyPattern()
  // iterate over cells
  int cell=0;
  for (LeafIterator it = gv.leafGridView().template begin<0>(); it != itend; ++it, ++cell) {
-#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 6)
  auto ref = Dune::ReferenceElements<double,dim>::cube();
-#else
-    Dune::GeometryType gt = it->type();
-    const Dune::template ReferenceElement<double,dim>& ref =
-      Dune::ReferenceElements<double,dim>::general(gt);
-#endif

    int vertexsize = ref.size(dim);
    for (int i=0; i < vertexsize; i++) {
--- a/opm/elasticity/boundarygrid.hh
+++ b/opm/elasticity/boundarygrid.hh
@@ -18,9 +18,6 @@
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
 #include <dune/geometry/referenceelements.hh>
-#if ! DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 5)
-#include <dune/geometry/genericgeometry/matrixhelper.hh>
-#endif
 #include <dune/grid/common/mcmgmapper.hh>

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
@@ -329,12 +326,7 @@ class HexGeometry<2, cdim, GridImp>
    //! \param[in] dir The direction of the normal vector on the face
    HexGeometry(const BoundaryGrid::Quad& q, const GridImp& gv, int dir)
    {
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 6)
      Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridImp> mapper(gv, Dune::mcmgVertexLayout());
-#else
-      Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridImp,
-                                           Dune::MCMGVertexLayout> mapper(gv);
-#endif
      typename GridImp::LeafGridView::template Codim<3>::Iterator start=gv.leafGridView().template begin<3>();
      const typename GridImp::LeafGridView::template Codim<3>::Iterator itend = gv.leafGridView().template end<3>();
      for (int i=0;i<4;++i) {
@@ -362,11 +354,7 @@ class HexGeometry<2, cdim, GridImp>
    Dune::GeometryType type() const
    {
      Dune::GeometryType t;
-#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 6)
      t = Dune::GeometryTypes::cube(mydimension);
-#else
-      t.makeCube(mydimension);
-#endif
      return t;
    }

@@ -427,12 +415,7 @@ class HexGeometry<2, cdim, GridImp>
    LocalCoordinate local(const GlobalCoordinate& y) const
    {
      const ctype epsilon = 1e-10;
-#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 6)
      auto refElement = Dune::ReferenceElements<ctype,2>::cube();
-#else
-      const Dune::ReferenceElement< ctype , 2 > & refElement =
-        Dune::ReferenceElements< ctype, 2 >::general(type());
-#endif
      LocalCoordinate x = refElement.position(0,0);
      LocalCoordinate dx;
      do {
@@ -440,12 +423,7 @@ class HexGeometry<2, cdim, GridImp>
        JacobianTransposed JT = jacobianTransposed(x);
        GlobalCoordinate z = global(x);
        z -= y;
-#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 5)
        Dune::Impl::FieldMatrixHelper<double>::template xTRightInvA<2, 2>(JT, z, dx );
-#else
-        using namespace Dune::GenericGeometry;
-        MatrixHelper<DuneCoordTraits<double> >::template xTRightInvA<2, 2>(JT, z, dx );
-#endif
        x -= dx;
      } while (dx.two_norm2() > epsilon*epsilon);
      return x;
@@ -496,13 +474,9 @@ class HexGeometry<2, cdim, GridImp>
    ctype integrationElement(const LocalCoordinate& local) const
    {
      Dune::FieldMatrix<ctype, coorddimension, mydimension> Jt = jacobianTransposed(local);
-#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 5)
      return Dune::Impl::FieldMatrixHelper<double>::template sqrtDetAAT<2, 2>(Jt);
-#else
-      using namespace Dune::GenericGeometry;
-      return MatrixHelper<DuneCoordTraits<double> >::template sqrtDetAAT<2, 2>(Jt);
-#endif
    }
+
  private:
    //! \brief The coordinates of the corners
    GlobalCoordinate c[4];
--- a/opm/elasticity/elasticity_upscale_impl.hpp
+++ b/opm/elasticity/elasticity_upscale_impl.hpp
@@ -34,12 +34,7 @@ IMPL_FUNC(std::vector<BoundaryGrid::Vertex>,
  const LeafVertexIterator itend = gv.leafGridView().template end<dim>();

  // make a mapper for codim dim entities in the leaf grid 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 6)
  Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridType> mapper(gv, Dune::mcmgVertexLayout());
-#else
-  Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridType,
-                                            Dune::MCMGVertexLayout> mapper(gv);
-#endif
  // iterate over vertices and find slaves
  LeafVertexIterator start = gv.leafGridView().template begin<dim>();
  for (LeafVertexIterator it = start; it != itend; ++it) {
@@ -298,12 +293,7 @@ IMPL_FUNC(void, assembleBBlockMortar(const BoundaryGrid& b1,
  std::vector<std::vector<int> > lnodes = renumber(interface, n1+1,
                                                   n2+1, totalEqns);
  // get a reference element
-#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 6)
  auto gt = Dune::GeometryTypes::cube(2);
-#else
-  Dune::GeometryType gt;
-  gt.makeCube(2);
-#endif
  // get a quadrature rule
  int quadorder = std::max((1.0+n1+0.5)/2.0,(1.0+n2+0.5)/2.0);
  quadorder = std::max(quadorder, 2);
@@ -379,12 +369,7 @@ IMPL_FUNC(void, fixPoint(Direction dir,
  const VertexLeafIterator itend = gv.leafGridView().template end<dim>();

  // make a mapper for codim 0 entities in the leaf grid 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 6)
  Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridType> mapper(gv, Dune::mcmgVertexLayout());
-#else
-  Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridType,
-                                            Dune::MCMGVertexLayout> mapper(gv);
-#endif

  // iterate over vertices
  for (VertexLeafIterator it = gv.leafGridView().template begin<dim>(); it != itend; ++it) {
@@ -414,12 +399,7 @@ IMPL_FUNC(void, fixLine(Direction dir,
  const VertexLeafIterator itend = gv.leafGridView().template end<dim>();

  // make a mapper for codim 0 entities in the leaf grid 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 6)
  Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridType> mapper(gv, Dune::mcmgVertexLayout());
-#else
-  Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridType,
-                                            Dune::MCMGVertexLayout> mapper(gv);
-#endif

  // iterate over vertices
  for (VertexLeafIterator it = gv.leafGridView().template begin<dim>(); it != itend; ++it) {
--- a/opm/elasticity/mortar_evaluator.hpp
+++ b/opm/elasticity/mortar_evaluator.hpp
@@ -26,14 +26,6 @@ namespace Elasticity {

 class MortarEvaluator : public Dune::LinearOperator<Vector, Vector> {
  public:
-#if ! DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
-    // define the category
-    enum {
-      //! \brief The category the preconditioner is part of.
-      category=Dune::SolverCategory::sequential
-    };
-#endif
-
    //! \brief Constructor
    //! \param[in] Ai Evaluator for A^-1
    //! \param[in] B The mortar coupling matrix
@@ -75,12 +67,10 @@ class MortarEvaluator : public Dune::LinearOperator<Vector, Vector> {
        y[i] += alpha*l2[i-A.N()];
    }

-#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
    Dune::SolverCategory::Category category() const override
    {
      return Dune::SolverCategory::sequential;
    }
-#endif

  protected:
    const Matrix& A; //!< Reference to A matrix
--- a/opm/elasticity/mortar_schur.hpp
+++ b/opm/elasticity/mortar_schur.hpp
@@ -26,13 +26,6 @@ namespace Elasticity {
  template<class T>
 class MortarBlockEvaluator : public Dune::LinearOperator<Vector, Vector> {
  public:
-#if ! DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
-    // define the category
-    enum {
-      //! \brief The category the preconditioner is part of.
-      category=Dune::SolverCategory::sequential
-    };
-#endif

    //! \brief Constructor
    //! \param[in] Ai Solver or preconditioner for A^-1
@@ -70,12 +63,11 @@ class MortarBlockEvaluator : public Dune::LinearOperator<Vector, Vector> {
      B.usmtv(alpha, temp, y);
    }

-#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
    Dune::SolverCategory::Category category() const override
    {
      return Dune::SolverCategory::sequential;
    }
-#endif
+
  protected:
    T& Ai;            //!< Reference to solver or evaluator for inverse operator
    const Matrix& B;  //!< Reference to the mortar coupling matrix
--- a/opm/elasticity/mortar_schur_precond.hpp
+++ b/opm/elasticity/mortar_schur_precond.hpp
@@ -36,14 +36,6 @@ namespace Elasticity {
  template<class PrecondElasticityBlock>
 class MortarSchurPre : public Dune::Preconditioner<Vector,Vector> {
  public:
-#if ! DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
-    // define the category
-    enum {
-      //! \brief The category the preconditioner is part of.
-      category=Dune::SolverCategory::sequential
-    };
-#endif
-
    //! \brief Constructor
    //! \param[in] P The multiplier block with diagonal A approximation
    //! \param[in] B The mortar coupling matrix
@@ -104,12 +96,11 @@ class MortarSchurPre : public Dune::Preconditioner<Vector,Vector> {
      Apre.post(x);
    }

-#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
    Dune::SolverCategory::Category category() const override
    {
      return Dune::SolverCategory::sequential;
    }
-#endif
+
  protected:
    //! \brief The preconditioner for the elasticity operator
    PrecondElasticityBlock& Apre;
--- a/opm/elasticity/uzawa_solver.hpp
+++ b/opm/elasticity/uzawa_solver.hpp
@@ -72,12 +72,10 @@ class UzawaSolver : public Dune::InverseOperator<X,Y>
      MortarUtils::injectBlock(x, lambda2, B.M(), B.N());
    }

-#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
    Dune::SolverCategory::Category category() const override
    {
      return Dune::SolverCategory::sequential;
    }
-#endif

  protected:
    OperatorPtr innersolver; //!< The inner solver
--- a/opm/porsol/common/PeriodicHelpers.hpp
+++ b/opm/porsol/common/PeriodicHelpers.hpp
@@ -187,11 +187,7 @@ namespace Opm
 			    const std::array<bool, 2*GridInterface::Dimension>& is_periodic,
 			    double spatial_tolerance = 1e-6)
    {
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
        findPeriodicPartners(bfinfo, side_areas, g.grid().leafGridView(), is_periodic, spatial_tolerance);
-#else
-        findPeriodicPartners(bfinfo, side_areas, g.grid().leafView(), is_periodic, spatial_tolerance);
-#endif
        int num_bdy = bfinfo.size();
        // This will likely change with boundarySegmentIndex() instead of boundaryId():
        int max_bid = num_bdy;
--- a/opm/porsol/common/SimulatorUtilities.hpp
+++ b/opm/porsol/common/SimulatorUtilities.hpp
@@ -272,11 +272,7 @@ namespace Opm
        }

        // Write data.
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
        Dune::VTKWriter<typename GridInterface::GridType::LeafGridView> vtkwriter(ginterf.grid().leafGridView());
-#else
-        Dune::VTKWriter<typename GridInterface::GridType::LeafGridView> vtkwriter(ginterf.grid().leafView());
-#endif
        vtkwriter.addCellData(saturation, "saturation");
        vtkwriter.addCellData(cell_pressure, "pressure");
        vtkwriter.addCellData(cap_pressure, "capillary pressure");
--- a/opm/porsol/mimetic/IncompFlowSolverHybrid.hpp
+++ b/opm/porsol/mimetic/IncompFlowSolverHybrid.hpp
@@ -64,9 +64,7 @@
 #include <dune/istl/owneroverlapcopy.hh>
 #include <dune/istl/paamg/amg.hh>
 #include <dune/common/version.hh>
-#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 3)
 #include <dune/istl/paamg/fastamg.hh>
-#endif
 #include <dune/istl/paamg/kamg.hh>
 #include <dune/istl/paamg/pinfo.hh>

@@ -688,15 +686,8 @@ namespace Opm {
 				      linsolver_maxit, prolongate_factor, same_matrix,smooth_steps);
                break;
            case 3: // CG preconditioned with AMG that uses less memory badwidth
-#if defined(HAS_DUNE_FAST_AMG) || DUNE_VERSION_NEWER(DUNE_ISTL, 2, 3)
                solveLinearSystemFastAMG(residual_tolerance, linsolver_verbosity, 
                             linsolver_maxit, prolongate_factor, same_matrix,smooth_steps);
-#else
-                if(linsolver_verbosity)
-                    std::cerr<<"Fast AMG is not available; falling back to CG preconditioned with the normal one."<<std::endl;
-                solveLinearSystemAMG(residual_tolerance, linsolver_verbosity, 
-				     linsolver_maxit, prolongate_factor, same_matrix, smooth_steps);
-#endif
                break;
            default:
                std::cerr << "Unknown linsolver_type: " << linsolver_type << '\n';
@@ -1545,7 +1536,6 @@ namespace Opm {

        }

-#if defined(HAS_DUNE_FAST_AMG) || DUNE_VERSION_NEWER(DUNE_ISTL, 2, 3)

        // ----------------------------------------------------------------
        void solveLinearSystemFastAMG(double residual_tolerance, int verbosity_level,
@@ -1608,7 +1598,6 @@ namespace Opm {
            }

        }
-#endif

        // ----------------------------------------------------------------
        void solveLinearSystemKAMG(double residual_tolerance, int verbosity_level,
--- a/opm/upscaling/initCPGrid.cpp
+++ b/opm/upscaling/initCPGrid.cpp
@@ -26,11 +26,7 @@
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/common/utility/platform_dependent/reenable_warnings.h>

--- a/tests/common/test_gravitypressure.cpp
+++ b/tests/common/test_gravitypressure.cpp
@@ -29,11 +29,7 @@

 #include <dune/common/version.hh>

-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
 #include <dune/common/parallel/mpihelper.hh>
-#else
-#include <dune/common/mpihelper.hh>
-#endif

 #include <opm/upscaling/RelPermUtils.hpp>
 #undef  UNITTEST_TRESPASS_PRIVATE_PROPERTY_DP