OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-01 13:29:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Made some methods in GasLiftGroupInfo const

Browse Source 
This is in agreement with C++ Core Guidelines. A member function should
be marked const unless it changes the object’s observable state. This
gives a more precise statement of design intent, better readability, more
errors caught by the compiler, and sometimes more optimization opportunities.
This commit is contained in:
Håkon Hægland 2021-12-21 23:24:58 +01:00
parent 723fd50d4c
commit f28b906782
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ getGroupIdx(const std::string& group_name)
double
GasLiftGroupInfo::
gasRate(const std::string& group_name)
gasRate(const std::string& group_name) const
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.gasRate();
@ -78,7 +78,7 @@ gasRate(const std::string& group_name)
std::optional<double>
GasLiftGroupInfo::
gasTarget(const std::string& group_name)
gasTarget(const std::string& group_name) const
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.gasTarget();
@ -86,7 +86,7 @@ gasTarget(const std::string& group_name)
double
GasLiftGroupInfo::
getRate(Rate rate_type, const std::string& group_name)
getRate(Rate rate_type, const std::string& group_name) const
{
switch (rate_type) {
case Rate::oil:
@ -106,7 +106,7 @@ getRate(Rate rate_type, const std::string& group_name)
std::tuple<double, double, double, double>
GasLiftGroupInfo::
getRates(const int group_idx)
getRates(const int group_idx) const
{
const auto& group_name = groupIdxToName(group_idx);
auto& rates = this->group_rate_map_.at(group_name);
@ -115,7 +115,7 @@ getRates(const int group_idx)
std::optional<double>
GasLiftGroupInfo::
getTarget(Rate rate_type, const std::string& group_name)
getTarget(Rate rate_type, const std::string& group_name) const
{
switch (rate_type) {
case Rate::oil:
@ -142,7 +142,7 @@ getWellGroups(const std::string& well_name)
const std::string&
GasLiftGroupInfo::
groupIdxToName(int group_idx)
groupIdxToName(int group_idx) const
{
const std::string *group_name = nullptr;
// TODO: An alternative to the below loop is to set up a reverse map from idx ->
@ -180,6 +180,14 @@ initialize()
group, group_names, group_efficiency, /*current efficiency=*/1.0);
}
std::optional<double>
GasLiftGroupInfo::
liquidTarget(const std::string &group_name) const
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.liquidTarget();
}
std::optional<double>
GasLiftGroupInfo::
maxAlq(const std::string& group_name)
@ -190,7 +198,7 @@ maxAlq(const std::string& group_name)
double
GasLiftGroupInfo::
oilRate(const std::string &group_name)
oilRate(const std::string &group_name) const
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.oilRate();
@ -198,36 +206,12 @@ oilRate(const std::string &group_name)
std::optional<double>
GasLiftGroupInfo::
oilTarget(const std::string &group_name)
oilTarget(const std::string &group_name) const
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.oilTarget();
}
double
GasLiftGroupInfo::
waterRate(const std::string &group_name)
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.waterRate();
}
std::optional<double>
GasLiftGroupInfo::
waterTarget(const std::string &group_name)
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.waterTarget();
}
std::optional<double>
GasLiftGroupInfo::
liquidTarget(const std::string &group_name)
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.liquidTarget();
}
const std::string
GasLiftGroupInfo::
rateToString(Rate rate) {
@ -245,6 +229,22 @@ rateToString(Rate rate) {
}
}
double
GasLiftGroupInfo::
waterRate(const std::string &group_name) const
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.waterRate();
}
std::optional<double>
GasLiftGroupInfo::
waterTarget(const std::string &group_name) const
{
auto& group_rate = this->group_rate_map_.at(group_name);
return group_rate.waterTarget();
}
void
GasLiftGroupInfo::
update(

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

@ -84,22 +84,23 @@ public:
const std::string& well_name);
double alqRate(const std::string& group_name);
double gasRate(const std::string& group_name);
double gasRate(const std::string& group_name) const;
int getGroupIdx(const std::string& group_name);
double getRate(Rate rate_type, const std::string& group_name);
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);
double getRate(Rate rate_type, const std::string& group_name) const;
std::tuple<double,double,double,double> getRates(const int group_idx) const;
std::optional<double> gasTarget(const std::string& group_name) const;
std::optional<double> getTarget(
Rate rate_type, const std::string& group_name) const;
const std::string& groupIdxToName(int group_idx) const;
bool hasWell(const std::string& well_name);
void initialize();
std::optional<double> liquidTarget(const std::string& group_name) const;
std::optional<double> maxAlq(const std::string& group_name);
double oilRate(const std::string& group_name);
double oilRate(const std::string& group_name) const;
std::optional<double> oilTarget(const std::string& group_name) const;
static const std::string rateToString(Rate rate);
double waterRate(const std::string& group_name);
std::optional<double> oilTarget(const std::string& group_name);
std::optional<double> waterTarget(const std::string& group_name);
std::optional<double> liquidTarget(const std::string& group_name);
double waterRate(const std::string& group_name) const;
std::optional<double> waterTarget(const std::string& group_name) const;
void update(const std::string& well_name,
double delta_oil, double delta_gas, double delta_water, double delta_alq);
void updateRate(int idx, double oil_rate, double gas_rate, double water_rate, double alq);