From f97959c72c2ffbaec5f18c553452cefc73ed2e7a 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 VtkDiffusionModule parameters to TypeTag-free parameter
 system

---
 opm/models/blackoil/blackoilmodel.hh |  1 -
 opm/models/flash/flashmodel.hh       |  3 +-
 opm/models/io/vtkdiffusionmodule.hh  | 50 +++++++---------------------
 opm/models/ncp/ncpmodel.hh           |  3 +-
 opm/models/ptflash/flashmodel.hh     |  3 +-
 opm/models/pvs/pvsmodel.hh           |  3 +-
 6 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh
index 7ffc65d07..f8cb9c0fc 100644
--- a/opm/models/blackoil/blackoilmodel.hh
+++ b/opm/models/blackoil/blackoilmodel.hh
@@ -75,7 +75,6 @@ namespace TTag {
 //! The type tag for the black-oil problems
 struct BlackOilModel { using InheritsFrom = std::tuple<VtkComposition,
                                                        VtkBlackOilEnergy,
-                                                       VtkDiffusion,
                                                        VtkBlackOilPolymer,
                                                        VtkBlackOilSolvent,
                                                        VtkBlackOil,
diff --git a/opm/models/flash/flashmodel.hh b/opm/models/flash/flashmodel.hh
index b0d7db9fd..8a8bee384 100644
--- a/opm/models/flash/flashmodel.hh
+++ b/opm/models/flash/flashmodel.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<VtkDiffusion,
-                                                    VtkEnergy,
+struct FlashModel { using InheritsFrom = std::tuple<VtkEnergy,
                                                     VtkComposition,
                                                     MultiPhaseBaseModel>; };
 } // namespace TTag
diff --git a/opm/models/io/vtkdiffusionmodule.hh b/opm/models/io/vtkdiffusionmodule.hh
index 023fd8a27..13bf3912f 100644
--- a/opm/models/io/vtkdiffusionmodule.hh
+++ b/opm/models/io/vtkdiffusionmodule.hh
@@ -28,49 +28,23 @@
 #ifndef EWOMS_VTK_DIFFUSION_MODULE_HH
 #define EWOMS_VTK_DIFFUSION_MODULE_HH
 
-#include "vtkmultiwriter.hh"
-#include "baseoutputmodule.hh"
-
 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/material/densead/Math.hpp>
 
 #include <opm/models/discretization/common/fvbaseparameters.hh>
 
+#include <opm/models/io/baseoutputmodule.hh>
+#include <opm/models/io/vtkmultiwriter.hh>
+
 #include <opm/models/utils/propertysystem.hh>
 #include <opm/models/utils/parametersystem.hh>
 
-namespace Opm::Properties::TTag {
-
-// create new type tag for the VTK output of the quantities for molecular
-// diffusion
-struct VtkDiffusion {};
-
-} // namespace Opm::Properties::TTag
-
 namespace Opm::Parameters {
 
-// create the property tags needed for the diffusion module
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteTortuosities { using type = Properties::UndefinedProperty; };
-
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteDiffusionCoefficients { using type = Properties::UndefinedProperty; };
-
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteEffectiveDiffusionCoefficients { using type = Properties::UndefinedProperty; };
-
 // set default values for what quantities to output
-template<class TypeTag>
-struct VtkWriteTortuosities<TypeTag, Properties::TTag::VtkDiffusion>
-{ static constexpr bool value = false; };
-
-template<class TypeTag>
-struct VtkWriteDiffusionCoefficients<TypeTag, Properties::TTag::VtkDiffusion>
-{ static constexpr bool value = false; };
-
-template<class TypeTag>
-struct VtkWriteEffectiveDiffusionCoefficients<TypeTag, Properties::TTag::VtkDiffusion>
-{ static constexpr bool value = false; };
+struct VtkWriteTortuosities { static constexpr bool value = false; };
+struct VtkWriteDiffusionCoefficients { static constexpr bool value = false; };
+struct VtkWriteEffectiveDiffusionCoefficients { static constexpr bool value = false; };
 
 } // namespace Opm::Parameters
 
@@ -117,12 +91,12 @@ public:
      */
     static void registerParameters()
     {
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteTortuosities>
+        Parameters::Register<Parameters::VtkWriteTortuosities>
             ("Include the tortuosity for each phase in the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteDiffusionCoefficients>
+        Parameters::Register<Parameters::VtkWriteDiffusionCoefficients>
             ("Include the molecular diffusion coefficients in "
              "the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteEffectiveDiffusionCoefficients>
+        Parameters::Register<Parameters::VtkWriteEffectiveDiffusionCoefficients>
             ("Include the effective molecular diffusion "
              "coefficients the medium in the VTK output files");
     }
@@ -194,19 +168,19 @@ public:
 private:
     static bool tortuosityOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteTortuosities>();
+        static bool val = Parameters::Get<Parameters::VtkWriteTortuosities>();
         return val;
     }
 
     static bool diffusionCoefficientOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteDiffusionCoefficients>();
+        static bool val = Parameters::Get<Parameters::VtkWriteDiffusionCoefficients>();
         return val;
     }
 
     static bool effectiveDiffusionCoefficientOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteEffectiveDiffusionCoefficients>();
+        static bool val = Parameters::Get<Parameters::VtkWriteEffectiveDiffusionCoefficients>();
         return val;
     }
 
diff --git a/opm/models/ncp/ncpmodel.hh b/opm/models/ncp/ncpmodel.hh
index 3bf0cc8b0..45d14a14e 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<VtkDiffusion,
-                                                  VtkEnergy,
+struct NcpModel { using InheritsFrom = std::tuple<VtkEnergy,
                                                   VtkComposition,
                                                   MultiPhaseBaseModel>; };
 } // namespace TTag
diff --git a/opm/models/ptflash/flashmodel.hh b/opm/models/ptflash/flashmodel.hh
index 279be8d06..65d188a62 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<VtkDiffusion,
-                                                    VtkEnergy,
+struct FlashModel { using InheritsFrom = std::tuple<VtkEnergy,
                                                     VtkComposition,
                                                     VtkPTFlash,
                                                     MultiPhaseBaseModel>; };
diff --git a/opm/models/pvs/pvsmodel.hh b/opm/models/pvs/pvsmodel.hh
index f220dc47b..aa59b9d9c 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<VtkDiffusion,
-                                    VtkEnergy,
+    using InheritsFrom = std::tuple<VtkEnergy,
                                     VtkComposition,
                                     VtkPhasePresence,
                                     MultiPhaseBaseModel>; };