From fd59f1685a1eda588fe2ef5ca9b3a3f6a545651a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Mon, 19 Oct 2020 09:06:38 +0200 Subject: [PATCH] Silence shadowing warnings. --- .../Schedule/Well/WellProductionProperties.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp index 2e9a2c05b..b0875e95d 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp @@ -90,11 +90,11 @@ namespace Opm { } - void Well::WellProductionProperties::init_vfp(const std::optional& alq_type, const UnitSystem& unit_system, const DeckRecord& record) { + void Well::WellProductionProperties::init_vfp(const std::optional& alq_type, const UnitSystem& unit_system_arg, const DeckRecord& record) { if (alq_type) { this->VFPTableNumber = record.getItem("VFP_TABLE").get(0); double alq_input = record.getItem("ALQ").get(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); } else { const auto table_nr = record.getItem("VFP_TABLE").get< int >(0); @@ -154,10 +154,10 @@ namespace Opm { -void Well::WellProductionProperties::handleWCONPROD(const std::optional& alq_type, const UnitSystem& unit_system, const std::string& /* well */, const DeckRecord& record) +void Well::WellProductionProperties::handleWCONPROD(const std::optional& alq_type, const UnitSystem& unit_system_arg, const std::string& /* well */, const DeckRecord& record) { 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->BHPTarget = record.getItem("BHP").get(0); @@ -203,10 +203,10 @@ void Well::WellProductionProperties::handleWCONPROD(const std::optional& alq_type, const UnitSystem& unit_system, const DeckRecord& record) +void Well::WellProductionProperties::handleWCONHIST(const std::optional& alq_type, const UnitSystem& unit_system_arg, const DeckRecord& 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->ResVRate = 0;