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

adapt to renamed GasLift(Group|Well)

Browse Source
This commit is contained in:
Arne Morten Kvarving
2023-01-09 13:50:05 +01:00
parent 0a35edd0f5
commit e68d05a147
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ namespace Opm
std::optional<double> computeBhpAtThpLimit_(double alq) const override; std::optional<double> computeBhpAtThpLimit_(double alq) const override;
BasicRates computeWellRates_( BasicRates computeWellRates_(
double bhp, bool bhp_is_limited, bool debug_output=true) const override; double bhp, bool bhp_is_limited, bool debug_output=true) const override;
void setAlqMaxRate_(const GasLiftOpt::Well& well); void setAlqMaxRate_(const GasLiftWell& well);
void setupPhaseVariables_(); void setupPhaseVariables_();
bool checkThpControl_() const override; bool checkThpControl_() const override;

6
opm/simulators/wells/GasLiftSingleWellGeneric.cpp
View File

@@ -1304,7 +1304,7 @@ GasLiftSingleWellGeneric::tryIncreaseLiftGas_()
} }
void void
GasLiftSingleWellGeneric::setAlqMinRate_(const GasLiftOpt::Well& well) GasLiftSingleWellGeneric::setAlqMinRate_(const GasLiftWell& well)
{ {
// NOTE: According to WLIFTOPT item 5 : // NOTE: According to WLIFTOPT item 5 :
// if min_rate() is negative, it means: allocate at least enough lift gas // if min_rate() is negative, it means: allocate at least enough lift gas
@@ -1394,7 +1394,7 @@ GasLiftSingleWellGeneric::updateRatesToGroupLimits_(const BasicRates& old_rates,
// Called when we should use a fixed ALQ value // Called when we should use a fixed ALQ value
void void
GasLiftSingleWellGeneric::updateWellStateAlqFixedValue_(const GasLiftOpt::Well& well) GasLiftSingleWellGeneric::updateWellStateAlqFixedValue_(const GasLiftWell& well)
{ {
auto& max_alq_optional = well.max_rate(); auto& max_alq_optional = well.max_rate();
if (max_alq_optional) { if (max_alq_optional) {
@@ -1421,7 +1421,7 @@ GasLiftSingleWellGeneric::updateWellStateAlqFixedValue_(const GasLiftOpt::Well&
// value that can be set either in Item 3 of this keyword, or in // value that can be set either in Item 3 of this keyword, or in
// Item 12 of keyword WCONPROD, or with keyword WELTARG. // Item 12 of keyword WCONPROD, or with keyword WELTARG.
bool bool
GasLiftSingleWellGeneric::useFixedAlq_(const GasLiftOpt::Well& well) GasLiftSingleWellGeneric::useFixedAlq_(const GasLiftWell& well)
{ {
auto wliftopt_item2 = well.use_glo(); auto wliftopt_item2 = well.use_glo();
if (wliftopt_item2) { if (wliftopt_item2) {

8
opm/simulators/wells/GasLiftSingleWellGeneric.hpp
View File

@@ -317,7 +317,7 @@ protected:
std::unique_ptr<GasLiftWellState> runOptimize1_(); std::unique_ptr<GasLiftWellState> runOptimize1_();
std::unique_ptr<GasLiftWellState> runOptimize2_(); std::unique_ptr<GasLiftWellState> runOptimize2_();
std::unique_ptr<GasLiftWellState> runOptimizeLoop_(bool increase); std::unique_ptr<GasLiftWellState> runOptimizeLoop_(bool increase);
void setAlqMinRate_(const GasLiftOpt::Well& well); void setAlqMinRate_(const GasLiftWell& well);
std::unique_ptr<GasLiftWellState> tryIncreaseLiftGas_(); std::unique_ptr<GasLiftWellState> tryIncreaseLiftGas_();
std::unique_ptr<GasLiftWellState> tryDecreaseLiftGas_(); std::unique_ptr<GasLiftWellState> tryDecreaseLiftGas_();
void updateGroupRates_( void updateGroupRates_(
@@ -326,8 +326,8 @@ protected:
double delta_alq) const; double delta_alq) const;
LimitedRates updateRatesToGroupLimits_( LimitedRates updateRatesToGroupLimits_(
const BasicRates& rates, const LimitedRates& new_rates, const std::string& gr_name = "") const; const BasicRates& rates, const LimitedRates& new_rates, const std::string& gr_name = "") const;
void updateWellStateAlqFixedValue_(const GasLiftOpt::Well& well); void updateWellStateAlqFixedValue_(const GasLiftWell& well);
bool useFixedAlq_(const GasLiftOpt::Well& well); bool useFixedAlq_(const GasLiftWell& well);
void debugInfoGroupRatesExceedTarget( void debugInfoGroupRatesExceedTarget(
Rate rate_type, const std::string& gr_name, double rate, double target) const; Rate rate_type, const std::string& gr_name, double rate, double target) const;
void warnMaxIterationsExceeded_(); void warnMaxIterationsExceeded_();
@@ -356,7 +356,7 @@ protected:
std::string well_name_; std::string well_name_;
const GasLiftOpt::Well* gl_well_; const GasLiftWell* gl_well_;
bool optimize_; bool optimize_;
bool debug_limit_increase_decrease_; bool debug_limit_increase_decrease_;

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

@@ -191,7 +191,7 @@ setupPhaseVariables_()
template<typename TypeTag> template<typename TypeTag>
void void
GasLiftSingleWell<TypeTag>:: GasLiftSingleWell<TypeTag>::
setAlqMaxRate_(const GasLiftOpt::Well &well) setAlqMaxRate_(const GasLiftWell &well)
{ {
auto& max_alq_optional = well.max_rate(); auto& max_alq_optional = well.max_rate();
if (max_alq_optional) { if (max_alq_optional) {