From 0898f525aa1c0bd97f5f7c134fa1bf76c54e9926 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Wed, 31 Jan 2024 14:14:50 +0100
Subject: [PATCH] NonlinearSolverEbos: rename to NonlinearSolver

---
 CMakeLists_files.cmake                                 |  4 ++--
 opm/simulators/flow/BlackoilModel.hpp                  |  2 +-
 .../{NonlinearSolverEbos.cpp => NonlinearSolver.cpp}   |  2 +-
 .../{NonlinearSolverEbos.hpp => NonlinearSolver.hpp}   | 10 +++++-----
 .../flow/SimulatorFullyImplicitBlackoilEbos.hpp        |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename opm/simulators/flow/{NonlinearSolverEbos.cpp => NonlinearSolver.cpp} (98%)
 rename opm/simulators/flow/{NonlinearSolverEbos.hpp => NonlinearSolver.hpp} (98%)

diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index a48bac1c6..20e8a9cc0 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -49,7 +49,7 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/flow/KeywordValidation.cpp
   opm/simulators/flow/LogOutputHelper.cpp
   opm/simulators/flow/Main.cpp
-  opm/simulators/flow/NonlinearSolverEbos.cpp
+  opm/simulators/flow/NonlinearSolver.cpp
   opm/simulators/flow/RSTConv.cpp
   opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.cpp
   opm/simulators/flow/SimulatorSerializer.cpp
@@ -447,7 +447,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/ExtraConvergenceOutputThread.hpp
   opm/simulators/flow/FlowMainEbos.hpp
   opm/simulators/flow/Main.hpp
-  opm/simulators/flow/NonlinearSolverEbos.hpp
+  opm/simulators/flow/NonlinearSolver.hpp
   opm/simulators/flow/RSTConv.hpp
   opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
   opm/simulators/flow/SimulatorSerializer.hpp
diff --git a/opm/simulators/flow/BlackoilModel.hpp b/opm/simulators/flow/BlackoilModel.hpp
index c9dec7302..408663238 100644
--- a/opm/simulators/flow/BlackoilModel.hpp
+++ b/opm/simulators/flow/BlackoilModel.hpp
@@ -42,7 +42,7 @@
 #include <opm/simulators/flow/BlackoilModelNldd.hpp>
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/flow/countGlobalCells.hpp>
-#include <opm/simulators/flow/NonlinearSolverEbos.hpp>
+#include <opm/simulators/flow/NonlinearSolver.hpp>
 #include <opm/simulators/flow/RSTConv.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>
 #include <opm/simulators/timestepping/ConvergenceReport.hpp>
diff --git a/opm/simulators/flow/NonlinearSolverEbos.cpp b/opm/simulators/flow/NonlinearSolver.cpp
similarity index 98%
rename from opm/simulators/flow/NonlinearSolverEbos.cpp
rename to opm/simulators/flow/NonlinearSolver.cpp
index 60833c164..f12a6eccc 100644
--- a/opm/simulators/flow/NonlinearSolverEbos.cpp
+++ b/opm/simulators/flow/NonlinearSolver.cpp
@@ -18,7 +18,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <config.h>
-#include <opm/simulators/flow/NonlinearSolverEbos.hpp>
+#include <opm/simulators/flow/NonlinearSolver.hpp>
 
 #include <dune/common/fvector.hh>
 #include <dune/istl/bvector.hh>
diff --git a/opm/simulators/flow/NonlinearSolverEbos.hpp b/opm/simulators/flow/NonlinearSolver.hpp
similarity index 98%
rename from opm/simulators/flow/NonlinearSolverEbos.hpp
rename to opm/simulators/flow/NonlinearSolver.hpp
index a3b8e0246..81b11fa2c 100644
--- a/opm/simulators/flow/NonlinearSolverEbos.hpp
+++ b/opm/simulators/flow/NonlinearSolver.hpp
@@ -18,8 +18,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPM_NON_LINEAR_SOLVER_EBOS_HPP
-#define OPM_NON_LINEAR_SOLVER_EBOS_HPP
+#ifndef OPM_NON_LINEAR_SOLVER_HPP
+#define OPM_NON_LINEAR_SOLVER_HPP
 
 #include <opm/simulators/timestepping/SimulatorReport.hpp>
 #include <opm/common/ErrorMacros.hpp>
@@ -106,7 +106,7 @@ void stabilizeNonlinearUpdate(BVector& dx, BVector& dxOld,
     /// A nonlinear solver class suitable for general fully-implicit models,
     /// as well as pressure, transport and sequential models.
     template <class TypeTag, class PhysicalModel>
-    class NonlinearSolverEbos
+    class NonlinearSolver
     {
         using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
@@ -175,7 +175,7 @@ void stabilizeNonlinearUpdate(BVector& dx, BVector& dxOld,
         ///
         /// \param[in]      param   parameters controlling nonlinear process
         /// \param[in, out] model   physical simulation model.
-        NonlinearSolverEbos(const SolverParameters& param,
+        NonlinearSolver(const SolverParameters& param,
                             std::unique_ptr<PhysicalModel> model)
             : param_(param)
             , model_(std::move(model))
@@ -351,4 +351,4 @@ void stabilizeNonlinearUpdate(BVector& dx, BVector& dxOld,
 
 } // namespace Opm
 
-#endif // OPM_NON_LINEAR_SOLVER_EBOS_HPP
+#endif // OPM_NON_LINEAR_SOLVER_HPP
diff --git a/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp b/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
index fb5469157..7d9198124 100644
--- a/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
+++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
@@ -29,7 +29,7 @@
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/flow/ConvergenceOutputConfiguration.hpp>
 #include <opm/simulators/flow/ExtraConvergenceOutputThread.hpp>
-#include <opm/simulators/flow/NonlinearSolverEbos.hpp>
+#include <opm/simulators/flow/NonlinearSolver.hpp>
 #include <opm/simulators/flow/SimulatorSerializer.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>
 #include <opm/simulators/timestepping/ConvergenceReport.hpp>
@@ -171,7 +171,7 @@ public:
     typedef BlackOilMICPModule<TypeTag> MICPModule;
 
     using Model = BlackoilModel<TypeTag>;
-    typedef NonlinearSolverEbos<TypeTag, Model> Solver;
+    using Solver = NonlinearSolver<TypeTag, Model>;
     typedef typename Model::ModelParameters ModelParameters;
     typedef typename Solver::SolverParameters SolverParameters;
     typedef BlackoilWellModel<TypeTag> WellModel;