From 4a5b39bd871092af0b8b98fabb9cc6c643753150 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Wed, 4 Jan 2012 20:28:07 +0000
Subject: [PATCH] remove DUNE 2.0 compatibility code
Dumux 2.1 will require DUNE 2.1 or (possibly) above
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7301 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/common/start.hh | 8 --------
dumux/io/vtkmultiwriter.hh | 16 ----------------
dumux/io/vtknestedfunction.hh | 7 -------
3 files changed, 31 deletions(-)
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 4f8e6c02be..4be8536661 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -33,11 +33,7 @@
#include <iostream>
#include <dune/common/version.hh>
-
-#if DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
#include <dune/common/parametertreeparser.hh>
-#endif // DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
-
namespace Dumux
{
@@ -242,9 +238,6 @@ int startWithGrid(const typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) &grid,
return 3;
}
-#if DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
-// requires DUNE 2.1 and above
-
/*!
* \ingroup Start
* \brief Provides a default main function for simulations requiring
@@ -351,7 +344,6 @@ int startFromInputFile(int argc, char **argv)
return 3;
}
-#endif // DUNE_VERSION_NEWER_REV(DUNE_COMMON, 2, 1, 0)
}
diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh
index 9b9ef4b22d..c278a1fe1d 100644
--- a/dumux/io/vtkmultiwriter.hh
+++ b/dumux/io/vtkmultiwriter.hh
@@ -59,24 +59,8 @@ class VtkMultiWriter
typedef typename GridView::Grid Grid;
enum { dim = GridView::dimension };
-#if DUNE_VERSION_NEWER_REV(DUNE_GRID, 2, 1, 0)
- // DUNE 2.1 and above
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGVertexLayout> VertexMapper;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
-#else
- // DUNE 2.0 and below
- template<int dim>
- struct VertexLayout {
- bool contains (Dune::GeometryType gt) const
- { return gt.dim() == 0; } };
- template<int dim>
- struct ElementLayout {
- bool contains (Dune::GeometryType gt) const
- { return gt.dim() == dim; } };
-
- typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, VertexLayout> VertexMapper;
- typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, ElementLayout> ElementMapper;
-#endif
// this constructor won't work anymore. Please use the variant
// below which also includes the GridView as an argument.
diff --git a/dumux/io/vtknestedfunction.hh b/dumux/io/vtknestedfunction.hh
index fa753b7335..24ddba5e67 100644
--- a/dumux/io/vtknestedfunction.hh
+++ b/dumux/io/vtknestedfunction.hh
@@ -30,14 +30,7 @@
#include <dune/common/fvector.hh>
#include <dune/istl/bvector.hh>
#include <dune/common/version.hh>
-
-#if DUNE_VERSION_NEWER_REV(DUNE_GRID, 2, 1, 0)
-// DUNE 2.1 and above
#include <dune/grid/io/file/vtk/function.hh>
-#else
-// DUNE 2.0 and below
-#include <dune/grid/io/file/vtk/vtkwriter.hh>
-#endif
#include <string>
--
GitLab