switched use of simplex- and cube grid-creator between decoupled 2p and

box 2pni test

   - the cell centered finite volume discretization of the decoupled 2p
     model is not able to treat simplices correctly



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

test/boxmodels/2pni/injectionproblem2pni.hh

@@ -34,6 +34,8 @@
 #include <dune/grid/io/file/dgfparser/dgfug.hh>
 #include <dune/grid/io/file/dgfparser/dgfs.hh>
 #include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+#include <dumux/common/structuredsimplexgridcreator.hh>
+#include <dumux/common/structuredcubegridcreator.hh>
 
 #include <dumux/boxmodels/2pni/2pnimodel.hh>
 
@@ -59,7 +61,14 @@ NEW_TYPE_TAG(InjectionProblem2PNI, INHERITS_FROM(BoxTwoP, InjectionSpatialParame
 #endif
 
 // set the GridCreator property
-SET_TYPE_PROP(InjectionProblem2PNI, GridCreator, CubeGridCreator<TypeTag>);
+SET_PROP(InjectionProblem2PNI, GridCreator)
+{
+#if HAVE_UG
+    typedef StructuredSimplexGridCreator<TypeTag> type;
+#else
+    typedef StructuredCubeGridCreator<TypeTag> type;
+#endif
+};
 
 // Set the grid type
 SET_PROP(InjectionProblem2PNI, Grid)
@@ -67,7 +76,6 @@ SET_PROP(InjectionProblem2PNI, Grid)
 #if HAVE_UG
     typedef Dune::UGGrid<2> type;
 #else
-//    typedef Dune::SGrid<2, 2> type;
     typedef Dune::YaspGrid<2> type;
 #endif
 };

test/boxmodels/2pni/test_2pni.cc

@@ -28,8 +28,6 @@
  */
 #include "config.h"
 
-#include <dumux/common/structuredcubegridcreator.hh>
-
 #include "injectionproblem2pni.hh"
 #include <dumux/common/start.hh>
 

test/decoupled/2p/test_impes.cc

@@ -28,8 +28,6 @@
  * \brief test for the sequential 2p model
  */
 #include "config.h"
-#include <dumux/common/structuredsimplexgridcreator.hh>
-
 
 #include "test_impes_problem.hh"
 #include <dumux/common/start.hh>

test/decoupled/2p/test_impes_problem.hh

@@ -35,6 +35,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 #include <dune/grid/sgrid.hh>
+#include <dumux/common/structuredcubegridcreator.hh>
 
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/components/simpleh2o.hh>
@@ -67,7 +68,7 @@ namespace Properties
 NEW_TYPE_TAG(IMPESTestProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TestIMPESSpatialParams));
 
 // set the GridCreator property
-SET_TYPE_PROP(IMPESTestProblem, GridCreator, SimplexGridCreator<TypeTag>);
+SET_TYPE_PROP(IMPESTestProblem, GridCreator, StructuredCubeGridCreator<TypeTag>);
 
 // Set the grid type
 SET_PROP(IMPESTestProblem, Grid)