changed reset of CFL-Timestep-Estimator

   - reset is now done directly in the transport loop to
     avoid errors

   -Reviewed by Klaus



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

dumux/decoupled/2p/transport/fv/evalcflflux.hh

@@ -114,6 +114,10 @@ public:
         return 0.0;
     }
 
+    //! reset function
+    void reset()
+    {}
+
     /*! @brief Constructs a EvalCflFlux instance */
     EvalCflFlux ()
     {}

dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh

@@ -111,6 +111,15 @@ public:
             return (getCFLFluxFunction(element) * element.geometry().volume());
     }
 
+    //! resets the accumulated CFL-fluxes to zero
+    void reset()
+    {
+        fluxWettingOut_ = 0;
+        fluxNonwettingOut_ = 0;
+        fluxIn_ = 0;
+        fluxOut_ = 0;
+    }
+
     /*! \brief Constructs an EvalCflFluxDefault object
      *
      * \param problem A problem type object
@@ -209,19 +218,6 @@ private:
             return fluxOut_;
     }
 
-
-protected:
-
-    //! resets the accumulated CFL-fluxes to zero
-    void reset()
-    {
-        fluxWettingOut_ = 0;
-        fluxNonwettingOut_ = 0;
-        fluxIn_ = 0;
-        fluxOut_ = 0;
-    }
-
-private:
     Problem& problem_;//problem data
     Scalar fluxWettingOut_;
     Scalar fluxNonwettingOut_;
@@ -273,8 +269,6 @@ typename EvalCflFluxDefault<TypeTag>::Scalar EvalCflFluxDefault<TypeTag>::getCFL
     //determine timestep
     Scalar cFLFluxFunction = std::min(cFLFluxIn, cFLFluxOut);
 
-    reset();
-
     return cFLFluxFunction;
 }
 

dumux/decoupled/common/fv/fvtransport.hh

@@ -244,6 +244,8 @@ void FVTransport<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolutionT
         CellData& cellDataI = problem_.variables().cellData(globalIdxI);
 
         Scalar update = 0;
+        evalCflFluxFunction().reset();
+
         // run through all intersections with neighbors and boundary
         IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
         for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)