Skip to content
Snippets Groups Projects
Commit 4a5b39bd authored by Andreas Lauser's avatar Andreas Lauser
Browse files

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
parent 3ab247b5
No related branches found
No related tags found
No related merge requests found
......@@ -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)
}
......
......@@ -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.
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment