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 #3225 from totto82/refactorAssembleWellEq

Browse Source 
Avoid code duplication
This commit is contained in:
Bård Skaflestad 2021-05-10 12:27:52 +02:00 committed by GitHub
commit 38292aca72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,12 +136,6 @@ namespace Opm
// Not implemented yet // Not implemented yet
} }
virtual void assembleWellEq(const Simulator& ebosSimulator,
const double dt,
WellState& well_state,
const GroupState& group_state,
DeferredLogger& deferred_logger) override;
/// updating the well state based the current control mode /// updating the well state based the current control mode
void updateWellStateWithTarget(const Simulator& ebos_simulator, void updateWellStateWithTarget(const Simulator& ebos_simulator,
WellState& well_state, WellState& well_state,
@ -207,6 +201,10 @@ namespace Opm
const std::vector<EvalWell>& mobility, const std::vector<EvalWell>& mobility,
double* connII, double* connII,
DeferredLogger& deferred_logger) const; DeferredLogger& deferred_logger) const;
virtual bool useInnerIterations() const override {
return param_.use_inner_iterations_ms_wells_;
}
protected: protected:
int number_segments_; int number_segments_;

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

@ -255,35 +255,6 @@ namespace Opm
template <typename TypeTag>
void
MultisegmentWell<TypeTag>::
assembleWellEq(const Simulator& ebosSimulator,
const double dt,
WellState& well_state,
const GroupState& group_state,
DeferredLogger& deferred_logger)
{
checkWellOperability(ebosSimulator, well_state, deferred_logger);
const bool use_inner_iterations = param_.use_inner_iterations_ms_wells_;
if (use_inner_iterations) {
this->iterateWellEquations(ebosSimulator, dt, well_state, group_state, deferred_logger);
}
const auto& summary_state = ebosSimulator.vanguard().summaryState();
const auto inj_controls = well_ecl_.isInjector() ? well_ecl_.injectionControls(summary_state) : Well::InjectionControls(0);
const auto prod_controls = well_ecl_.isProducer() ? well_ecl_.productionControls(summary_state) : Well::ProductionControls(0);
assembleWellEqWithoutIteration(ebosSimulator, dt, inj_controls, prod_controls, well_state, group_state, deferred_logger);
}
template <typename TypeTag> template <typename TypeTag>
void void
MultisegmentWell<TypeTag>:: MultisegmentWell<TypeTag>::

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

@ -181,12 +181,6 @@ namespace Opm
virtual void initPrimaryVariablesEvaluation() const override; virtual void initPrimaryVariablesEvaluation() const override;
virtual void assembleWellEq(const Simulator& ebosSimulator,
const double dt,
WellState& well_state,
const GroupState& group_state,
Opm::DeferredLogger& deferred_logger) override;
void updateWellStateWithTarget(const Simulator& ebos_simulator, void updateWellStateWithTarget(const Simulator& ebos_simulator,
WellState& well_state, WellState& well_state,
Opm::DeferredLogger& deferred_logger) const; Opm::DeferredLogger& deferred_logger) const;
@ -330,6 +324,10 @@ namespace Opm
double* connII, double* connII,
DeferredLogger& deferred_logger) const; DeferredLogger& deferred_logger) const;
virtual bool useInnerIterations() const override {
return param_.use_inner_iterations_wells_;
}
protected: protected:
// protected functions from the Base class // protected functions from the Base class
using Base::getAllowCrossFlow; using Base::getAllowCrossFlow;

27
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -537,33 +537,6 @@ namespace Opm
template<typename TypeTag>
void
StandardWell<TypeTag>::
assembleWellEq(const Simulator& ebosSimulator,
const double dt,
WellState& well_state,
const GroupState& group_state,
Opm::DeferredLogger& deferred_logger)
{
checkWellOperability(ebosSimulator, well_state, deferred_logger);
const bool use_inner_iterations = param_.use_inner_iterations_wells_;
if (use_inner_iterations) {
this->iterateWellEquations(ebosSimulator, dt, well_state, group_state, deferred_logger);
}
// TODO: inj_controls and prod_controls are not used in the following function for now
const auto& summary_state = ebosSimulator.vanguard().summaryState();
const auto inj_controls = well_ecl_.isInjector() ? well_ecl_.injectionControls(summary_state) : Well::InjectionControls(0);
const auto prod_controls = well_ecl_.isProducer() ? well_ecl_.productionControls(summary_state) : Well::ProductionControls(0);
assembleWellEqWithoutIteration(ebosSimulator, dt, inj_controls, prod_controls, well_state, group_state, deferred_logger);
}
template<typename TypeTag> template<typename TypeTag>
void void
StandardWell<TypeTag>:: StandardWell<TypeTag>::

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

@ -182,12 +182,11 @@ namespace Opm
virtual void solveEqAndUpdateWellState(WellState& well_state, Opm::DeferredLogger& deferred_logger) = 0; virtual void solveEqAndUpdateWellState(WellState& well_state, Opm::DeferredLogger& deferred_logger) = 0;
virtual void assembleWellEq(const Simulator& ebosSimulator, void assembleWellEq(const Simulator& ebosSimulator,
const double dt, const double dt,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger Opm::DeferredLogger& deferred_logger);
) = 0;
virtual void gasLiftOptimizationStage1 ( virtual void gasLiftOptimizationStage1 (
WellState& well_state, WellState& well_state,
@ -346,6 +345,8 @@ namespace Opm
const PhaseUsage& phaseUsage() const; const PhaseUsage& phaseUsage() const;
virtual bool useInnerIterations() const = 0;
protected: protected:
// to indicate a invalid completion // to indicate a invalid completion

26
opm/simulators/wells/WellInterface_impl.hpp
View File

@ -1452,6 +1452,32 @@ namespace Opm
} }
} }
template <typename TypeTag>
void
WellInterface<TypeTag>::
assembleWellEq(const Simulator& ebosSimulator,
const double dt,
WellState& well_state,
const GroupState& group_state,
DeferredLogger& deferred_logger)
{
checkWellOperability(ebosSimulator, well_state, deferred_logger);
if (this->useInnerIterations()) {
this->iterateWellEquations(ebosSimulator, dt, well_state, group_state, deferred_logger);
}
const auto& summary_state = ebosSimulator.vanguard().summaryState();
const auto inj_controls = well_ecl_.isInjector() ? well_ecl_.injectionControls(summary_state) : Well::InjectionControls(0);
const auto prod_controls = well_ecl_.isProducer() ? well_ecl_.productionControls(summary_state) : Well::ProductionControls(0);
assembleWellEqWithoutIteration(ebosSimulator, dt, inj_controls, prod_controls, well_state, group_state, deferred_logger);
}
template<typename TypeTag> template<typename TypeTag>
void void
WellInterface<TypeTag>::addCellRates(RateVector& rates, int cellIdx) const WellInterface<TypeTag>::addCellRates(RateVector& rates, int cellIdx) const