move getGuideRateInjectionGroupValues into BlackoilWellModelGuideRates

opm/simulators/wells/BlackoilWellModelGeneric.cpp

@@ -929,26 +929,6 @@ setWsolvent(const Group& group,
     }
 }
 
-data::GuideRateValue
-BlackoilWellModelGeneric::
-getGuideRateInjectionGroupValues(const Group& group) const
-{
-    auto grval = data::GuideRateValue{};
-
-    const auto& gname = group.name();
-    if (this->guideRate_.has(gname, Phase::GAS)) {
-        grval.set(data::GuideRateValue::Item::Gas,
-                  this->guideRate_.getSI(gname, Phase::GAS));
-    }
-
-    if (this->guideRate_.has(gname, Phase::WATER)) {
-        grval.set(data::GuideRateValue::Item::Water,
-                  this->guideRate_.getSI(gname, Phase::WATER));
-    }
-
-    return grval;
-}
-
 void
 BlackoilWellModelGeneric::
 assignWellGuideRates(data::Wells& wsrpt,
@@ -1115,7 +1095,7 @@ calculateAllGroupGuiderates(const int reportStepIdx) const
             this->guideRate_.has(gname, Phase::GAS))
         {
             gr[gname].injection =
-                this->getGuideRateInjectionGroupValues(group);
+                BlackoilWellModelGuideRates(*this).getGuideRateInjectionGroupValues(group);
         }
 
         const auto parent = group.parent();

opm/simulators/wells/BlackoilWellModelGeneric.hpp

@@ -271,8 +271,6 @@ protected:
                            const int pvtreg,
                            std::vector<double>& resv_coeff) = 0;
 
-    data::GuideRateValue getGuideRateInjectionGroupValues(const Group& group) const;
-
     void assignWellGuideRates(data::Wells& wsrpt,
                               const int reportStepIdx) const;
     void assignShutConnections(data::Wells& wsrpt,

opm/simulators/wells/BlackoilWellModelGuideRates.cpp

@@ -113,4 +113,24 @@ getGuideRateValues(const Group& group) const
     return grval;
 }
 
+data::GuideRateValue
+BlackoilWellModelGuideRates::
+getGuideRateInjectionGroupValues(const Group& group) const
+{
+    auto grval = data::GuideRateValue{};
+
+    const auto& gname = group.name();
+    if (wellModel_.guideRate().has(gname, Phase::GAS)) {
+        grval.set(data::GuideRateValue::Item::Gas,
+                  wellModel_.guideRate().getSI(gname, Phase::GAS));
+    }
+
+    if (wellModel_.guideRate().has(gname, Phase::WATER)) {
+        grval.set(data::GuideRateValue::Item::Water,
+                  wellModel_.guideRate().getSI(gname, Phase::WATER));
+    }
+
+    return grval;
+}
+
 }

opm/simulators/wells/BlackoilWellModelGuideRates.hpp

@@ -55,6 +55,9 @@ public:
     //! \brief Obtain guide rate values for group.
     data::GuideRateValue getGuideRateValues(const Group& group) const;
 
+    //! \brief Obtain guide rate values for injection group.
+    data::GuideRateValue getGuideRateInjectionGroupValues(const Group& group) const;
+
 private:
     const BlackoilWellModelGeneric& wellModel_; //!< Reference to well model
 };