From 8b860aac075b8d958fccfd7e78873e5572998c82 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 VtkEnergyModule parameters to TypeTag-free parameter
 system

---
 opm/models/flash/flashmodel.hh           |  7 ++-
 opm/models/immiscible/immisciblemodel.hh |  2 +-
 opm/models/io/vtkenergymodule.hh         | 61 ++++++------------------
 opm/models/ncp/ncpmodel.hh               |  3 +-
 opm/models/ptflash/flashmodel.hh         |  7 ++-
 opm/models/pvs/pvsmodel.hh               |  3 +-
 6 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/opm/models/flash/flashmodel.hh b/opm/models/flash/flashmodel.hh
index 7a611e566..070bae613 100644
--- a/opm/models/flash/flashmodel.hh
+++ b/opm/models/flash/flashmodel.hh
@@ -32,8 +32,8 @@
 
 #include <opm/material/densead/Math.hpp>
 
-#include <opm/material/fluidmatrixinteractions/NullMaterial.hpp>
 #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
+#include <opm/material/fluidmatrixinteractions/NullMaterial.hpp>
 
 #include <opm/models/common/energymodule.hh>
 #include <opm/models/common/multiphasebasemodel.hh>
@@ -44,8 +44,8 @@
 #include <opm/models/flash/flashintensivequantities.hh>
 #include <opm/models/flash/flashlocalresidual.hh>
 #include <opm/models/flash/flashparameters.hh>
-#include <opm/models/flash/flashproperties.hh>
 #include <opm/models/flash/flashprimaryvariables.hh>
+#include <opm/models/flash/flashproperties.hh>
 #include <opm/models/flash/flashratevector.hh>
 
 #include <opm/models/io/vtkcompositionmodule.hh>
