From e7738e70dc9573310ce7cd1a701e234b4a18e033 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Mon, 22 May 2023 10:01:33 +0200
Subject: [PATCH] BlackoilWellModel: move numLocalNonshutWells to generic class

---
 opm/simulators/wells/BlackoilWellModel.hpp        | 2 --
 opm/simulators/wells/BlackoilWellModelGeneric.cpp | 5 +++++
 opm/simulators/wells/BlackoilWellModelGeneric.hpp | 1 +
 opm/simulators/wells/BlackoilWellModel_impl.hpp   | 9 ---------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/opm/simulators/wells/BlackoilWellModel.hpp b/opm/simulators/wells/BlackoilWellModel.hpp
index 183b957cb..981f66ac7 100644
--- a/opm/simulators/wells/BlackoilWellModel.hpp
+++ b/opm/simulators/wells/BlackoilWellModel.hpp
@@ -337,8 +337,6 @@ namespace Opm {
                 return well_container_;
             }
 
-            int numLocalNonshutWells() const;
-
             // prototype for assemble function for ASPIN solveLocal()
             // will try to merge back to assemble() when done prototyping
             void assembleDomain(const int iterationIdx,
diff --git a/opm/simulators/wells/BlackoilWellModelGeneric.cpp b/opm/simulators/wells/BlackoilWellModelGeneric.cpp
index 9cf845324..11ae0b561 100644
--- a/opm/simulators/wells/BlackoilWellModelGeneric.cpp
+++ b/opm/simulators/wells/BlackoilWellModelGeneric.cpp
@@ -1400,4 +1400,9 @@ int BlackoilWellModelGeneric::numLocalWellsEnd() const
     return w.size();
 }
 
+int BlackoilWellModelGeneric::numLocalNonshutWells() const
+{
+    return well_container_generic_.size();
+}
+
 }
diff --git a/opm/simulators/wells/BlackoilWellModelGeneric.hpp b/opm/simulators/wells/BlackoilWellModelGeneric.hpp
index c2a69155f..558c8d431 100644
--- a/opm/simulators/wells/BlackoilWellModelGeneric.hpp
+++ b/opm/simulators/wells/BlackoilWellModelGeneric.hpp
@@ -87,6 +87,7 @@ public:
 
     int numLocalWells() const;
     int numLocalWellsEnd() const;
+    int numLocalNonshutWells() const;
     int numPhases() const;
 
     /// return true if wells are available in the reservoir
diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
index 25a8b47ba..edc87b552 100644
--- a/opm/simulators/wells/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -1485,15 +1485,6 @@ namespace Opm {
     }
 
 
-    template<typename TypeTag>
-    int
-    BlackoilWellModel<TypeTag>::
-    numLocalNonshutWells() const
-    {
-        return well_container_.size();
-    }
-    
-
     template<typename TypeTag>
     void
     BlackoilWellModel<TypeTag>::