From 8a67f44793ca214d064447003532f4770ae82a54 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 5 Jul 2024 17:49:51 +0200
Subject: [PATCH] move OutputDir parameter to TypeTag-less implementation

---
 opm/models/discretization/common/fvbasediscretization.hh | 7 +------
 opm/models/discretization/common/fvbaseparameters.hh     | 9 ++++-----
 opm/models/discretization/common/fvbaseproblem.hh        | 2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/opm/models/discretization/common/fvbasediscretization.hh b/opm/models/discretization/common/fvbasediscretization.hh
index d1b1d39fa..190748026 100644
--- a/opm/models/discretization/common/fvbasediscretization.hh
+++ b/opm/models/discretization/common/fvbasediscretization.hh
@@ -356,11 +356,6 @@ struct MinTimeStepSize<TypeTag, Properties::TTag::FvBaseDiscretization>
     static constexpr type value = 0.0;
 };
 
-//! By default, write the simulation output to the current working directory
-template<class TypeTag>
-struct OutputDir<TypeTag, Properties::TTag::FvBaseDiscretization>
-{ static constexpr auto value = "."; };
-
 } // namespace Opm::Parameters
 
 namespace Opm {
@@ -546,7 +541,7 @@ public:
             ("Turn on caching of intensive quantities");
         Parameters::registerParam<TypeTag, Parameters::EnableStorageCache>
             ("Store previous storage terms and avoid re-calculating them.");
-        Parameters::registerParam<TypeTag, Parameters::OutputDir>
+        Parameters::Register<Parameters::OutputDir>
             ("The directory to which result files are written");
     }
 
diff --git a/opm/models/discretization/common/fvbaseparameters.hh b/opm/models/discretization/common/fvbaseparameters.hh
index ed3dd45ba..22dacce31 100644
--- a/opm/models/discretization/common/fvbaseparameters.hh
+++ b/opm/models/discretization/common/fvbaseparameters.hh
@@ -53,14 +53,13 @@ struct EnableAsyncVtkOutput { static constexpr bool value = true; };
  */
 struct EnableGridAdaptation { static constexpr bool value = false; };
 
-//! \brief Number of threads per process.
-struct ThreadsPerProcess { static constexpr int value = 1; };
-
 /*!
  * \brief The directory to which simulation output ought to be written to.
  */
-template<class TypeTag, class MyTypeTag>
-struct OutputDir { using type = Properties::UndefinedProperty; };
+struct OutputDir { static constexpr auto value = ""; };
+
+//! \brief Number of threads per process.
+struct ThreadsPerProcess { static constexpr int value = 1; };
 
 /*!
  * \brief Global switch to enable or disable the writing of VTK output files
diff --git a/opm/models/discretization/common/fvbaseproblem.hh b/opm/models/discretization/common/fvbaseproblem.hh
index ee406456b..d697b0c13 100644
--- a/opm/models/discretization/common/fvbaseproblem.hh
+++ b/opm/models/discretization/common/fvbaseproblem.hh
@@ -204,7 +204,7 @@ public:
      */
     std::string outputDir() const
     {
-        std::string outputDir = Parameters::get<TypeTag, Parameters::OutputDir>();
+        std::string outputDir = Parameters::Get<Parameters::OutputDir>();
 
         if (outputDir.empty())
             outputDir = ".";