OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1052 from andlaus/pass_timer_instead_of_dt

Browse Source 
pass the timer object instead of the time step size to the simulators
This commit is contained in:
Atgeirr Flø Rasmussen 2016-08-02 11:05:33 +02:00 committed by GitHub
commit a6f08d13d5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/core/simulator/AdaptiveTimeStepping_impl.hpp
View File

@ -26,6 +26,7 @@
#include <opm/core/simulator/SimulatorTimer.hpp> #include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/simulator/AdaptiveSimulatorTimer.hpp> #include <opm/core/simulator/AdaptiveSimulatorTimer.hpp>
#include <opm/core/simulator/TimeStepControl.hpp> #include <opm/core/simulator/TimeStepControl.hpp>
#include <opm/common/Exceptions.hpp>
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <dune/istl/istlexception.hh> #include <dune/istl/istlexception.hh>
#include <dune/istl/ilu.hh> // For MatrixBlockException #include <dune/istl/ilu.hh> // For MatrixBlockException
@ -165,7 +166,7 @@ namespace Opm {
int linearIterations = -1; int linearIterations = -1;
try { try {
// (linearIterations < 0 means on convergence in solver) // (linearIterations < 0 means on convergence in solver)
linearIterations = solver.step( dt, state, well_state); linearIterations = solver.step( substepTimer, state, well_state);
if( solver_verbose_ ) { if( solver_verbose_ ) {
// report number of linear iterations // report number of linear iterations