changes due to changes in the adaptive 2p model

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

test/decoupled/2padaptive/input

+gridFile = grids/refinegrid.dgf
+tEnd = 100000000
+levelInit =4 
+levelMin =0 
+levelMax =4 

test/decoupled/2padaptive/test_impes_adaptive.cc

@@ -132,7 +132,9 @@ int main(int argc, char** argv)
         // instantiate and run the concrete problem
         ////////////////////////////////////////////////////////////
         TimeManager timeManager;
-        Problem problem(timeManager, *gridPtr);
+        Problem problem(timeManager, gridPtr->leafView());
+        problem.setGrid(*gridPtr);
+        problem.gridAdapt().setLevels(Params::tree().get<int>("levelMin"), Params::tree().get<int>("levelMax"));
 
         // load restart file if necessarry
         if (restart)

test/decoupled/2padaptive/test_impes_adaptive_problem.hh

@@ -44,6 +44,7 @@
 #include <dumux/decoupled/2p/transport/fv/fvsaturation2p.hh>
 #include <dumux/decoupled/2p/transport/fv/capillarydiffusion.hh>
 #include <dumux/decoupled/2p/transport/fv/gravitypart.hh>
+#include <dumux/decoupled/2p/variableclass2p_gridadapt.hh>
 
 #include "test_impes_adaptive_spatialparams.hh"
 
@@ -104,8 +105,14 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
 };
 
+SET_PROP(TestIMPESAdaptiveProblem, Variables)
+{
+    typedef Dumux::VariableClass2PGridAdapt<TypeTag> type;
+};
+
 // Enable gravity
 SET_BOOL_PROP(TestIMPESAdaptiveProblem, EnableGravity, false);
+SET_BOOL_PROP(TestIMPESAdaptiveProblem, AdaptiveGrid, true);
 
 SET_TYPE_PROP(TestIMPESAdaptiveProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
 
@@ -128,9 +135,10 @@ SET_INT_PROP(TestIMPESAdaptiveProblem, MaxIntersections, 8);
  * where the argument defines the simulation endtime.
  */
 template<class TypeTag = TTAG(TestIMPESAdaptiveProblem)>
-class TestIMPESAdaptiveProblem: public IMPESProblem2Padaptive<TypeTag>
+class TestIMPESAdaptiveProblem: public IMPESProblem2P<TypeTag>//IMPESProblem2Padaptive<TypeTag>
 {
-typedef IMPESProblem2Padaptive<TypeTag> ParentType;
+//typedef IMPESProblem2Padaptive<TypeTag> ParentType;
+typedef IMPESProblem2P<TypeTag> ParentType;
 typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
 typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
 
@@ -165,8 +173,8 @@ typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
 typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes))::PrimaryVariables PrimaryVariables;
 
 public:
-TestIMPESAdaptiveProblem(TimeManager &timeManager, Grid &grid) :
-ParentType(timeManager, grid)
+TestIMPESAdaptiveProblem(TimeManager &timeManager, const GridView &gridView) :
+ParentType(timeManager, gridView)
 {
 this->setOutputInterval(10);
 }