OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-10 15:15:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make parameters to getLiquidRateWithGroupLimit_() const

Browse Source 
To improve readability, we make the parameters of
getLiquidRateWithGroupLimit_() const as discussed in
https://github.com/OPM/opm-simulators/pull/3748
This commit is contained in:
Håkon Hægland 2021-12-20 23:19:40 +01:00
parent 837f33e679
commit 11ad879472
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/wells/GasLiftGroupInfo.cpp
View File

@ -106,7 +106,7 @@ getRate(Rate rate_type, const std::string& group_name)
std::tuple<double, double, double, double>
GasLiftGroupInfo::
getRates(int group_idx)
getRates(const int group_idx)
{
const auto& group_name = groupIdxToName(group_idx);
auto& rates = this->group_rate_map_.at(group_name);

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

@ -87,7 +87,7 @@ public:
double gasRate(const std::string& group_name);
int getGroupIdx(const std::string& group_name);
double getRate(Rate rate_type, const std::string& group_name);
std::tuple<double,double,double,double> getRates(int group_idx);
std::tuple<double,double,double,double> getRates(const int group_idx);
std::optional<double> gasTarget(const std::string& group_name);
std::optional<double> getTarget(Rate rate_type, const std::string& group_name);
const std::string& groupIdxToName(int group_idx);

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

@ -633,8 +633,8 @@ getWaterRateWithGroupLimit_(double new_water_rate, double water_rate) const
std::tuple<double, double, bool, bool>
GasLiftSingleWellGeneric::
getLiquidRateWithGroupLimit_(double new_oil_rate, double oil_rate,
double new_water_rate, double water_rate) const
getLiquidRateWithGroupLimit_(const double new_oil_rate, const double oil_rate,
const double new_water_rate, const double water_rate) const
{
auto liquid_rate = oil_rate + water_rate;
auto new_liquid_rate = new_oil_rate + new_water_rate;
@ -662,8 +662,9 @@ getLiquidRateWithGroupLimit_(double new_oil_rate, double oil_rate,
double oil_fraction = new_gr_oil_rate / new_gr_liquid_rate;
double delta_liquid = liquid_rate_limited - liquid_rate;
new_oil_rate = oil_rate + oil_fraction * delta_liquid;
new_water_rate = water_rate + (1.0 - oil_fraction) * delta_liquid;
auto limited_oil_rate = oil_rate + oil_fraction * delta_liquid;
auto limited_water_rate = water_rate + (1.0 - oil_fraction) * delta_liquid;
return {limited_oil_rate, limited_water_rate, limited, limited};
}
return {new_oil_rate, new_water_rate, limited, limited};
}

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

@ -182,9 +182,11 @@ protected:
std::tuple<double,double,double,bool,bool,bool>
getInitialRatesWithLimit_(const std::vector<double>& potentials);
std::tuple<double, const std::string*, double> getRateWithGroupLimit_(
Rate rate_type, const double new_rate, const double old_rate) const;
std::pair<double, bool> getOilRateWithLimit_(const std::vector<double>& potentials) const;
std::pair<double, bool> getWaterRateWithLimit_(const std::vector<double>& potentials) const;
Rate rate_type, const double new_rate, const double old_rate) const;
std::pair<double, bool> getOilRateWithLimit_(
const std::vector<double>& potentials) const;
std::pair<double, bool> getWaterRateWithLimit_(
const std::vector<double>& potentials) const;
std::pair<double, bool> getOilRateWithGroupLimit_(
double new_oil_rate, double oil_rate) const;
@ -193,8 +195,8 @@ protected:
std::pair<double, bool> getWaterRateWithGroupLimit_(
double new_water_rate, double water_rate) const;
std::tuple<double,double,bool,bool> getLiquidRateWithGroupLimit_(
double new_oil_rate, double oil_rate,
double new_water_rate, double water_rate) const;
const double new_oil_rate, const double oil_rate,
const double new_water_rate, const double water_rate) const;
std::tuple<double,double,bool,bool,double>
increaseALQtoPositiveOilRate_(double alq,