@@ -64,8 +64,7 @@ namespace Opm::Properties {
 
 namespace TTag {
 //! The type tag for the isothermal single phase problems
-struct FlashModel { using InheritsFrom = std::tuple<VtkEnergy,
-                                                    MultiPhaseBaseModel>; };
+struct FlashModel { using InheritsFrom = std::tuple<MultiPhaseBaseModel>; };
 } // namespace TTag
 
 //! Use the FlashLocalResidual function for the flash model
diff --git a/opm/models/immiscible/immisciblemodel.hh b/opm/models/immiscible/immisciblemodel.hh
index 786e35816..c6a1401f2 100644
--- a/opm/models/immiscible/immisciblemodel.hh
+++ b/opm/models/immiscible/immisciblemodel.hh
@@ -60,7 +60,7 @@ namespace Opm::Properties {
 // Create new type tags
 namespace TTag {
 //! The generic type tag for problems using the immiscible multi-phase model
-struct ImmiscibleModel { using InheritsFrom = std::tuple<VtkEnergy, MultiPhaseBaseModel>; };
+struct ImmiscibleModel { using InheritsFrom = std::tuple<MultiPhaseBaseModel>; };
 
 //! The type tag for single-phase immiscible problems
 struct ImmiscibleSinglePhaseModel { using InheritsFrom = std::tuple<ImmiscibleModel>; };
diff --git a/opm/models/io/vtkenergymodule.hh b/opm/models/io/vtkenergymodule.hh
index 411c12798..414d545ce 100644
--- a/opm/models/io/vtkenergymodule.hh
+++ b/opm/models/io/vtkenergymodule.hh
@@ -34,51 +34,18 @@
 
 #include <opm/models/discretization/common/fvbaseparameters.hh>
 
-#include <opm/models/utils/propertysystem.hh>
 #include <opm/models/utils/parametersystem.hh>
-
-namespace Opm::Properties::TTag {
-
-// create new type tag for the VTK energy output
-struct VtkEnergy {};
-
-} // namespace Opm::Properties::TTag
-
+#include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
 
-// create the property tags needed for the energy module
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteInternalEnergies { using type = Properties::UndefinedProperty; };
-
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteEnthalpies { using type = Properties::UndefinedProperty; };
-
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteSolidInternalEnergy { using type = Properties::UndefinedProperty; };
-
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteThermalConductivity { using type = Properties::UndefinedProperty; };
-
-
 // set default values for what quantities to output
-template<class TypeTag>
-struct VtkWriteSolidInternalEnergy<TypeTag, Properties::TTag::VtkEnergy>
-{ static constexpr bool value = false; };
+struct VtkWriteSolidInternalEnergy { static constexpr bool value = false; };
+struct VtkWriteThermalConductivity { static constexpr bool value = false; };
+struct VtkWriteInternalEnergies { static constexpr bool value = false; };
+struct VtkWriteEnthalpies { static constexpr bool value = false; };
 
-template<class TypeTag>
-struct VtkWriteThermalConductivity<TypeTag, Properties::TTag::VtkEnergy>
-{ static constexpr bool value = false; };
-
-template<class TypeTag>
-struct VtkWriteInternalEnergies<TypeTag, Properties::TTag::VtkEnergy>
-{ static constexpr bool value = false; };
-
-template<class TypeTag>
-struct VtkWriteEnthalpies<TypeTag, Properties::TTag::VtkEnergy>
-{ static constexpr bool value = false; };
-
-} // namespace Opm::Properties
+} // namespace Opm::Parameters
 
 namespace Opm {
 /*!
@@ -125,16 +92,16 @@ public:
      */
     static void registerParameters()
     {
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteSolidInternalEnergy>
+        Parameters::Register<Parameters::VtkWriteSolidInternalEnergy>
             ("Include the volumetric internal energy of solid"
              "matrix in the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteThermalConductivity>
+        Parameters::Register<Parameters::VtkWriteThermalConductivity>
             ("Include the total thermal conductivity of the"
              "medium in the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteEnthalpies>
+        Parameters::Register<Parameters::VtkWriteEnthalpies>
             ("Include the specific enthalpy of the phases in "
              "the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteInternalEnergies>
+        Parameters::Register<Parameters::VtkWriteInternalEnergies>
             ("Include the specific internal energy of the "
              "phases in the VTK output files");
     }
@@ -209,25 +176,25 @@ public:
 private:
     static bool solidInternalEnergyOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteSolidInternalEnergy>();
+        static bool val = Parameters::Get<Parameters::VtkWriteSolidInternalEnergy>();
         return val;
     }
 
     static bool thermalConductivityOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteThermalConductivity>();
+        static bool val = Parameters::Get<Parameters::VtkWriteThermalConductivity>();
         return val;
     }
 
     static bool enthalpyOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteEnthalpies>();
+        static bool val = Parameters::Get<Parameters::VtkWriteEnthalpies>();
         return val;
     }
 
     static bool internalEnergyOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteInternalEnergies>();
+        static bool val = Parameters::Get<Parameters::VtkWriteInternalEnergies>();
         return val;
     }
 
diff --git a/opm/models/ncp/ncpmodel.hh b/opm/models/ncp/ncpmodel.hh
index d736ba40f..4dbaefd4d 100644
--- a/opm/models/ncp/ncpmodel.hh
+++ b/opm/models/ncp/ncpmodel.hh
@@ -69,8 +69,7 @@ namespace TTag {
 /*!
  * \brief Define the type tag for the compositional NCP model.
  */
-struct NcpModel { using InheritsFrom = std::tuple<VtkEnergy,
-                                                  MultiPhaseBaseModel>; };
+struct NcpModel { using InheritsFrom = std::tuple<MultiPhaseBaseModel>; };
 } // namespace TTag
 
 //! Use the Ncp local jacobian operator for the compositional NCP model
diff --git a/opm/models/ptflash/flashmodel.hh b/opm/models/ptflash/flashmodel.hh
index 09309e340..2a1912090 100644
--- a/opm/models/ptflash/flashmodel.hh
+++ b/opm/models/ptflash/flashmodel.hh
@@ -35,13 +35,13 @@
 #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
 #include <opm/material/fluidmatrixinteractions/NullMaterial.hpp>
 
-#include <opm/models/common/multiphasebasemodel.hh>
 #include <opm/models/common/energymodule.hh>
+#include <opm/models/common/multiphasebasemodel.hh>
 
-#include <opm/models/flash/flashratevector.hh>
 #include <opm/models/flash/flashboundaryratevector.hh>
 #include <opm/models/flash/flashextensivequantities.hh>
 #include <opm/models/flash/flashproperties.hh>
+#include <opm/models/flash/flashratevector.hh>
 
 #include <opm/models/io/vtkcompositionmodule.hh>
 #include <opm/models/io/vtkdiffusionmodule.hh>
@@ -69,8 +69,7 @@ namespace Opm::Properties {
 
 namespace TTag {
 //! The type tag for the isothermal single phase problems
-struct FlashModel { using InheritsFrom = std::tuple<VtkEnergy,
-                                                    VtkPTFlash,
+struct FlashModel { using InheritsFrom = std::tuple<VtkPTFlash,
                                                     MultiPhaseBaseModel>; };
 } // namespace TTag
 
diff --git a/opm/models/pvs/pvsmodel.hh b/opm/models/pvs/pvsmodel.hh
index dc96b2a85..ec165efe2 100644
--- a/opm/models/pvs/pvsmodel.hh
+++ b/opm/models/pvs/pvsmodel.hh
@@ -69,8 +69,7 @@ namespace TTag {
 //! The type tag for the isothermal single phase problems
 struct PvsModel
 {
-    using InheritsFrom = std::tuple<VtkEnergy,
-                                    MultiPhaseBaseModel>; };
+    using InheritsFrom = std::tuple<MultiPhaseBaseModel>; };
 } // namespace TTag
 
 //! Use the PVS local jacobian operator for the PVS model