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 #4449 from akva2/simulatorreportsingle_cleanups

Browse Source 
SimulatorReportSingle: some cleanups
This commit is contained in:
Bård Skaflestad 2023-02-09 12:36:45 +01:00 committed by GitHub
commit 52b9ec98fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,46 +17,18 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <config.h>
#include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <iomanip>
#include <ostream>
#include <sstream>
#include <fmt/format.h>
#include <limits>
namespace Opm
{
SimulatorReportSingle::SimulatorReportSingle()
: pressure_time(0.0),
transport_time(0.0),
total_time(0.0),
solver_time(0.0),
assemble_time(0.0),
pre_post_time(0.0),
assemble_time_well(0.0),
linear_solve_setup_time(0.0),
linear_solve_time(0.0),
update_time(0.0),
output_write_time(0.0),
total_well_iterations(0),
total_linearizations( 0 ),
total_newton_iterations( 0 ),
total_linear_iterations( 0 ),
min_linear_iterations ( std::numeric_limits<unsigned int>::max() ),
max_linear_iterations ( 0 ),
converged(false),
well_group_control_changed(false),
exit_status(EXIT_SUCCESS),
global_time(0),
timestep_length(0.0)
{
}
void SimulatorReportSingle::operator+=(const SimulatorReportSingle& sr)
{
pressure_time += sr.pressure_time;
@ -86,7 +58,7 @@ namespace Opm
}
void SimulatorReportSingle::reportStep(std::ostringstream& ss) const
void SimulatorReportSingle::reportStep(std::ostream& ss) const
{
if (total_well_iterations != 0) {
ss << fmt::format("Well its={:2}", total_well_iterations);

52
opm/simulators/timestepping/SimulatorReport.hpp
View File

@ -19,8 +19,11 @@
#ifndef OPM_SIMULATORREPORT_HEADER_INCLUDED
#define OPM_SIMULATORREPORT_HEADER_INCLUDED
#include <cassert>
#include <cstdlib>
#include <iosfwd>
#include <limits>
#include <vector>
namespace Opm
@ -29,39 +32,36 @@ namespace Opm
/// A struct for returning timing data from a simulator to its caller.
struct SimulatorReportSingle
{
double pressure_time;
double transport_time;
double total_time;
double solver_time;
double assemble_time;
double pre_post_time;
double assemble_time_well;
double linear_solve_setup_time;
double linear_solve_time;
double update_time;
double output_write_time;
double pressure_time = 0.0;
double transport_time = 0.0;
double total_time = 0.0;
double solver_time = 0.0;
double assemble_time = 0.0;
double pre_post_time = 0.0;
double assemble_time_well = 0.0;
double linear_solve_setup_time = 0.0;
double linear_solve_time = 0.0;
double update_time = 0.0;
double output_write_time = 0.0;
unsigned int total_well_iterations;
unsigned int total_linearizations;
unsigned int total_newton_iterations;
unsigned int total_linear_iterations;
unsigned int min_linear_iterations;
unsigned int max_linear_iterations;
unsigned int total_well_iterations = 0;
unsigned int total_linearizations = 0;
unsigned int total_newton_iterations = 0;
unsigned int total_linear_iterations = 0;
unsigned int min_linear_iterations = std::numeric_limits<unsigned int>::max();
unsigned int max_linear_iterations = 0;
bool converged = false;
bool well_group_control_changed = false;
int exit_status = EXIT_SUCCESS;
bool converged;
bool well_group_control_changed;
int exit_status;
double global_time = 0.0;
double timestep_length = 0.0;
double global_time;
double timestep_length;
/// Default constructor initializing all times to 0.0.
SimulatorReportSingle();
/// Increment this report's times by those in sr.
void operator+=(const SimulatorReportSingle& sr);
/// Print a report suitable for a single simulation step.
void reportStep(std::ostringstream& os) const;
void reportStep(std::ostream& os) const;
/// Print a report suitable for the end of a fully implicit case, leaving out the pressure/transport time.
void reportFullyImplicit(std::ostream& os, const SimulatorReportSingle* failedReport = nullptr) const;
};