make the startFromInputFile() function really work

grr, the DUNE_VERSION_NEWER_REV macro seems to be broken. why does
nothing ever work at the first try...

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6093 2fb0f335-1f38-0410-981e-8018bf24f1b0

dumux/common/start.hh

@@ -29,7 +29,16 @@
 #include <dune/grid/io/file/dgfparser.hh>
 #include <dune/common/mpihelper.hh>
 #include <iostream>
-//#include <dune/common/parametertreeparser.hh>
+
+#include <dune/common/version.hh>
+
+#define HAVE_DUNE21 \
+    (DUNE_COMMON_VERSION_MAJOR > 2   \
+     || (DUNE_COMMON_VERSION_MAJOR == 2 && DUNE_COMMON_VERSION_MINOR >= 1))
+
+#if HAVE_DUNE21 //DUNE_VERSION_NEWER_REV(COMMON, 2, 0, 99)
+#include <dune/common/parametertreeparser.hh>
+#endif // DUNE_VERSION_NEWER_REV(COMMON, 2, 0, 99)
 
 
 namespace Dumux
@@ -229,10 +238,7 @@ int startWithGrid(const typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) &grid,
     return 3;
 };
 
-///////
-// commented out, because it does not work with dune 2.0
-///////
-#if DUNE_VERSION_NEWER_REV(GRID, 2, 0, 99)
+#if HAVE_DUNE21 //DUNE_VERSION_NEWER_REV(COMMON, 2, 0, 99)
 // requires DUNE 2.1 and above
 
 /*!
@@ -329,7 +335,7 @@ int startFromInputFile(int argc, char **argv)
 
    return 3;
 }
-#endif // DUNE_VERSION_NEWER_REV(GRID, 2, 0, 99)
+#endif // DUNE_VERSION_NEWER_REV(COMMON, 2, 0, 99)
 
 }
 

dumux/io/vtkmultiwriter.hh

@@ -59,7 +59,7 @@ class VtkMultiWriter
     typedef typename GridView::Grid Grid;
     enum { dim = GridView::dimension };
 
-#if DUNE_VERSION_NEWER_REV(GRID, 2, 0, 99)
+#if DUNE_VERSION_NEWER_REV(GRID, 2, 1, 0)
     // DUNE 2.1 and above
     typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGVertexLayout> VertexMapper;
     typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;

dumux/io/vtknestedfunction.hh

@@ -29,7 +29,7 @@
 #include <dune/istl/bvector.hh>
 #include <dune/common/version.hh>
 
-#if DUNE_VERSION_NEWER_REV(GRID, 2, 0, 99)
+#if DUNE_VERSION_NEWER_REV(GRID, 2, 1, 0)
 // DUNE 2.1 and above
 #include <dune/grid/io/file/vtk/function.hh>
 #else