From 991f89816e2db55a9deed857c96ebf74bc58e265 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Tue, 6 Feb 2024 08:18:32 +0100
Subject: [PATCH 1/2] rename EclWellModel property to WellModel

---
 ebos/ebos.hh                            | 2 +-
 ebos/eclproblem.hh                      | 8 ++++----
 ebos/eclproblem_properties.hh           | 4 ++--
 opm/simulators/flow/BlackoilModel.hpp   | 2 +-
 opm/simulators/linalg/ISTLSolver.hpp    | 4 ++--
 opm/simulators/linalg/ISTLSolverBda.hpp | 2 +-
 tests/test_equil.cc                     | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ebos/ebos.hh b/ebos/ebos.hh
index 8e429fb7f..9bbe1e684 100644
--- a/ebos/ebos.hh
+++ b/ebos/ebos.hh
@@ -66,7 +66,7 @@ struct EnableExperiments<TypeTag, TTag::EbosTypeTag> {
 
 // use flow's well model for now
 template<class TypeTag>
-struct EclWellModel<TypeTag, TTag::EbosTypeTag> {
+struct WellModel<TypeTag, TTag::EbosTypeTag> {
     using type = BlackoilWellModel<TypeTag>;
 };
 
diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh
index 21907a9e8..afc93e0fe 100644
--- a/ebos/eclproblem.hh
+++ b/ebos/eclproblem.hh
@@ -172,7 +172,7 @@ class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
     using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
     using Indices = GetPropType<TypeTag, Properties::Indices>;
     using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    using EclWellModel = GetPropType<TypeTag, Properties::EclWellModel>;
+    using WellModel = GetPropType<TypeTag, Properties::WellModel>;
     using EclAquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>;
 
     using SolventModule = BlackOilSolventModule<TypeTag>;
@@ -1493,10 +1493,10 @@ public:
      *
      * This can be used for inspecting wells outside of the problem.
      */
-    const EclWellModel& wellModel() const
+    const WellModel& wellModel() const
     { return wellModel_; }
 
-    EclWellModel& wellModel()
+    WellModel& wellModel()
     { return wellModel_; }
 
     const EclAquiferModel& aquiferModel() const
@@ -2771,7 +2771,7 @@ private:
     bool enableDriftCompensation_;
     GlobalEqVector drift_;
 
-    EclWellModel wellModel_;
+    WellModel wellModel_;
     EclAquiferModel aquiferModel_;
 
     bool enableEclOutput_;
diff --git a/ebos/eclproblem_properties.hh b/ebos/eclproblem_properties.hh
index 34c79059d..b34bd84aa 100644
--- a/ebos/eclproblem_properties.hh
+++ b/ebos/eclproblem_properties.hh
@@ -65,9 +65,9 @@ struct EclBaseProblem {
 };
 }
 
-// The class which deals with ECL wells
+// The class which deals with wells
 template<class TypeTag, class MyTypeTag>
-struct EclWellModel {
+struct WellModel {
     using type = UndefinedProperty;
 };
 
diff --git a/opm/simulators/flow/BlackoilModel.hpp b/opm/simulators/flow/BlackoilModel.hpp
index 3d5623bc7..1b8b79331 100644
--- a/opm/simulators/flow/BlackoilModel.hpp
+++ b/opm/simulators/flow/BlackoilModel.hpp
@@ -142,7 +142,7 @@ struct EnableDispersion<TypeTag, TTag::FlowProblem> {
 };
 
 template<class TypeTag>
-struct EclWellModel<TypeTag, TTag::FlowProblem> {
+struct WellModel<TypeTag, TTag::FlowProblem> {
     using type = BlackoilWellModel<TypeTag>;
 };
 template<class TypeTag>
diff --git a/opm/simulators/linalg/ISTLSolver.hpp b/opm/simulators/linalg/ISTLSolver.hpp
index 47f77b6fe..d1cf89697 100644
--- a/opm/simulators/linalg/ISTLSolver.hpp
+++ b/opm/simulators/linalg/ISTLSolver.hpp
@@ -66,7 +66,7 @@ struct FlowIstlSolver {
 }
 
 template <class TypeTag, class MyTypeTag>
-struct EclWellModel;
+struct WellModel;
 
 //! Set the type of a global jacobian matrix for linear solvers that are based on
 //! dune-istl.
@@ -148,7 +148,7 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
         using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
         using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>;
         using Indices = GetPropType<TypeTag, Properties::Indices>;
-        using WellModel = GetPropType<TypeTag, Properties::EclWellModel>;
+        using WellModel = GetPropType<TypeTag, Properties::WellModel>;
         using Simulator = GetPropType<TypeTag, Properties::Simulator>;
         using Matrix = typename SparseMatrixAdapter::IstlMatrix;
         using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
diff --git a/opm/simulators/linalg/ISTLSolverBda.hpp b/opm/simulators/linalg/ISTLSolverBda.hpp
index 5078e6449..cac83aa73 100644
--- a/opm/simulators/linalg/ISTLSolverBda.hpp
+++ b/opm/simulators/linalg/ISTLSolverBda.hpp
@@ -107,7 +107,7 @@ protected:
     using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
     using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>;
     using Indices = GetPropType<TypeTag, Properties::Indices>;
-    using WellModel = GetPropType<TypeTag, Properties::EclWellModel>;
+    using WellModel = GetPropType<TypeTag, Properties::WellModel>;
     using Simulator = GetPropType<TypeTag, Properties::Simulator>;
     using Matrix = typename SparseMatrixAdapter::IstlMatrix;
     using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
diff --git a/tests/test_equil.cc b/tests/test_equil.cc
index f9dc27815..ae3f535bf 100644
--- a/tests/test_equil.cc
+++ b/tests/test_equil.cc
@@ -85,7 +85,7 @@ struct TestEquilVapwatTypeTag {
 }
 
 template<class TypeTag>
-struct EclWellModel<TypeTag, TTag::TestEquilTypeTag> {
+struct WellModel<TypeTag, TTag::TestEquilTypeTag> {
     using type = BlackoilWellModel<TypeTag>;
 };
 template<class TypeTag>
@@ -93,7 +93,7 @@ struct EnableVapwat<TypeTag, TTag::TestEquilTypeTag> {
     static constexpr bool value = true;
 };
 template<class TypeTag>
-struct EclWellModel<TypeTag, TTag::TestEquilVapwatTypeTag> {
+struct WellModel<TypeTag, TTag::TestEquilVapwatTypeTag> {
     using type = BlackoilWellModel<TypeTag>;
 };
 template<class TypeTag>

From 6b0dbfdf2d5702bb0caa49d7c6d944304d01977b Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Tue, 6 Feb 2024 08:18:32 +0100
Subject: [PATCH 2/2] rename EclAquiferModel property to AquiferModel

---
 ebos/ebos.hh                                           | 2 +-
 ebos/eclproblem.hh                                     | 8 ++++----
 ebos/eclproblem_properties.hh                          | 4 ++--
 opm/simulators/flow/BlackoilModel.hpp                  | 2 +-
 opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ebos/ebos.hh b/ebos/ebos.hh
index 9bbe1e684..176dd63e6 100644
--- a/ebos/ebos.hh
+++ b/ebos/ebos.hh
@@ -103,7 +103,7 @@ struct UseVolumetricResidual<TypeTag, TTag::EbosTypeTag> {
 
 // by default use flow's aquifer model for now
 template<class TypeTag>
-struct EclAquiferModel<TypeTag, TTag::EbosTypeTag> {
+struct AquiferModel<TypeTag, TTag::EbosTypeTag> {
     using type = BlackoilAquiferModel<TypeTag>;
 };
 
diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh
index afc93e0fe..da47ae586 100644
--- a/ebos/eclproblem.hh
+++ b/ebos/eclproblem.hh
@@ -173,7 +173,7 @@ class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
     using Indices = GetPropType<TypeTag, Properties::Indices>;
     using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
     using WellModel = GetPropType<TypeTag, Properties::WellModel>;
-    using EclAquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>;
+    using AquiferModel = GetPropType<TypeTag, Properties::AquiferModel>;
 
     using SolventModule = BlackOilSolventModule<TypeTag>;
     using PolymerModule = BlackOilPolymerModule<TypeTag>;
@@ -1499,10 +1499,10 @@ public:
     WellModel& wellModel()
     { return wellModel_; }
 
-    const EclAquiferModel& aquiferModel() const
+    const AquiferModel& aquiferModel() const
     { return aquiferModel_; }
 
-    EclAquiferModel& mutableAquiferModel()
+    AquiferModel& mutableAquiferModel()
     { return aquiferModel_; }
 
     // temporary solution to facilitate output of initial state from flow
@@ -2772,7 +2772,7 @@ private:
     GlobalEqVector drift_;
 
     WellModel wellModel_;
-    EclAquiferModel aquiferModel_;
+    AquiferModel aquiferModel_;
 
     bool enableEclOutput_;
     std::unique_ptr<EclWriterType> eclWriter_;
diff --git a/ebos/eclproblem_properties.hh b/ebos/eclproblem_properties.hh
index b34bd84aa..716ccad33 100644
--- a/ebos/eclproblem_properties.hh
+++ b/ebos/eclproblem_properties.hh
@@ -115,7 +115,7 @@ struct EnableApiTracking {
 
 // The class which deals with ECL aquifers
 template<class TypeTag, class MyTypeTag>
-struct EclAquiferModel {
+struct AquiferModel {
     using type = UndefinedProperty;
 };
 
@@ -241,7 +241,7 @@ public:
 
 // by default use the dummy aquifer "model"
 template<class TypeTag>
-struct EclAquiferModel<TypeTag, TTag::EclBaseProblem> {
+struct AquiferModel<TypeTag, TTag::EclBaseProblem> {
     using type = EclBaseAquiferModel<TypeTag>;
 };
 
diff --git a/opm/simulators/flow/BlackoilModel.hpp b/opm/simulators/flow/BlackoilModel.hpp
index 1b8b79331..56588a9e0 100644
--- a/opm/simulators/flow/BlackoilModel.hpp
+++ b/opm/simulators/flow/BlackoilModel.hpp
@@ -98,7 +98,7 @@ struct UseVolumetricResidual<TypeTag, TTag::FlowProblem> {
 };
 
 template<class TypeTag>
-struct EclAquiferModel<TypeTag, TTag::FlowProblem> {
+struct AquiferModel<TypeTag, TTag::FlowProblem> {
     using type = BlackoilAquiferModel<TypeTag>;
 };
 
diff --git a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
index f85f8feba..6c003897e 100644
--- a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
+++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
@@ -151,7 +151,7 @@ public:
     using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
-    using AquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>;
+    using AquiferModel = GetPropType<TypeTag, Properties::AquiferModel>;
 
     using TimeStepper = AdaptiveTimeStepping<TypeTag>;
     using PolymerModule = BlackOilPolymerModule<TypeTag>;