OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SimulatorReport: make it possible to report failed time steps

Browse Source 
the method can still be called as it used to be. in this case no
failures are reported, though.
This commit is contained in:
Andreas Lauser 2017-04-10 17:08:11 +02:00
parent 3b5e15771b
commit b368cb0177
2 changed files with 69 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
opm/core/simulator/SimulatorReport.cpp
View File

@ -70,23 +70,80 @@ namespace Opm
} }
} }
void SimulatorReport::reportFullyImplicit(std::ostream& os) void SimulatorReport::reportFullyImplicit(std::ostream& os, const SimulatorReport* failureReport)
{ {
if ( verbose_ ) if ( verbose_ )
{ {
os << "Total time taken (seconds): " << total_time << "\n" double t = total_time;
<< "Solver time (seconds): " << solver_time << "\n"; os << "Total time (seconds): " << t;
os << std::endl;
t = solver_time + (failureReport ? failureReport->solver_time : 0.0);
os << "Solver time (seconds): " << t;
os << std::endl;
if (assemble_time > 0.0 || linear_solve_time > 0.0) { if (assemble_time > 0.0 || linear_solve_time > 0.0) {
os << " Assembly time (seconds): " << assemble_time << "\n" t = assemble_time + (failureReport ? failureReport->assemble_time : 0.0);
<< " Linear solve time (seconds): " << linear_solve_time << "\n" os << " Assembly time (seconds): " << t;
<< " Update time (seconds): " << update_time << "\n" if (failureReport) {
<< " Output write time (seconds): " << output_write_time << "\n"; os << " (Failed: " << failureReport->assemble_time << "; "
<< 100*failureReport->assemble_time/t << "%)";
}
os << std::endl;
t = linear_solve_time + (failureReport ? failureReport->linear_solve_time : 0.0);
os << " Linear solve time (seconds): " << t;
if (failureReport) {
os << " (Failed: " << failureReport->linear_solve_time << "; "
<< 100*failureReport->linear_solve_time/t << "%)";
}
os << std::endl;
t = update_time + (failureReport ? failureReport->update_time : 0.0);
os << " Update time (seconds): " << t;
if (failureReport) {
os << " (Failed: " << failureReport->update_time << "; "
<< 100*failureReport->update_time/t << "%)";
}
os << std::endl;
t = output_write_time + (failureReport ? failureReport->output_write_time : 0.0);
os << " Output write time (seconds): " << t;
os << std::endl;
} }
os << "Overall Well Iterations: " << total_well_iterations << "\n"
<< "Overall Linearizations: " << total_linearizations << "\n" int n = total_well_iterations + (failureReport ? failureReport->total_well_iterations : 0);
<< "Overall Newton Iterations: " << total_newton_iterations << "\n" os << "Overall Well Iterations: " << n;
<< "Overall Linear Iterations: " << total_linear_iterations << "\n"; if (failureReport) {
os << " (Failed: " << failureReport->total_well_iterations << "; "
<< 100.0*failureReport->total_well_iterations/n << "%)";
}
os << std::endl;
n = total_linearizations + (failureReport ? failureReport->total_linearizations : 0);
os << "Overall Linearizations: " << n;
if (failureReport) {
os << " (Failed: " << failureReport->total_linearizations << "; "
<< 100.0*failureReport->total_linearizations/n << "%)";
}
os << std::endl;
n = total_newton_iterations + (failureReport ? failureReport->total_newton_iterations : 0);
os << "Overall Newton Iterations: " << n;
if (failureReport) {
os << " (Failed: " << failureReport->total_newton_iterations << "; "
<< 100.0*failureReport->total_newton_iterations/n << "%)";
}
os << std::endl;
n = total_linear_iterations + (failureReport ? failureReport->total_linear_iterations : 0);
os << "Overall Linear Iterations: " << n;
if (failureReport) {
os << " (Failed: " << failureReport->total_linear_iterations << "; "
<< 100.0*failureReport->total_linear_iterations/n << "%)";
}
os << std::endl;
} }
} }

2
opm/core/simulator/SimulatorReport.hpp
View File

@ -53,7 +53,7 @@ namespace Opm
/// Print a report to the given stream. /// Print a report to the given stream.
void report(std::ostream& os); void report(std::ostream& os);
/// Print a report, leaving out the transport time. /// Print a report, leaving out the transport time.
void reportFullyImplicit(std::ostream& os); void reportFullyImplicit(std::ostream& os, const SimulatorReport* failedReport = nullptr);
void reportParam(std::ostream& os); void reportParam(std::ostream& os);
private: private:
// Whether to print statistics to std::cout // Whether to print statistics to std::cout