- adjust OutputWriter to SimulatorTimerInterface

- remove WriterTimer from EclipseWriter and use SimulatorTimerInterface
- adjust to the above in AdaptiveTimeStepping.

opm/simulators/timestepping/AdaptiveTimeStepping.hpp

@@ -1,3 +1,21 @@
+/*
+  Copyright 2014 IRIS AS
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #ifndef OPM_SUBSTEPPING_HEADER_INCLUDED
 #define OPM_SUBSTEPPING_HEADER_INCLUDED
 
@@ -21,19 +39,6 @@ namespace Opm {
         //! \brief contructor taking parameter object
         AdaptiveTimeStepping( const parameter::ParameterGroup& param );
 
-        /** \brief  step method that acts like the solver::step method
-                    in a sub cycle of time steps
-
-            \param  solver      solver object that must implement a method step( dt, state, well_state )
-            \param  state       current state of the solution variables
-            \param  well_state  additional well state object
-            \param  time        current simulation time
-            \param  timestep    current time step length that is to be sub cycled
-        */
-        template <class Solver, class State, class WellState>
-        void step( Solver& solver, State& state, WellState& well_state,
-                   const double time, const double timestep );
-
         /** \brief  step method that acts like the solver::step method
                     in a sub cycle of time steps
 
@@ -62,9 +67,9 @@ namespace Opm {
 
     protected:
         template <class Solver, class State, class WellState>
-        void stepImpl( Solver& solver, State& state, WellState& well_state,
-                       const double time, const double timestep,
-                       const SimulatorTimer* timer, OutputWriter* outputWriter);
+        void stepImpl( const SimulatorTimer& timer,
+                       Solver& solver, State& state, WellState& well_state,
+                       OutputWriter* outputWriter);
 
         typedef std::unique_ptr< TimeStepControlInterface > TimeStepControlType;