1p box model: make it compile with Scalar != double

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

dumux/boxmodels/1p/1plocalresidual.hh

@@ -135,7 +135,10 @@ public:
         Vector tmpVec;
         fluxVars.intrinsicPermeability().mv(fluxVars.potentialGrad(),
                                             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;
 
         const VolumeVariables &up = this->curVolVars_(fluxVars.upstreamIdx(normalFlux));
         const VolumeVariables &dn = this->curVolVars_(fluxVars.downstreamIdx(normalFlux));

dumux/boxmodels/1p/1pmodel.hh

@@ -93,14 +93,14 @@ public:
     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 *p = writer.allocateManagedBuffer (numVertices);
+        ScalarField *p = writer.allocateManagedBuffer(numVertices);
 
         unsigned numElements = this->gridView_().size(0);
-        ScalarField *rank = writer.allocateManagedBuffer (numElements);
+        ScalarField *rank = writer.allocateManagedBuffer(numElements);
 
         FVElementGeometry fvElemGeom;
         VolumeVariables volVars;