richards: make it compile with Scalar != double

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

dumux/boxmodels/richards/richardslocalresidual.hh

@@ -132,7 +132,10 @@ public:
         Vector tmpVec;
         fluxVars.intrinsicPermeability().mv(fluxVars.potentialGradW(),
                                             tmpVec);
-        Scalar normalFlux = - (tmpVec*fluxVars.face().normal);
+        Scalar normalFlux = 0;
+        for (int i = 0; i < Vector::size; ++ i)
+             normalFlux += tmpVec[i] + fluxVars.face().normal[i];
+        normalFlux *= -1;
 
         // data attached to upstream and the downstream vertices
         // of the current phase

dumux/boxmodels/richards/richardsmodel.hh

@@ -150,21 +150,21 @@ public:
     template <class MultiWriter>
     void addOutputVtkFields(const SolutionVector &sol, MultiWriter &writer)
     {
-        typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField;
+        typedef Dune::BlockVector<Dune::FieldVector<double, 1> > ScalarField;
 
         // create the required scalar fields
         unsigned numVertices = this->problem_().gridView().size(dim);
-        ScalarField *pW = writer.allocateManagedBuffer (numVertices);
-        ScalarField *pN = writer.allocateManagedBuffer (numVertices);
-        ScalarField *pC = writer.allocateManagedBuffer (numVertices);
-        ScalarField *Sw = writer.allocateManagedBuffer (numVertices);
-        ScalarField *Sn = writer.allocateManagedBuffer (numVertices);
-        ScalarField *rhoW = writer.allocateManagedBuffer (numVertices);
-        ScalarField *rhoN = writer.allocateManagedBuffer (numVertices);
-        ScalarField *mobW = writer.allocateManagedBuffer (numVertices);
-        ScalarField *mobN = writer.allocateManagedBuffer (numVertices);
-        ScalarField *poro = writer.allocateManagedBuffer (numVertices);
-        ScalarField *Te = writer.allocateManagedBuffer (numVertices);
+        ScalarField *pW = writer.allocateManagedBuffer(numVertices);
+        ScalarField *pN = writer.allocateManagedBuffer(numVertices);
+        ScalarField *pC = writer.allocateManagedBuffer(numVertices);
+        ScalarField *Sw = writer.allocateManagedBuffer(numVertices);
+        ScalarField *Sn = writer.allocateManagedBuffer(numVertices);
+        ScalarField *rhoW = writer.allocateManagedBuffer(numVertices);
+        ScalarField *rhoN = writer.allocateManagedBuffer(numVertices);
+        ScalarField *mobW = writer.allocateManagedBuffer(numVertices);
+        ScalarField *mobN = writer.allocateManagedBuffer(numVertices);
+        ScalarField *poro = writer.allocateManagedBuffer(numVertices);
+        ScalarField *Te = writer.allocateManagedBuffer(numVertices);
 
         unsigned numElements = this->gridView_().size(0);
         ScalarField *rank =

dumux/boxmodels/richards/richardsnewtoncontroller.hh

@@ -102,7 +102,7 @@ public:
                     Scalar pN = std::max(this->problem_().referencePressure(*eIt, fvElemGeom, i),
                                          pW + pcMin);
                     Scalar pcOld = pN - pW;
-                    Scalar SwOld = std::max(0.0, MaterialLaw::Sw(mp, pcOld));
+                    Scalar SwOld = std::max<Scalar>(0.0, MaterialLaw::Sw(mp, pcOld));
 
                     // convert into minimum and maximum wetting phase
                     // pressures