From da41f27e8f0e5a3c28bd9c72d1023da81cdb2512 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Sun, 23 May 2021 13:45:06 +0200
Subject: [PATCH] GasLiftStage2: drop type alias GLiftWellState

---
 opm/simulators/wells/GasLiftStage2.hpp      |  3 +--
 opm/simulators/wells/GasLiftStage2_impl.hpp | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/opm/simulators/wells/GasLiftStage2.hpp b/opm/simulators/wells/GasLiftStage2.hpp
index e05ad948d..c227f3512 100644
--- a/opm/simulators/wells/GasLiftStage2.hpp
+++ b/opm/simulators/wells/GasLiftStage2.hpp
@@ -60,7 +60,6 @@ namespace Opm
         using Simulator = GetPropType<TypeTag, Properties::Simulator>;
         using BlackoilWellModel = ::Opm::BlackoilWellModel<TypeTag>;
         using GasLiftSingleWell = ::Opm::GasLiftSingleWell<TypeTag>;
-        using GLiftWellState = GasLiftWellState;
         using GLiftOptWells = typename BlackoilWellModel::GLiftOptWells;
         using GLiftProdWells = typename BlackoilWellModel::GLiftProdWells;
         using GLiftWellStateMap = typename BlackoilWellModel::GLiftWellStateMap;
@@ -93,7 +92,7 @@ namespace Opm
             GradMap &grad_map, const std::string well_name, bool add);
         std::optional<GradInfo> calcIncOrDecGrad_(
             const std::string name, const GasLiftSingleWell &gs_well, bool increase);
-        bool checkRateAlreadyLimited_(GLiftWellState &state, bool increase);
+        bool checkRateAlreadyLimited_(GasLiftWellState &state, bool increase);
         GradInfo deleteDecGradItem_(const std::string &name);
         GradInfo deleteIncGradItem_(const std::string &name);
         GradInfo deleteGrad_(const std::string &name, bool increase);
diff --git a/opm/simulators/wells/GasLiftStage2_impl.hpp b/opm/simulators/wells/GasLiftStage2_impl.hpp
index 83acf94f2..9e51f321d 100644
--- a/opm/simulators/wells/GasLiftStage2_impl.hpp
+++ b/opm/simulators/wells/GasLiftStage2_impl.hpp
@@ -108,7 +108,7 @@ addOrRemoveALQincrement_(GradMap &grad_map, const std::string well_name, bool ad
     if (it == this->well_state_map_.end())
         return;
 
-    GLiftWellState &state = *(it->second.get());
+    GasLiftWellState &state = *(it->second.get());
     const GradInfo &gi = grad_map.at(well_name);
     if (this->debug_) {
         auto new_alq = gi.alq;
@@ -135,7 +135,7 @@ calcIncOrDecGrad_(
     if(this->well_state_map_.count(well_name) == 0)
         return std::nullopt;
 
-    GLiftWellState &state = *(this->well_state_map_.at(well_name).get());
+    GasLiftWellState &state = *(this->well_state_map_.at(well_name).get());
     if (checkRateAlreadyLimited_(state, increase)) {
         /*
         const std::string msg = fmt::format(
@@ -167,7 +167,7 @@ calcIncOrDecGrad_(
 template<typename TypeTag>
 bool
 GasLiftStage2<TypeTag>::
-checkRateAlreadyLimited_(GLiftWellState &state, bool increase)
+checkRateAlreadyLimited_(GasLiftWellState &state, bool increase)
 {
     auto current_increase = state.increase();
     bool do_check = false;
@@ -354,7 +354,7 @@ getCurrentWellRates_(const std::string &well_name, const std::string &group_name
         GasLiftSingleWell &gs_well = *(this->stage1_wells_.at(well_name).get());
         const WellInterface<TypeTag> &well = gs_well.getStdWell();
         well_ptr = &well;
-        GLiftWellState &state = *(this->well_state_map_.at(well_name).get());
+        GasLiftWellState &state = *(this->well_state_map_.at(well_name).get());
         std::tie(oil_rate, gas_rate) = state.getRates();
         success = true;
         if ( this->debug_) debug_info = "(A)";
@@ -1135,7 +1135,7 @@ updateRates(const std::string &well_name)
     // compute the delta on wells on own rank
     if (this->parent.well_state_map_.count(well_name) > 0) {
         const GradInfo &gi = this->parent.dec_grads_.at(well_name);
-        GLiftWellState &state = *(this->parent.well_state_map_.at(well_name).get());
+        GasLiftWellState &state = *(this->parent.well_state_map_.at(well_name).get());
         GasLiftSingleWell &gs_well = *(this->parent.stage1_wells_.at(well_name).get());
         const WellInterface<TypeTag> &well = gs_well.getStdWell();
         // only get deltas for wells owned by this rank