Merge pull request #843 from totto82/start_using_TUNING

Add an option for using values from TUNING in the timestepping.
This commit is contained in:
Atgeirr Flø Rasmussen 2016-09-30 13:03:07 +02:00 committed by GitHub
commit 4c0b21d2f8

View File

@ -111,7 +111,12 @@ namespace Opm
std::unique_ptr< AdaptiveTimeStepping > adaptiveTimeStepping;
if( param_.getDefault("timestep.adaptive", true ) )
{
adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, terminal_output_ ) );
if (param_.getDefault("use_TUNING", false)) {
adaptiveTimeStepping.reset( new AdaptiveTimeStepping( *schedule->getTuning(), timer.currentStepNum(), param_, terminal_output_ ) );
} else {
adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, terminal_output_ ) );
}
}
std::string restorefilename = param_.getDefault("restorefile", std::string("") );