From 5c108be7f307d63b66fa60a30952cfc6f7ca8eac 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 VtkPtFlashModule parameters to TypeTag-free parameter
 system

---
 examples/problems/co2ptflashproblem.hh | 10 ++-----
 opm/models/io/vtkptflashmodule.hh      | 39 +++++++-------------------
 opm/models/ptflash/flashmodel.hh       |  3 +-
 3 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/examples/problems/co2ptflashproblem.hh b/examples/problems/co2ptflashproblem.hh
index 0926c9091..ed6b332d0 100644
--- a/examples/problems/co2ptflashproblem.hh
+++ b/examples/problems/co2ptflashproblem.hh
@@ -202,14 +202,6 @@ struct SimulationName<TypeTag, Properties::TTag::CO2PTBaseProblem>
      static constexpr type value = 423.25; // TODO
  };
 
-template <class TypeTag>
-struct VtkWriteEquilibriumConstants<TypeTag, Properties::TTag::CO2PTBaseProblem>
-{ static constexpr bool value = true; };
-
-template <class TypeTag>
-struct VtkWriteLiquidMoleFractions<TypeTag, Properties::TTag::CO2PTBaseProblem>
-{ static constexpr bool value = true; };
-
 } // namespace Opm::Parameters
 
 namespace Opm {
@@ -350,6 +342,8 @@ public:
         Parameters::SetDefault<Parameters::VtkWritePotentialGradients>(true);
         Parameters::SetDefault<Parameters::VtkWriteTotalMassFractions>(true);
         Parameters::SetDefault<Parameters::VtkWriteTotalMoleFractions>(true);
+        Parameters::SetDefault<Parameters::VtkWriteEquilibriumConstants>(true);
+        Parameters::SetDefault<Parameters::VtkWriteLiquidMoleFractions>(true);
     }
 
     /*!
diff --git a/opm/models/io/vtkptflashmodule.hh b/opm/models/io/vtkptflashmodule.hh
index f8b9758c1..cb25f1e0d 100644
--- a/opm/models/io/vtkptflashmodule.hh
+++ b/opm/models/io/vtkptflashmodule.hh
@@ -27,40 +27,21 @@
 #ifndef OPM_VTK_PTFLASH_MODULE_HH
 #define OPM_VTK_PTFLASH_MODULE_HH
 
-#include "vtkmultiwriter.hh"
-#include "baseoutputmodule.hh"
-
 #include <opm/material/common/MathToolbox.hpp>
 
 #include <opm/models/discretization/common/fvbaseparameters.hh>
 
-#include <opm/models/utils/propertysystem.hh>
+#include <opm/models/io/baseoutputmodule.hh>
+#include <opm/models/io/vtkmultiwriter.hh>
+
 #include <opm/models/utils/parametersystem.hh>
-
-namespace Opm::Properties::TTag {
-
-// create new type tag for the VTK PTFlash output
-struct VtkPTFlash {};
-
-} // namespace Opm::Properties::TTag
+#include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Parameters {
 
-// create the property tags needed for the composition module
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteLiquidMoleFractions { using type = Properties::UndefinedProperty; };
-
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteEquilibriumConstants { using type = Properties::UndefinedProperty; };
-
 // set default values for what quantities to output
-template<class TypeTag>
-struct VtkWriteLiquidMoleFractions<TypeTag, Properties::TTag::VtkPTFlash>
-{ static constexpr bool value = false; };
-
-template<class TypeTag>
-struct VtkWriteEquilibriumConstants<TypeTag, Properties::TTag::VtkPTFlash>
-{ static constexpr bool value = false; };
+struct VtkWriteLiquidMoleFractions { static constexpr bool value = false; };
+struct VtkWriteEquilibriumConstants { static constexpr bool value = false; };
 
 } // namespace Opm::Parameters
 
@@ -105,9 +86,9 @@ public:
      */
     static void registerParameters()
     {
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteLiquidMoleFractions>
+        Parameters::Register<Parameters::VtkWriteLiquidMoleFractions>
             ("Include liquid mole fractions (L) in the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteEquilibriumConstants>
+        Parameters::Register<Parameters::VtkWriteEquilibriumConstants>
             ("Include equilibrium constants (K) in the VTK output files");
     }
 
@@ -169,13 +150,13 @@ public:
 private:
     static bool LOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteLiquidMoleFractions>();
+        static bool val = Parameters::Get<Parameters::VtkWriteLiquidMoleFractions>();
         return val;
     }
 
     static bool equilConstOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteEquilibriumConstants>();
+        static bool val = Parameters::Get<Parameters::VtkWriteEquilibriumConstants>();
         return val;
     }
 
diff --git a/opm/models/ptflash/flashmodel.hh b/opm/models/ptflash/flashmodel.hh
index 2a1912090..3d87ba365 100644
--- a/opm/models/ptflash/flashmodel.hh
+++ b/opm/models/ptflash/flashmodel.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<VtkPTFlash,
-                                                    MultiPhaseBaseModel>; };
+struct FlashModel { using InheritsFrom = std::tuple<MultiPhaseBaseModel>; };
 } // namespace TTag
 
 //! Use the FlashLocalResidual function for the flash model