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

output timer messages for terminal and log file.

Browse Source
This commit is contained in:
Liu Ming 2016-05-09 13:31:04 +08:00
parent cabfffe25d
commit 40dbcc496a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
opm/simulators/timestepping/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/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
@ -149,15 +150,15 @@ namespace Opm {
int restarts = 0; int restarts = 0;
// sub step time loop // sub step time loop
std::ostringstream ss;
while( ! substepTimer.done() ) while( ! substepTimer.done() )
{ {
// get current delta t // get current delta t
const double dt = substepTimer.currentStepLength() ; const double dt = substepTimer.currentStepLength() ;
if( timestep_verbose_ ) if( timestep_verbose_ )
{ {
std::cout <<"Substep( " << substepTimer.currentStepNum() << " ), try with stepsize " ss <<"Substep( " << substepTimer.currentStepNum() << " ), try with stepsize "
<< unit::convert::to(substepTimer.currentStepLength(), unit::day) << " (days)." << std::endl; << unit::convert::to(substepTimer.currentStepLength(), unit::day) << " (days)." << std::endl;
} }
int linearIterations = -1; int linearIterations = -1;
@ -167,7 +168,7 @@ namespace Opm {
if( solver_verbose_ ) { if( solver_verbose_ ) {
// report number of linear iterations // report number of linear iterations
std::cout << "Overall linear iterations used: " << linearIterations << std::endl; ss << "Overall linear iterations used: " << linearIterations << std::endl;
} }
} }
catch (const Opm::NumericalProblem& e) { catch (const Opm::NumericalProblem& e) {
@ -213,7 +214,7 @@ namespace Opm {
if( timestep_verbose_ ) if( timestep_verbose_ )
{ {
std::cout << "Substep( " << substepTimer.currentStepNum()-1 // it was already advanced by ++ ss << "Substep( " << substepTimer.currentStepNum()-1 // it was already advanced by ++
<< " ) finished at time " << unit::convert::to(substepTimer.simulationTimeElapsed(),unit::day) << " (days)." << std::endl << std::endl; << " ) finished at time " << unit::convert::to(substepTimer.simulationTimeElapsed(),unit::day) << " (days)." << std::endl << std::endl;
} }
@ -258,13 +259,15 @@ namespace Opm {
suggested_next_timestep_ = substepTimer.currentStepLength(); suggested_next_timestep_ = substepTimer.currentStepLength();
if( timestep_verbose_ ) if( timestep_verbose_ )
{ {
substepTimer.report( std::cout ); substepTimer.report(ss);
std::cout << "Suggested next step size = " << unit::convert::to( suggested_next_timestep_, unit::day ) << " (days)" << std::endl; ss << "Suggested next step size = " << unit::convert::to( suggested_next_timestep_, unit::day ) << " (days)" << std::endl;
} }
if( ! std::isfinite( suggested_next_timestep_ ) ) { // check for NaN if( ! std::isfinite( suggested_next_timestep_ ) ) { // check for NaN
suggested_next_timestep_ = timestep; suggested_next_timestep_ = timestep;
} }
std::cout << ss.str();
OpmLog::info(ss.str());
} }
} }