From 466e26d33045ae6b8129b224b0c2f70396b25cb3 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 28 Jun 2024 12:17:13 +0200
Subject: [PATCH] changed: FlowMain parameters moved to Opm::Parameters
 namespace

---
 opm/simulators/flow/FlowMain.hpp | 47 ++++++++++++++------------------
 opm/simulators/flow/Main.hpp     |  2 +-
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp
index 027af96d8..397454f67 100644
--- a/opm/simulators/flow/FlowMain.hpp
+++ b/opm/simulators/flow/FlowMain.hpp
@@ -41,37 +41,32 @@
 #include <cstddef>
 #include <memory>
 
-namespace Opm::Properties {
+namespace Opm::Parameters {
 
 template<class TypeTag, class MyTypeTag>
-struct EnableDryRun {
-    using type = UndefinedProperty;
-};
+struct EnableDryRun { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct OutputInterval {
-    using type = UndefinedProperty;
-};
+struct OutputInterval { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct EnableLoggingFalloutWarning {
-    using type = UndefinedProperty;
-};
+struct EnableLoggingFalloutWarning { using type = Properties::UndefinedProperty; };
 
 // TODO: enumeration parameters. we use strings for now.
 template<class TypeTag>
-struct EnableDryRun<TypeTag, TTag::FlowProblem> {
-    static constexpr auto value = "auto";
-};
+struct EnableDryRun<TypeTag, Properties::TTag::FlowProblem>
+{ static constexpr auto value = "auto"; };
+
 // Do not merge parallel output files or warn about them
 template<class TypeTag>
-struct EnableLoggingFalloutWarning<TypeTag, TTag::FlowProblem> {
-    static constexpr bool value = false;
-};
-template<class TypeTag>
-struct OutputInterval<TypeTag, TTag::FlowProblem> {
-    static constexpr int value = 1;
-};
+struct EnableLoggingFalloutWarning<TypeTag, Properties::TTag::FlowProblem>
+{ static constexpr bool value = false; };
 
-} // namespace Opm::Properties
+template<class TypeTag>
+struct OutputInterval<TypeTag, Properties::TTag::FlowProblem>
+{ static constexpr int value = 1; };
+
+} // namespace Opm::Parameters
 
 namespace Opm {
 
@@ -114,11 +109,11 @@ namespace Opm {
                 return EXIT_SUCCESS;
             }
             // register the flow specific parameters
-            Parameters::registerParam<TypeTag, Properties::EnableDryRun>
+            Parameters::registerParam<TypeTag, Parameters::EnableDryRun>
                 ("Specify if the simulation ought to be actually run, or just pretended to be");
-            Parameters::registerParam<TypeTag, Properties::OutputInterval>
+            Parameters::registerParam<TypeTag, Parameters::OutputInterval>
                 ("Specify the number of report steps between two consecutive writes of restart data");
-            Parameters::registerParam<TypeTag, Properties::EnableLoggingFalloutWarning>
+            Parameters::registerParam<TypeTag, 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");
 
@@ -421,7 +416,7 @@ namespace Opm {
 
             detail::mergeParallelLogFiles(eclState().getIOConfig().getOutputDir(),
                                           Parameters::get<TypeTag, Properties::EclDeckFileName>(),
-                                          Parameters::get<TypeTag, Properties::EnableLoggingFalloutWarning>());
+                                          Parameters::get<TypeTag, Parameters::EnableLoggingFalloutWarning>());
         }
 
         void setupModelSimulator()
@@ -432,7 +427,7 @@ namespace Opm {
 
             try {
                 // Possible to force initialization only behavior (NOSIM).
-                const std::string& dryRunString = Parameters::get<TypeTag, Properties::EnableDryRun>();
+                const std::string& dryRunString = Parameters::get<TypeTag, Parameters::EnableDryRun>();
                 if (dryRunString != "" && dryRunString != "auto") {
                     bool yesno;
                     if (dryRunString == "true"
diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp
index 372b61c0c..6e1c1da0a 100644
--- a/opm/simulators/flow/Main.hpp
+++ b/opm/simulators/flow/Main.hpp
@@ -417,7 +417,7 @@ private:
                            outputDir,
                            Parameters::get<PreTypeTag, Properties::OutputMode>(),
                            !Parameters::get<PreTypeTag, Parameters::SchedRestart>(),
-                           Parameters::get<PreTypeTag, Properties::EnableLoggingFalloutWarning>(),
+                           Parameters::get<PreTypeTag, Parameters::EnableLoggingFalloutWarning>(),
                            Parameters::get<PreTypeTag, Parameters::ParsingStrictness>(),
                            Parameters::get<PreTypeTag, Parameters::InputSkipMode>(),
                            getNumThreads<PreTypeTag>(),