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

Revert "removing unused function solveEqAndUpdateWellState"

Browse Source 
This reverts commit 7931e6e00a.
This commit is contained in:
Kai Bao 2023-04-21 09:10:10 +02:00
parent 8644801ac8
commit 2d67d819e7
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,10 @@ namespace Opm
const WellState& well_state, const WellState& well_state,
DeferredLogger& deferred_logger) override; DeferredLogger& deferred_logger) override;
virtual void solveEqAndUpdateWellState(const Simulator& ebos_simulator,
WellState& well_state,
DeferredLogger& deferred_logger) override; // const?
virtual void calculateExplicitQuantities(const Simulator& ebosSimulator, virtual void calculateExplicitQuantities(const Simulator& ebosSimulator,
const WellState& well_state, const WellState& well_state,
DeferredLogger& deferred_logger) override; // should be const? DeferredLogger& deferred_logger) override; // should be const?

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

@ -531,6 +531,27 @@ namespace Opm
template <typename TypeTag>
void
MultisegmentWell<TypeTag>::
solveEqAndUpdateWellState(const Simulator& ebos_simulator,
WellState& well_state,
DeferredLogger& deferred_logger)
{
if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
// We assemble the well equations, then we check the convergence,
// 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);
}
template <typename TypeTag> template <typename TypeTag>
void void
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::

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

@ -160,6 +160,10 @@ public:
DeferredLogger& deferred_logger, DeferredLogger& deferred_logger,
const bool relax_tolerance) const = 0; const bool relax_tolerance) const = 0;
virtual void solveEqAndUpdateWellState(const Simulator& ebos_simulator,
WellState& well_state,
DeferredLogger& deferred_logger) = 0;
void assembleWellEq(const Simulator& ebosSimulator, void assembleWellEq(const Simulator& ebosSimulator,
const double dt, const double dt,
WellState& well_state, WellState& well_state,