From e388125e6d17f37841d99eb3d0ec76c652f58020 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 VtkTemperatureModule parameters to TypeTag-free
 parameter system

---
 opm/models/common/multiphasebasemodel.hh |  4 +++-
 opm/models/io/vtktemperaturemodule.hh    | 19 +++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/opm/models/common/multiphasebasemodel.hh b/opm/models/common/multiphasebasemodel.hh
index 4032b723d..28df0ba13 100644
--- a/opm/models/common/multiphasebasemodel.hh
+++ b/opm/models/common/multiphasebasemodel.hh
@@ -57,7 +57,9 @@ namespace Opm::Properties {
 //! The generic type tag for problems using the immiscible multi-phase model
 // Create new type tags
 namespace TTag {
-struct MultiPhaseBaseModel { using InheritsFrom = std::tuple<VtkTemperature>; };
+
+struct MultiPhaseBaseModel {};
+
 } // end namespace TTag
 
 //! Specify the splices of the MultiPhaseBaseModel type tag
diff --git a/opm/models/io/vtktemperaturemodule.hh b/opm/models/io/vtktemperaturemodule.hh
index d001569ed..96f25c9f0 100644
--- a/opm/models/io/vtktemperaturemodule.hh
+++ b/opm/models/io/vtktemperaturemodule.hh
@@ -37,23 +37,10 @@
 #include <opm/models/utils/parametersystem.hh>
 #include <opm/models/utils/propertysystem.hh>
 
-namespace Opm::Properties::TTag {
-
-// create new type tag for the VTK temperature output
-struct VtkTemperature {};
-
-} // namespace Opm::Properties::TTag
-
 namespace Opm::Parameters {
 
-// create the property tags needed for the temperature module
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteTemperature { using type = Properties::UndefinedProperty; };
-
 // set default values for what quantities to output
-template<class TypeTag>
-struct VtkWriteTemperature<TypeTag, Properties::TTag::VtkTemperature>
-{ static constexpr bool value = true; };
+struct VtkWriteTemperature { static constexpr bool value = true; };
 
 } // namespace Opm::Parameters
 
@@ -91,7 +78,7 @@ public:
      */
     static void registerParameters()
     {
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteTemperature>
+        Parameters::Register<Parameters::VtkWriteTemperature>
             ("Include the temperature in the VTK output files");
     }
 
@@ -143,7 +130,7 @@ public:
 private:
     static bool temperatureOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteTemperature>();
+        static bool val = Parameters::Get<Parameters::VtkWriteTemperature>();
         return val;
     }