[efm][mhs][mm] Adapt to changes in same branch in dumux

* reference solution for box and cc changed after correcting liquidDensity function in commit 9757ac83

lecture/efm/1p2cvs2p/lens1p2cproblem.hh

@@ -27,7 +27,7 @@
 
 #include <dumux/porousmediumflow/1p2c/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/material/fluidsystems/h2on2liquidphase.hh>
+#include <dumux/material/fluidsystems/h2on2.hh>
 
 #include "../1p2c_2p_2p2c/lens1p2cspatialparams.hh"
 
@@ -51,7 +51,7 @@ SET_TYPE_PROP(LensOnePTwoCProblem, Grid, Dune::YaspGrid<2>);
 SET_TYPE_PROP(LensOnePTwoCProblem, Problem, Dumux::LensOnePTwoCProblem<TypeTag>);
 
 // set fluid system
-SET_TYPE_PROP(LensOnePTwoCProblem, FluidSystem, Dumux::H2ON2LiquidPhaseFluidSystem<TypeTag>);
+SET_TYPE_PROP(LensOnePTwoCProblem, FluidSystem, Dumux::H2ON2FluidSystem<TypeTag>);
 
 // Set the spatial parameters
 SET_TYPE_PROP(LensOnePTwoCProblem, SpatialParams, Dumux::Lens1p2cSpatialParams<TypeTag>);

lecture/mhs/groundwater/groundwaterproblem.hh

@@ -242,7 +242,7 @@ public:
     void source(PrimaryVariables& values, const Element& element) const
     {
         values = 0;
-        Scalar density=Fluid::density(0,0);
+        Scalar density=Fluid::density(0.0,0.0);
         for (unsigned int sourceCount = 0; sourceCount != sources_.size(); sourceCount++)
         {
             if (this->variables().index(element) == sources_[sourceCount].index)
@@ -340,7 +340,7 @@ public:
             if ((boundaryConditions_[boundaryIndex][segmentCount].from < coordinate) &&
                     (coordinate < boundaryConditions_[boundaryIndex][segmentCount].to))
             {
-                values = boundaryConditions_[boundaryIndex][segmentCount].value*Fluid::density(0,0)*9.81;
+                values = boundaryConditions_[boundaryIndex][segmentCount].value*Fluid::density(0.0,0.0)*9.81;
                 return;
             }
         }
@@ -384,7 +384,7 @@ public:
             if ((boundaryConditions_[boundaryIndex][segmentCount].from < coordinate) &&
                     (coordinate < boundaryConditions_[boundaryIndex][segmentCount].to))
             {
-                values = boundaryConditions_[boundaryIndex][segmentCount].value*Fluid::density(0,0)*(-1);
+                values = boundaryConditions_[boundaryIndex][segmentCount].value*Fluid::density(0.0,0.0)*(-1);
                 return;
             }
         }
@@ -400,12 +400,12 @@ public:
     {
         ParentType::writeOutput();
         Scalar zmax, zmin;
-        zmax=this->variables().cellData(0).pressure()/(Fluid::density(0,0)*9.81);
-        zmin=this->variables().cellData(0).pressure()/(Fluid::density(0,0)*9.81);
+        zmax=this->variables().cellData(0).pressure()/(Fluid::density(0.0,0.0)*9.81);
+        zmin=this->variables().cellData(0).pressure()/(Fluid::density(0.0,0.0)*9.81);
 
         for (int i = 0; i < numCells_[0]*numCells_[1]; i++)
         {
-            Scalar currentHead= this->variables().cellData(i).pressure()/(Fluid::density(0,0)*9.81);
+            Scalar currentHead= this->variables().cellData(i).pressure()/(Fluid::density(0.0,0.0)*9.81);
             zmax = std::max(currentHead,zmax);
             zmin = std::min(currentHead,zmin);
         }
@@ -433,7 +433,7 @@ public:
             for (int j = 0; j < numCells_[0]; j++)
             {
                 int currentIdx = i*numCells_[0]+j;
-                dataFile << this->variables().cellData(currentIdx).pressure()/(Fluid::density(0,0)*9.81);
+                dataFile << this->variables().cellData(currentIdx).pressure()/(Fluid::density(0.0,0.0)*9.81);
                 if(j != numCells_[0]-1) // all but last entry
                     dataFile << " ";
                 else // write the last entry
@@ -460,7 +460,7 @@ public:
             if (std::abs(v_x) < 1e-17) v_x = 0;
             if (std::abs(v_y) < 1e-17) v_y = 0;
 
-            piezo = cellData.pressure()/(Fluid::density(0,0)*9.81);
+            piezo = cellData.pressure()/(Fluid::density(0.0,0.0)*9.81);
             x = element.geometry().center()[0];
             y = element.geometry().center()[1];
 

lecture/mm/co2plume/co2plumeshapespatialparameters.hh

@@ -73,9 +73,7 @@ class PlumeShapeSpatialParams : public ImplicitSpatialParams<TypeTag>
 
     enum {
         dim=GridView::dimension,
-        dimWorld=GridView::dimensionworld,
-
-        lPhaseIdx = FluidSystem::lPhaseIdx
+        dimWorld=GridView::dimensionworld
     };
 
     typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;