From b4192b06c36b5ba57040c060e64447ac4834b0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= <hakon.hagland@gmail.com>
Date: Fri, 17 Jan 2025 22:09:23 +0100
Subject: [PATCH] Fix rebase problem

---
 CMakeLists_files.cmake                                 | 7 -------
 opm/simulators/flow/FlowMain.hpp                       | 4 ----
 opm/simulators/flow/Main.cpp                           | 6 +++---
 opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp | 2 --
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index efd0d3f45..4d8cd0c39 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -112,10 +112,6 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/flow/RegionPhasePVAverage.cpp
   opm/simulators/flow/SimulatorConvergenceOutput.cpp
   opm/simulators/flow/SimulatorFullyImplicitBlackoil.cpp
-  opm/simulators/flow/ReservoirCoupling.cpp
-  opm/simulators/flow/ReservoirCouplingMaster.cpp
-  opm/simulators/flow/ReservoirCouplingSlave.cpp
-  opm/simulators/flow/ReservoirCouplingSpawnSlaves.cpp
   opm/simulators/flow/SimulatorReportBanners.cpp
   opm/simulators/flow/SimulatorSerializer.cpp
   opm/simulators/flow/SolutionContainers.cpp
@@ -853,9 +849,6 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/RSTConv.hpp
   opm/simulators/flow/RegionPhasePVAverage.hpp
   opm/simulators/flow/SimulatorConvergenceOutput.hpp
-  opm/simulators/flow/ReservoirCouplingMaster.hpp
-  opm/simulators/flow/ReservoirCouplingSlave.hpp
-  opm/simulators/flow/ReservoirCouplingSpawnSlaves.hpp
   opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
   opm/simulators/flow/SimulatorReportBanners.hpp
   opm/simulators/flow/SimulatorSerializer.hpp
diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp
index f55897636..610b735e5 100644
--- a/opm/simulators/flow/FlowMain.hpp
+++ b/opm/simulators/flow/FlowMain.hpp
@@ -102,10 +102,6 @@ namespace Opm {
             Parameters::Register<Parameters::EnableLoggingFalloutWarning>
                 ("Developer option to see whether logging was on non-root processors. "
                  "In that case it will be appended to the *.DBG or *.PRT files");
-            Parameters::Register<Parameters::Slave>
-                ("Specify if the simulation is a slave simulation in a master-slave simulation");
-            Parameters::Hide<Parameters::Slave>();
-            Simulator::registerParameters();
 
             // register the base parameters
             registerAllParameters_<TypeTag>(/*finalizeRegistration=*/false);
diff --git a/opm/simulators/flow/Main.cpp b/opm/simulators/flow/Main.cpp
index a90aacd78..9ce461cce 100644
--- a/opm/simulators/flow/Main.cpp
+++ b/opm/simulators/flow/Main.cpp
@@ -353,7 +353,7 @@ void Main::setupDamaris(const std::string& outputDir )
     //const auto find_replace_map;
     //const auto find_replace_map = Opm::DamarisOutput::DamarisKeywords<PreTypeTag>(EclGenericVanguard::comm(), outputDir);
     std::map<std::string, std::string> find_replace_map;
-    find_replace_map = Opm::DamarisOutput::getDamarisKeywords<PreTypeTag>(FlowGenericVanguard::comm(), outputDir);
+    find_replace_map = DamarisOutput::getDamarisKeywords(FlowGenericVanguard::comm(), outputDir);
 
     // By default EnableDamarisOutputCollective is true so all simulation results will
     // be written into one single file for each iteration using Parallel HDF5.
@@ -366,9 +366,9 @@ void Main::setupDamaris(const std::string& outputDir )
                                      find_replace_map);
     int is_client;
     MPI_Comm new_comm;
-    // damaris_start() is where the Damaris Server ranks will block, until damaris_stop()
+    // damaris_start() is where the Damaris Server ranks will block, until damaris_stop() 
     // is called from the client ranks
-    int err = damaris_start(&is_client);
+    int err = damaris_start(&is_client);  
     isSimulationRank_ = (is_client > 0);
     if (isSimulationRank_ && err == DAMARIS_OK) {
         damaris_client_comm_get(&new_comm);
diff --git a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
index 8303cc461..4198cc377 100644
--- a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
+++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
@@ -47,8 +47,6 @@
 #include <opm/simulators/flow/ExtraConvergenceOutputThread.hpp>
 #include <opm/simulators/flow/NonlinearSolver.hpp>
 #include <opm/simulators/flow/SimulatorConvergenceOutput.hpp>
-#include <opm/simulators/flow/ReservoirCouplingMaster.hpp>
-#include <opm/simulators/flow/ReservoirCouplingSlave.hpp>
 #include <opm/simulators/flow/SimulatorReportBanners.hpp>
 #include <opm/simulators/flow/SimulatorSerializer.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>