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

address Atgeirs comments.

Browse Source
This commit is contained in:
Robert Kloefkorn 2014-10-20 12:32:11 +02:00
parent 40d851e89f
commit 16624f6f4e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,9 @@ namespace Opm {
std::string control = param.getDefault("timestep.control", std::string("pid") ); std::string control = param.getDefault("timestep.control", std::string("pid") );
const double tol = param.getDefault("timestep.control.tol", double(1e-3) ); const double tol = param.getDefault("timestep.control.tol", double(1e-3) );
if( control == "pid" ) if( control == "pid" ) {
timeStepControl_ = TimeStepControlType( new PIDTimeStepControl( tol ) ); timeStepControl_ = TimeStepControlType( new PIDTimeStepControl( tol ) );
}
else if ( control == "pid+iteration" ) else if ( control == "pid+iteration" )
{ {
const int iterations = param.getDefault("timestep.control.targetiteration", int(25) ); const int iterations = param.getDefault("timestep.control.targetiteration", int(25) );
@ -44,8 +45,9 @@ namespace Opm {
const double time, const double timestep ) const double time, const double timestep )
{ {
// 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( last_timestep_ < 0 ) {
last_timestep_ = initial_fraction_ * timestep ; last_timestep_ = initial_fraction_ * timestep ;
}
// create adaptive step timer with previously used sub step size // create adaptive step timer with previously used sub step size
AdaptiveSimulatorTimer timer( time, time+timestep, last_timestep_ ); AdaptiveSimulatorTimer timer( time, time+timestep, last_timestep_ );
@ -85,7 +87,7 @@ namespace Opm {
// also catch linear solver not converged // also catch linear solver not converged
} }
// (linearIterations < 0 means on convergence in solver) // (linearIterations < 0 means no convergence in solver)
if( linearIterations >= 0 ) if( linearIterations >= 0 )
{ {
// advance by current dt // advance by current dt
@ -104,7 +106,7 @@ namespace Opm {
last_state = state ; last_state = state ;
last_well_state = well_state; last_well_state = well_state;
} }
else // in case of no convergence else // in case of no convergence (linearIterations < 0)
{ {
// increase restart counter // increase restart counter
if( restarts >= solver_restart_max_ ) { if( restarts >= solver_restart_max_ ) {
@ -135,8 +137,9 @@ namespace Opm {
std::cout << "Last suggested step size = " << unit::convert::to( last_timestep_, unit::day ) << " (days)" << std::endl; std::cout << "Last suggested step size = " << unit::convert::to( last_timestep_, unit::day ) << " (days)" << std::endl;
} }
if( ! std::isfinite( last_timestep_ ) ) // check for NaN if( ! std::isfinite( last_timestep_ ) ) { // check for NaN
last_timestep_ = timestep; last_timestep_ = timestep;
}
} }
} }