From a36d40957bcd6d71db90af386a5c8bb89417b3ca Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Mon, 18 Nov 2024 11:11:19 +0100
Subject: [PATCH] getPrimaryVarsDomain: move to BlackoilWellModelGeneric

---
 opm/simulators/wells/BlackoilWellModel.hpp      |  1 -
 .../wells/BlackoilWellModelGeneric.cpp          | 15 +++++++++++++++
 .../wells/BlackoilWellModelGeneric.hpp          |  1 +
 opm/simulators/wells/BlackoilWellModel_impl.hpp | 17 -----------------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/opm/simulators/wells/BlackoilWellModel.hpp b/opm/simulators/wells/BlackoilWellModel.hpp
index d73e3643c..b6b6c07fd 100644
--- a/opm/simulators/wells/BlackoilWellModel.hpp
+++ b/opm/simulators/wells/BlackoilWellModel.hpp
@@ -387,7 +387,6 @@ template<class Scalar> class WellContributions;
                                 const Domain& domain);
             void updateWellControlsDomain(DeferredLogger& deferred_logger, const Domain& domain);
 
-            std::vector<Scalar> getPrimaryVarsDomain(const int domainIdx) const;
             void setPrimaryVarsDomain(const int domainIdx, const std::vector<Scalar>& vars);
 
             void setupDomains(const std::vector<Domain>& domains);
diff --git a/opm/simulators/wells/BlackoilWellModelGeneric.cpp b/opm/simulators/wells/BlackoilWellModelGeneric.cpp
index 52f21c29c..2d7442bb2 100644
--- a/opm/simulators/wells/BlackoilWellModelGeneric.cpp
+++ b/opm/simulators/wells/BlackoilWellModelGeneric.cpp
@@ -2056,6 +2056,21 @@ logPrimaryVars() const
     OpmLog::debug(os.str());
 }
 
+template<class Scalar>
+std::vector<Scalar>
+BlackoilWellModelGeneric<Scalar>::
+getPrimaryVarsDomain(const int domainIdx) const
+{
+    std::vector<Scalar> ret;
+    for (const auto& well : this->well_container_generic_) {
+        if (this->well_domain_.at(well->name()) == domainIdx) {
+            const auto& pv = well->getPrimaryVars();
+            ret.insert(ret.end(), pv.begin(), pv.end());
+        }
+    }
+    return ret;
+}
+
 template class BlackoilWellModelGeneric<double>;
 
 #if FLOW_INSTANTIATE_FLOAT
diff --git a/opm/simulators/wells/BlackoilWellModelGeneric.hpp b/opm/simulators/wells/BlackoilWellModelGeneric.hpp
index 1c047de1c..eef952567 100644
--- a/opm/simulators/wells/BlackoilWellModelGeneric.hpp
+++ b/opm/simulators/wells/BlackoilWellModelGeneric.hpp
@@ -220,6 +220,7 @@ public:
     bool wasDynamicallyShutThisTimeStep(const std::string& well_name) const;
 
     void logPrimaryVars() const;
+    std::vector<Scalar> getPrimaryVarsDomain(const int domainIdx) const;
 
     template<class Serializer>
     void serializeOp(Serializer& serializer)
diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
index a826abeef..fd06c06d3 100644
--- a/opm/simulators/wells/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -2985,23 +2985,6 @@ namespace Opm {
     }
 
 
-    template <typename TypeTag>
-    std::vector<typename BlackoilWellModel<TypeTag>::Scalar>
-    BlackoilWellModel<TypeTag>::
-    getPrimaryVarsDomain(const int domainIdx) const
-    {
-        std::vector<Scalar> ret;
-        for (const auto& well : well_container_) {
-            if (this->well_domain_.at(well->name()) == domainIdx) {
-                const auto& pv = well->getPrimaryVars();
-                ret.insert(ret.end(), pv.begin(), pv.end());
-            }
-        }
-        return ret;
-    }
-
-
-
     template <typename TypeTag>
     void
     BlackoilWellModel<TypeTag>::