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

AdaptiveTimeStepping: pass variable terminal output to avoid multiple outputs in

Browse Source 
parallel.
This commit is contained in:
Robert Kloefkorn
2015-09-16 14:33:35 +02:00
parent 6d28f19009
commit 8c93936fd5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,8 @@ namespace Opm {
//! \param pinfo The information about the data distribution //! \param pinfo The information about the data distribution
//! and communication for a parallel run. //! and communication for a parallel run.
AdaptiveTimeStepping( const parameter::ParameterGroup& param, AdaptiveTimeStepping( const parameter::ParameterGroup& param,
const boost::any& pinfo=boost::any() ); const boost::any& pinfo=boost::any(),
const bool terminal_output = true );
/** \brief step method that acts like the solver::step method /** \brief step method that acts like the solver::step method
in a sub cycle of time steps in a sub cycle of time steps

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

@@ -35,7 +35,8 @@ namespace Opm {
//--------------------- //---------------------
AdaptiveTimeStepping::AdaptiveTimeStepping( const parameter::ParameterGroup& param, AdaptiveTimeStepping::AdaptiveTimeStepping( const parameter::ParameterGroup& param,
const boost::any& parallel_information ) const boost::any& parallel_information,
const bool terminal_output )
: timeStepControl_() : timeStepControl_()
, restart_factor_( param.getDefault("solver.restartfactor", double(0.33) ) ) , restart_factor_( param.getDefault("solver.restartfactor", double(0.33) ) )
, growth_factor_( param.getDefault("solver.growthfactor", double(2) ) ) , growth_factor_( param.getDefault("solver.growthfactor", double(2) ) )
@@ -44,7 +45,7 @@ namespace Opm {
, max_time_step_( unit::convert::from(param.getDefault("timestep.max_timestep_in_days", 365.0 ), unit::day) ) , max_time_step_( unit::convert::from(param.getDefault("timestep.max_timestep_in_days", 365.0 ), unit::day) )
, 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) ) && terminal_output )
, suggested_next_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) ) )
{ {