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 #4499 from akva2/adaptivetimesteppingebos_more_compile_unit

Browse Source 
AdaptiveTimeSteppingEbos: move more code to compile unit
This commit is contained in:
Bård Skaflestad
2023-03-02 13:38:07 +01:00
committed by GitHub
parent 468494e801 c4e025190e
commit dcf2a1304b
5 changed files with 88 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@@ -44,6 +44,7 @@
#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>
#include <opm/simulators/timestepping/ConvergenceReport.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/timestepping/SimulatorTimer.hpp>
@@ -1061,13 +1062,6 @@ namespace Opm {
const SimulatorReportSingle& failureReport() const
{ return failureReport_; }
struct StepReport
{
int report_step;
int current_step;
std::vector<ConvergenceReport> report;
};
const std::vector<StepReport>& stepReports() const
{
return convergence_reports_;
@@ -1155,6 +1149,7 @@ namespace Opm {
double drMaxRel() const { return param_.dr_max_rel_; }
double maxResidualAllowed() const { return param_.max_residual_allowed_; }
double linear_solve_setup_time_;
public:
std::vector<bool> wasSwitched_;
};

3
opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@@ -31,6 +31,7 @@
#include <opm/simulators/flow/NonlinearSolverEbos.hpp>
#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>
#include <opm/simulators/timestepping/ConvergenceReport.hpp>
#include <opm/simulators/utils/moduleVersion.hpp>
#include <opm/simulators/wells/WellState.hpp>
@@ -547,7 +548,7 @@ protected:
&this->convergenceOutputObject_.value());
}
void writeConvergenceOutput(std::vector<typename Model::StepReport>&& reports)
void writeConvergenceOutput(std::vector<StepReport>&& reports)
{
if (! this->convergenceOutputThread_.has_value()) {
return;