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

Added one more decimal for hundreds of a second.

Browse Source
This commit is contained in:
Alf Birger Rustad
2020-10-02 15:13:41 +02:00
parent 3832be4f28
commit 885c182b7e
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/flow/FlowMainEbos.hpp
View File

@@ -592,13 +592,13 @@ namespace Opm
if (this->output_cout_) { if (this->output_cout_) {
std::ostringstream ss; std::ostringstream ss;
ss << "\n\n================ End of simulation ===============\n\n"; ss << "\n\n================ End of simulation ===============\n\n";
ss << fmt::format("Number of MPI processes {:11}\n", mpi_size_ ); ss << fmt::format("Number of MPI processes: {:9}\n", mpi_size_ );
#if _OPENMP #if _OPENMP
int threads = omp_get_max_threads(); int threads = omp_get_max_threads();
#else #else
int threads = 1; int threads = 1;
#endif #endif
ss << fmt::format("Threads per MPI process: {:10}\n", threads); ss << fmt::format("Threads per MPI process: {:9}\n", threads);
report.reportFullyImplicit(ss); report.reportFullyImplicit(ss);
OpmLog::info(ss.str()); OpmLog::info(ss.str());
const std::string dir = eclState().getIOConfig().getOutputDir(); const std::string dir = eclState().getIOConfig().getOutputDir();

28
opm/simulators/timestepping/SimulatorReport.cpp
View File

@@ -95,7 +95,7 @@ namespace Opm
if (assemble_time > 0.0 || linear_solve_time > 0.0) { if (assemble_time > 0.0 || linear_solve_time > 0.0) {
double t = assemble_time + (failureReport ? failureReport->assemble_time : 0.0); double t = assemble_time + (failureReport ? failureReport->assemble_time : 0.0);
os << fmt::format(" Assembly time (seconds): {:8.1f}", t); os << fmt::format(" Assembly time (seconds): {:9.2f}", t);
if (failureReport) { if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)", os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
@@ -105,7 +105,7 @@ namespace Opm
os << std::endl; os << std::endl;
t = assemble_time_well + (failureReport ? failureReport->assemble_time_well : 0.0); t = assemble_time_well + (failureReport ? failureReport->assemble_time_well : 0.0);
os << fmt::format(" Well assembly (seconds): {:6.1f}", t); os << fmt::format(" Well assembly (seconds): {:7.2f}", t);
if (failureReport) { if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)", os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
failureReport->assemble_time_well, failureReport->assemble_time_well,
@@ -114,7 +114,7 @@ namespace Opm
os << std::endl; os << std::endl;
t = linear_solve_time + (failureReport ? failureReport->linear_solve_time : 0.0); t = linear_solve_time + (failureReport ? failureReport->linear_solve_time : 0.0);
os << fmt::format(" Linear solve time (seconds):{:7.1f}", t); os << fmt::format(" Linear solve time (seconds):{:8.2f}", t);
if (failureReport) { if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)", os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
failureReport->linear_solve_time, failureReport->linear_solve_time,
@@ -123,7 +123,7 @@ namespace Opm
os << std::endl; os << std::endl;
t = linear_solve_setup_time + (failureReport ? failureReport->linear_solve_setup_time : 0.0); t = linear_solve_setup_time + (failureReport ? failureReport->linear_solve_setup_time : 0.0);
os << fmt::format(" Linear setup (seconds): {:6.1f}", t); os << fmt::format(" Linear setup (seconds): {:7.2f}", t);
if (failureReport) { if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)", os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
failureReport->linear_solve_setup_time, failureReport->linear_solve_setup_time,
@@ -132,7 +132,7 @@ namespace Opm
os << std::endl; os << std::endl;
t = update_time + (failureReport ? failureReport->update_time : 0.0); t = update_time + (failureReport ? failureReport->update_time : 0.0);
os << fmt::format(" Update time (seconds): {:6.1f}", t); os << fmt::format(" Update time (seconds): {:7.2f}", t);
if (failureReport) { if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)", os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
failureReport->update_time, failureReport->update_time,
@@ -140,7 +140,7 @@ namespace Opm
} }
os << std::endl; os << std::endl;
os << fmt::format(" Output write time (seconds): {:6.1f}", os << fmt::format(" Output write time (seconds): {:7.2f}",
output_write_time + (failureReport ? failureReport->output_write_time : 0.0)); output_write_time + (failureReport ? failureReport->output_write_time : 0.0));
os << std::endl; os << std::endl;
@@ -148,36 +148,36 @@ namespace Opm
int n = total_well_iterations + (failureReport ? failureReport->total_well_iterations : 0); int n = total_well_iterations + (failureReport ? failureReport->total_well_iterations : 0);
os << fmt::format("Overall Well Iterations: {:6}", n); os << fmt::format("Overall Well Iterations: {:7}", n);
if (failureReport) { if (failureReport) {
os << fmt::format(" (Failed: {:3}; {:2.1f}%)", os << fmt::format(" (Failed: {:3}; {:2.1f}%)",
failureReport->total_well_iterations, failureReport->total_well_iterations,
100.0*failureReport->total_well_iterations/n); 100.0*failureReport->total_well_iterations/n);
} }
os << std::endl; os << std::endl;
n = total_linearizations + (failureReport ? failureReport->total_linearizations : 0); n = total_linearizations + (failureReport ? failureReport->total_linearizations : 0);
os << fmt::format("Overall Linearizations: {:6}", n); os << fmt::format("Overall Linearizations: {:7}", n);
if (failureReport) { if (failureReport) {
os << fmt::format(" (Failed: {:3}; {:2.1f}%)", os << fmt::format(" (Failed: {:3}; {:2.1f}%)",
failureReport->total_linearizations, failureReport->total_linearizations,
100.0*failureReport->total_linearizations/n); 100.0*failureReport->total_linearizations/n);
} }
os << std::endl; os << std::endl;
n = total_newton_iterations + (failureReport ? failureReport->total_newton_iterations : 0); n = total_newton_iterations + (failureReport ? failureReport->total_newton_iterations : 0);
os << fmt::format("Overall Newton Iterations: {:6}", n); os << fmt::format("Overall Newton Iterations: {:7}", n);
if (failureReport) { if (failureReport) {
os << fmt::format(" (Failed: {:3}; {:2.1f}%)", os << fmt::format(" (Failed: {:3}; {:2.1f}%)",
failureReport->total_newton_iterations, failureReport->total_newton_iterations,
100.0*failureReport->total_newton_iterations/n); 100.0*failureReport->total_newton_iterations/n);
} }
os << std::endl; os << std::endl;
n = total_linear_iterations + (failureReport ? failureReport->total_linear_iterations : 0); n = total_linear_iterations + (failureReport ? failureReport->total_linear_iterations : 0);
os << fmt::format("Overall Linear Iterations: {:6}", n); os << fmt::format("Overall Linear Iterations: {:7}", n);
if (failureReport) { if (failureReport) {
os << fmt::format(" (Failed: {:3}; {:2.1f}%)", os << fmt::format(" (Failed: {:3}; {:2.1f}%)",
failureReport->total_linear_iterations, failureReport->total_linear_iterations,
100.0*failureReport->total_linear_iterations/n); 100.0*failureReport->total_linear_iterations/n);
} }