OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 18:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor output bug and refine output.

Browse Source 
Previously the substep summary reports were cumulative, misleading the user.
Also, made output a little more compact and readable, ensuring numbers line up
unless unusually many digits are needed for times and iteration counts.
This commit is contained in:
Atgeirr Flø Rasmussen 2017-04-06 14:54:08 +02:00
parent e325dcd04b
commit 98debed741
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -309,7 +309,7 @@ namespace Opm {
current_relaxation_ -= nonlinear_solver.relaxIncrement();
current_relaxation_ = std::max(current_relaxation_, nonlinear_solver.relaxMax());
if (terminalOutputEnabled()) {
std::string msg = " Oscillating behavior detected: Relaxation set to "
std::string msg = " Oscillating behavior detected: Relaxation set to "
+ std::to_string(current_relaxation_);
OpmLog::info(msg);
}

2
opm/simulators/WellSwitchingLogger.cpp
View File

@ -140,7 +140,7 @@ void WellSwitchingLogger::logSwitch(const char* name, std::array<char,2> fromto,
ss << " Switching control mode for well " << name
<< " from " << modestring[WellControlType(fromto[0])]
<< " to " << modestring[WellControlType(fromto[1])]
<< " on rank " << rank << std::endl;
<< " on rank " << rank;
OpmLog::info(ss.str());
}
#endif

2
opm/simulators/WellSwitchingLogger.hpp
View File

@ -76,7 +76,7 @@ public:
std::ostringstream ss;
ss << " Switching control mode for well " << name
<< " from " << modestring[from]
<< " to " << modestring[to] << std::endl;
<< " to " << modestring[to];
OpmLog::info(ss.str());
}
}

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

@ -283,14 +283,14 @@ namespace Opm {
{
std::ostringstream ss;
ss << " Substep summary: ";
if (report.total_well_iterations != 0) {
ss << "well iterations = " << report.total_well_iterations << ", ";
if (substepReport.total_well_iterations != 0) {
ss << "well its = " << std::setw(2) << substepReport.total_well_iterations << ", ";
}
ss << "newton iterations = " << report.total_newton_iterations << ", "
<< "linearizations = " << report.total_linearizations
<< " (" << report.assemble_time << " sec), "
<< "linear iterations = " << report.total_linear_iterations
<< " (" << report.linear_solve_time << " sec)";
ss << "newton its = " << std::setw(2) << substepReport.total_newton_iterations << ", "
<< "linearizations = " << std::setw(2) << substepReport.total_linearizations
<< " (" << std::fixed << std::setprecision(3) << std::setw(6) << substepReport.assemble_time << " sec), "
<< "linear its = " << std::setw(3) << substepReport.total_linear_iterations
<< " (" << std::fixed << std::setprecision(3) << std::setw(6) << substepReport.linear_solve_time << " sec)";
OpmLog::info(ss.str());
}
@ -327,8 +327,8 @@ namespace Opm {
substepTimer.setLastStepFailed(true);
// increase restart counter
if( restarts >= solver_restart_max_ ) {
const auto msg = std::string("Solver failed to converge after ")
+ std::to_string(restarts) + " restarts.";
const auto msg = std::string("Solver failed to converge after cutting timestep ")
+ std::to_string(restarts) + " times.";
if (solver_verbose_) {
OpmLog::error(msg);
}
@ -340,8 +340,8 @@ namespace Opm {
substepTimer.provideTimeStepEstimate( newTimeStep );
if( solver_verbose_ ) {
std::string msg;
msg = "Solver convergence failed, restarting solver with new time step ("
+ std::to_string(unit::convert::to( newTimeStep, unit::day )) + " days).\n";
msg = "Solver convergence failed, cutting timestep to "
+ std::to_string(unit::convert::to( newTimeStep, unit::day )) + " days.\n";
OpmLog::problem(msg);
}
// reset states