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

Refactor SimulatorReport system.

Browse Source 
Now SimulatorReport object contains a vector of SimulatorReportSingle objects,
for both successful and failing steps.
This commit is contained in:
Atgeirr Flø Rasmussen
2020-05-07 16:13:39 +02:00
parent cfdb2b9be6
commit 8dd53a38e9
9 changed files with 88 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/wells/BlackoilWellModel.hpp
View File

@@ -253,7 +253,7 @@ namespace Opm {
// return the internal well state
const WellState& wellState() const;
const SimulatorReport& lastReport() const;
const SimulatorReportSingle& lastReport() const;
void addWellContributions(SparseMatrixAdapter& jacobian) const
{
@@ -317,7 +317,7 @@ namespace Opm {
std::unique_ptr<RateConverterType> rateConverter_;
std::unique_ptr<VFPProperties<VFPInjProperties,VFPProdProperties>> vfp_properties_;
SimulatorReport last_report_;
SimulatorReportSingle last_report_;
WellTestState wellTestState_;
std::unique_ptr<GuideRate> guideRate_;
@@ -377,7 +377,7 @@ namespace Opm {
/// at the beginning of the time step and no derivatives are included in these quantities
void calculateExplicitQuantities(Opm::DeferredLogger& deferred_logger) const;
SimulatorReport solveWellEq(const std::vector<Scalar>& B_avg, const double dt, Opm::DeferredLogger& deferred_logger);
SimulatorReportSingle solveWellEq(const std::vector<Scalar>& B_avg, const double dt, Opm::DeferredLogger& deferred_logger);
void initPrimaryVariablesEvaluation() const;