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

fixing the comilation from the reverted commit

Browse Source 
the interface has changed.
This commit is contained in:
Kai Bao 2023-04-21 10:17:03 +02:00
parent 2d67d819e7
commit 5536b24a84
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -872,7 +872,8 @@ namespace Opm {
}
++iter;
for (auto& well : this->well_container_) {
well->solveEqAndUpdateWellState(well_state, deferred_logger);
const auto& summary_state = this->ebosSimulator_.vanguard().summaryState();
well->solveEqAndUpdateWellState(summary_state, well_state, deferred_logger);
}
this->initPrimaryVariablesEvaluation();
} while (iter < max_iter);

2
opm/simulators/wells/MultisegmentWell.hpp
View File

@ -124,7 +124,7 @@ namespace Opm
const WellState& well_state,
DeferredLogger& deferred_logger) override;
virtual void solveEqAndUpdateWellState(const Simulator& ebos_simulator,
virtual void solveEqAndUpdateWellState(const SummaryState& summary_state,
WellState& well_state,
DeferredLogger& deferred_logger) override; // const?

3
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@ -534,7 +534,7 @@ namespace Opm
template <typename TypeTag>
void
MultisegmentWell<TypeTag>::
solveEqAndUpdateWellState(const Simulator& ebos_simulator,
solveEqAndUpdateWellState(const SummaryState& summary_state,
WellState& well_state,
DeferredLogger& deferred_logger)
{
@ -544,7 +544,6 @@ namespace Opm
// which is why we do not put the assembleWellEq here.
const BVectorWell dx_well = this->linSys_.solve();
const auto& summary_state = ebos_simulator.vanguard().summaryState();
updateWellState(summary_state, dx_well, well_state, deferred_logger);
}

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

@ -172,9 +172,9 @@ namespace Opm
const WellState& well_state,
DeferredLogger& deferred_logger) override;
void solveEqAndUpdateWellState(const SummaryState& summary_state,
WellState& well_state,
DeferredLogger& deferred_logger);
virtual void solveEqAndUpdateWellState(const SummaryState& summary_state,
WellState& well_state,
DeferredLogger& deferred_logger) override;
virtual void calculateExplicitQuantities(const Simulator& ebosSimulator,
const WellState& well_state,

2
opm/simulators/wells/WellInterface.hpp
View File

@ -160,7 +160,7 @@ public:
DeferredLogger& deferred_logger,
const bool relax_tolerance) const = 0;
virtual void solveEqAndUpdateWellState(const Simulator& ebos_simulator,
virtual void solveEqAndUpdateWellState(const SummaryState& summary_state,
WellState& well_state,
DeferredLogger& deferred_logger) = 0;