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

Merge pull request #1126 from atgeirr/refined-output

Browse Source 
Refined output to terminal and log
This commit is contained in:
Atgeirr Flø Rasmussen
2017-04-06 22:17:34 +02:00
committed by GitHub
parent c851d18144 6f9fcdf7a5
commit 289b24689f
6 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/NonlinearSolver_impl.hpp
View File

@@ -150,13 +150,11 @@ namespace Opm
} while ( (!converged && (iteration <= maxIter())) || (iteration <= minIter()));
if (!converged) {
std::string msg = "Failed to complete a time step within " + std::to_string(maxIter()) + " iterations.";
if (model_->terminalOutputEnabled()) {
OPM_THROW(Opm::NumericalProblem, "Failed to complete a time step within "+std::to_string(maxIter())+" iterations.");
}
else
{
OPM_THROW_NOLOG(Opm::NumericalProblem, "Failed to complete a time step within "+std::to_string(maxIter())+" iterations.");
OpmLog::problem(msg);
}
OPM_THROW_NOLOG(Opm::NumericalProblem, msg);
}
// Do model-specific post-step actions.

5
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@@ -324,8 +324,9 @@ public:
events.hasEvent(ScheduleEvents::PRODUCTION_UPDATE, timer.currentStepNum()) ||
events.hasEvent(ScheduleEvents::INJECTION_UPDATE, timer.currentStepNum()) ||
events.hasEvent(ScheduleEvents::WELL_STATUS_CHANGE, timer.currentStepNum());
report += adaptiveTimeStepping->step( timer, *solver, state, well_state, event, output_writer_,
stepReport = adaptiveTimeStepping->step( timer, *solver, state, well_state, event, output_writer_,
output_writer_.requireFIPNUM() ? &fipnum : nullptr );
report += stepReport;
}
else {
// solve for complete report step
@@ -384,7 +385,7 @@ public:
std::string msg;
msg =
"Time step took " + std::to_string(stepReport.solver_time) + " seconds; "
"Time step took " + std::to_string(solver_timer.secsSinceStart()) + " seconds; "
"total solver time " + std::to_string(report.solver_time) + " seconds.";
OpmLog::note(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