OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename last_timestep_ to suggested_next_timestep_

Browse Source
This commit is contained in:
Tor Harald Sandve 2015-08-25 11:16:36 +02:00
parent 81b8b631a6
commit 0227165bd5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/timestepping/AdaptiveTimeStepping.hpp
View File

@ -86,7 +86,7 @@ namespace Opm {
const int solver_restart_max_; //!< how many restart of solver are allowed const int solver_restart_max_; //!< how many restart of solver are allowed
const bool solver_verbose_; //!< solver verbosity const bool solver_verbose_; //!< solver verbosity
const bool timestep_verbose_; //!< timestep verbosity const bool timestep_verbose_; //!< timestep verbosity
double last_timestep_; //!< size of last timestep double suggested_next_timestep_; //!< suggested size of next timestep
bool full_timestep_initially_; //!< beginning with the size of the time step from data file bool full_timestep_initially_; //!< beginning with the size of the time step from data file
}; };
} }

18
opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
View File

@ -44,7 +44,7 @@ namespace Opm {
, solver_restart_max_( param.getDefault("solver.restart", int(10) ) ) , solver_restart_max_( param.getDefault("solver.restart", int(10) ) )
, solver_verbose_( param.getDefault("solver.verbose", bool(true) ) ) , solver_verbose_( param.getDefault("solver.verbose", bool(true) ) )
, timestep_verbose_( param.getDefault("timestep.verbose", bool(true) ) ) , timestep_verbose_( param.getDefault("timestep.verbose", bool(true) ) )
, last_timestep_( -1.0 ) , suggested_next_timestep_( -1.0 )
, full_timestep_initially_( param.getDefault("full_timestep_initially", bool(false) ) ) , full_timestep_initially_( param.getDefault("full_timestep_initially", bool(false) ) )
{ {
// valid are "pid" and "pid+iteration" // valid are "pid" and "pid+iteration"
@ -102,19 +102,19 @@ namespace Opm {
const double timestep = simulatorTimer.currentStepLength(); const double timestep = simulatorTimer.currentStepLength();
// init last time step as a fraction of the given time step // init last time step as a fraction of the given time step
if( last_timestep_ < 0 ) { if( suggested_next_timestep_ < 0 ) {
last_timestep_ = restart_factor_ * timestep; suggested_next_timestep_ = restart_factor_ * timestep;
} }
if (full_timestep_initially_) { if (full_timestep_initially_) {
last_timestep_ = timestep; suggested_next_timestep_ = timestep;
} }
// TODO // TODO
// take change in well state into account // take change in well state into account
// create adaptive step timer with previously used sub step size // create adaptive step timer with previously used sub step size
AdaptiveSimulatorTimer substepTimer( simulatorTimer, last_timestep_, max_time_step_ ); AdaptiveSimulatorTimer substepTimer( simulatorTimer, suggested_next_timestep_, max_time_step_ );
// copy states in case solver has to be restarted (to be revised) // copy states in case solver has to be restarted (to be revised)
State last_state( state ); State last_state( state );
@ -226,15 +226,15 @@ namespace Opm {
// store estimated time step for next reportStep // store estimated time step for next reportStep
last_timestep_ = substepTimer.currentStepLength(); suggested_next_timestep_ = substepTimer.currentStepLength();
if( timestep_verbose_ ) if( timestep_verbose_ )
{ {
substepTimer.report( std::cout ); substepTimer.report( std::cout );
std::cout << "Suggested next step size = " << unit::convert::to( last_timestep_, unit::day ) << " (days)" << std::endl; std::cout << "Suggested next step size = " << unit::convert::to( suggested_next_timestep_, unit::day ) << " (days)" << std::endl;
} }
if( ! std::isfinite( last_timestep_ ) ) { // check for NaN if( ! std::isfinite( suggested_next_timestep_ ) ) { // check for NaN
last_timestep_ = timestep; suggested_next_timestep_ = timestep;
} }
} }
} }