OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence shadowing warnings.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2020-10-19 09:06:38 +02:00
parent fd1cc74f74
commit fd59f1685a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp
View File

@ -90,11 +90,11 @@ namespace Opm {
} }
void Well::WellProductionProperties::init_vfp(const std::optional<VFPProdTable::ALQ_TYPE>& alq_type, const UnitSystem& unit_system, const DeckRecord& record) { void Well::WellProductionProperties::init_vfp(const std::optional<VFPProdTable::ALQ_TYPE>& alq_type, const UnitSystem& unit_system_arg, const DeckRecord& record) {
if (alq_type) { if (alq_type) {
this->VFPTableNumber = record.getItem("VFP_TABLE").get<int>(0); this->VFPTableNumber = record.getItem("VFP_TABLE").get<int>(0);
double alq_input = record.getItem("ALQ").get<double>(0); double alq_input = record.getItem("ALQ").get<double>(0);
const auto alq_dim = VFPProdTable::ALQDimension(*alq_type, unit_system); const auto alq_dim = VFPProdTable::ALQDimension(*alq_type, unit_system_arg);
this->ALQValue = alq_dim.convertRawToSi(alq_input); this->ALQValue = alq_dim.convertRawToSi(alq_input);
} else { } else {
const auto table_nr = record.getItem("VFP_TABLE").get< int >(0); const auto table_nr = record.getItem("VFP_TABLE").get< int >(0);
@ -154,10 +154,10 @@ namespace Opm {
void Well::WellProductionProperties::handleWCONPROD(const std::optional<VFPProdTable::ALQ_TYPE>& alq_type, const UnitSystem& unit_system, const std::string& /* well */, const DeckRecord& record) void Well::WellProductionProperties::handleWCONPROD(const std::optional<VFPProdTable::ALQ_TYPE>& alq_type, const UnitSystem& unit_system_arg, const std::string& /* well */, const DeckRecord& record)
{ {
this->predictionMode = true; this->predictionMode = true;
this->init_vfp(alq_type, unit_system, record); this->init_vfp(alq_type, unit_system_arg, record);
this->init_rates(record); this->init_rates(record);
this->BHPTarget = record.getItem("BHP").get<UDAValue>(0); this->BHPTarget = record.getItem("BHP").get<UDAValue>(0);
@ -203,10 +203,10 @@ void Well::WellProductionProperties::handleWCONPROD(const std::optional<VFPProdT
originate from the WCONHIST keyword. Predictions are handled with the originate from the WCONHIST keyword. Predictions are handled with the
default constructor and the handleWCONPROD() method. default constructor and the handleWCONPROD() method.
*/ */
void Well::WellProductionProperties::handleWCONHIST(const std::optional<VFPProdTable::ALQ_TYPE>& alq_type, const UnitSystem& unit_system, const DeckRecord& record) void Well::WellProductionProperties::handleWCONHIST(const std::optional<VFPProdTable::ALQ_TYPE>& alq_type, const UnitSystem& unit_system_arg, const DeckRecord& record)
{ {
this->init_rates(record); this->init_rates(record);
this->init_vfp(alq_type, unit_system, record); this->init_vfp(alq_type, unit_system_arg, record);
this->LiquidRate = 0; this->LiquidRate = 0;
this->ResVRate = 0; this->ResVRate = 0;