Minor improvements to timing report.

- Using the term Wasted instead of Failed.
 - Making all indents two spaces.
 - Allowing one more digit for linear solver timing output.
This commit is contained in:
Atgeirr Flø Rasmussen 2024-02-09 14:50:21 +01:00
parent 6b72b7fa42
commit d78288a401

View File

@ -114,68 +114,68 @@ namespace Opm
return decltype(val){1};
return val;
};
os << fmt::format("Total time (seconds): {:9.2f} \n", total_time);
os << fmt::format("Total time (sec): {:9.2f} \n", total_time);
os << fmt::format("Solver time (seconds): {:9.2f} \n",
os << fmt::format("Solver time (sec): {:9.2f} \n",
solver_time + (failureReport ? failureReport->solver_time : 0.0));
if (assemble_time > 0.0 || linear_solve_time > 0.0) {
double t = assemble_time + (failureReport ? failureReport->assemble_time : 0.0);
os << fmt::format(" Assembly time (seconds): {:9.2f}", t);
os << fmt::format(" Assembly time (sec): {:9.2f}", t);
if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
os << fmt::format(" (Wasted: {:2.1f}; {:2.1f}%)",
failureReport->assemble_time,
100*failureReport->assemble_time/noZero(t));
}
os << std::endl;
t = assemble_time_well + (failureReport ? failureReport->assemble_time_well : 0.0);
os << fmt::format(" Well assembly (seconds): {:7.2f}", t);
os << fmt::format(" Well assembly (sec): {:7.2f}", t);
if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
os << fmt::format(" (Wasted: {:2.1f}; {:2.1f}%)",
failureReport->assemble_time_well,
100*failureReport->assemble_time_well/noZero(t));
}
os << std::endl;
t = linear_solve_time + (failureReport ? failureReport->linear_solve_time : 0.0);
os << fmt::format(" Linear solve time (seconds):{:8.2f}", t);
os << fmt::format(" Linear solve time (sec): {:9.2f}", t);
if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
os << fmt::format(" (Wasted: {:2.1f}; {:2.1f}%)",
failureReport->linear_solve_time,
100*failureReport->linear_solve_time/noZero(t));
}
os << std::endl;
t = linear_solve_setup_time + (failureReport ? failureReport->linear_solve_setup_time : 0.0);
os << fmt::format(" Linear setup (seconds): {:7.2f}", t);
os << fmt::format(" Linear setup (sec): {:7.2f}", t);
if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
os << fmt::format(" (Wasted: {:2.1f}; {:2.1f}%)",
failureReport->linear_solve_setup_time,
100*failureReport->linear_solve_setup_time/noZero(t));
}
os << std::endl;
t = update_time + (failureReport ? failureReport->update_time : 0.0);
os << fmt::format(" Update time (seconds): {:7.2f}", t);
os << fmt::format(" Update time (sec): {:7.2f}", t);
if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
os << fmt::format(" (Wasted: {:2.1f}; {:2.1f}%)",
failureReport->update_time,
100*failureReport->update_time/noZero(t));
}
os << std::endl;
t = pre_post_time + (failureReport ? failureReport->pre_post_time : 0.0);
os << fmt::format(" Pre/post step (seconds): {:7.2f}", t);
os << fmt::format(" Pre/post step (sec): {:7.2f}", t);
if (failureReport) {
os << fmt::format(" (Failed: {:2.1f}; {:2.1f}%)",
os << fmt::format(" (Wasted: {:2.1f}; {:2.1f}%)",
failureReport->pre_post_time,
100*failureReport->pre_post_time/noZero(t));
}
os << std::endl;
os << fmt::format(" Output write time (seconds): {:7.2f}",
os << fmt::format(" Output write time (sec): {:7.2f}",
output_write_time + (failureReport ? failureReport->output_write_time : 0.0));
os << std::endl;
}
@ -183,7 +183,7 @@ namespace Opm
int n = total_linearizations + (failureReport ? failureReport->total_linearizations : 0);
os << fmt::format("Overall Linearizations: {:7}", n);
if (failureReport) {
os << fmt::format(" (Failed: {:3}; {:2.1f}%)",
os << fmt::format(" (Wasted: {:3}; {:2.1f}%)",
failureReport->total_linearizations,
100.0*failureReport->total_linearizations/noZero(n));
}
@ -192,7 +192,7 @@ namespace Opm
n = total_newton_iterations + (failureReport ? failureReport->total_newton_iterations : 0);
os << fmt::format("Overall Newton Iterations: {:7}", n);
if (failureReport) {
os << fmt::format(" (Failed: {:3}; {:2.1f}%)",
os << fmt::format(" (Wasted: {:3}; {:2.1f}%)",
failureReport->total_newton_iterations,
100.0*failureReport->total_newton_iterations/noZero(n));
}
@ -201,7 +201,7 @@ namespace Opm
n = total_linear_iterations + (failureReport ? failureReport->total_linear_iterations : 0);
os << fmt::format("Overall Linear Iterations: {:7}", n);
if (failureReport) {
os << fmt::format(" (Failed: {:3}; {:2.1f}%)",
os << fmt::format(" (Wasted: {:3}; {:2.1f}%)",
failureReport->total_linear_iterations,
100.0*failureReport->total_linear_iterations/noZero(n));
}