From 3c92550f742e7cdbe669050a187b7b4506631d5a 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 VtkSolventModule parameters to TypeTag-free parameter
 system

---
 opm/models/blackoil/blackoilmodel.hh      | 54 +++++++++---------
 opm/models/io/vtkblackoilsolventmodule.hh | 67 +++++------------------
 2 files changed, 42 insertions(+), 79 deletions(-)

diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh
index 0c6e32ef3..b3305bd96 100644
--- a/opm/models/blackoil/blackoilmodel.hh
+++ b/opm/models/blackoil/blackoilmodel.hh
@@ -30,51 +30,51 @@
 
 #include <opm/material/densead/Math.hpp>
 
-#include "blackoilproblem.hh"
-#include "blackoilindices.hh"
-#include "blackoiltwophaseindices.hh"
-#include "blackoilextensivequantities.hh"
-#include "blackoilprimaryvariables.hh"
-#include "blackoilintensivequantities.hh"
-#include "blackoilratevector.hh"
-#include "blackoilboundaryratevector.hh"
-#include "blackoillocalresidual.hh"
-#include "blackoilnewtonmethod.hh"
-#include "blackoilproperties.hh"
-#include "blackoilsolventmodules.hh"
-#include "blackoilpolymermodules.hh"
-#include "blackoilfoammodules.hh"
-#include "blackoilbrinemodules.hh"
-#include "blackoilextbomodules.hh"
-#include "blackoildarcyfluxmodule.hh"
-#include "blackoilmicpmodules.hh"
+#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
+
+#include <opm/models/blackoil/blackoilboundaryratevector.hh>
+#include <opm/models/blackoil/blackoilbrinemodules.hh>
+#include <opm/models/blackoil/blackoildarcyfluxmodule.hh>
+#include <opm/models/blackoil/blackoildiffusionmodule.hh>
+#include <opm/models/blackoil/blackoildispersionmodule.hh>
+#include <opm/models/blackoil/blackoilextbomodules.hh>
+#include <opm/models/blackoil/blackoilextensivequantities.hh>
+#include <opm/models/blackoil/blackoilfoammodules.hh>
+#include <opm/models/blackoil/blackoilindices.hh>
+#include <opm/models/blackoil/blackoilintensivequantities.hh>
+#include <opm/models/blackoil/blackoillocalresidual.hh>
+#include <opm/models/blackoil/blackoilmicpmodules.hh>
+#include <opm/models/blackoil/blackoilnewtonmethod.hh>
+#include <opm/models/blackoil/blackoilpolymermodules.hh>
+#include <opm/models/blackoil/blackoilprimaryvariables.hh>
+#include <opm/models/blackoil/blackoilproblem.hh>
+#include <opm/models/blackoil/blackoilproperties.hh>
+#include <opm/models/blackoil/blackoilratevector.hh>
+#include <opm/models/blackoil/blackoilsolventmodules.hh>
+#include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/models/common/multiphasebasemodel.hh>
-#include <opm/models/io/vtkcompositionmodule.hh>
-#include <opm/models/io/vtkblackoilmodule.hh>
-#include "blackoildiffusionmodule.hh"
-#include "blackoildispersionmodule.hh"
-#include <opm/models/io/vtkdiffusionmodule.hh>
 
-#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
+#include <opm/models/io/vtkblackoilmodule.hh>
+#include <opm/models/io/vtkcompositionmodule.hh>
+#include <opm/models/io/vtkdiffusionmodule.hh>
 
 #include <sstream>
 #include <string>
 
 namespace Opm {
+
 template <class TypeTag>
 class BlackOilModel;
 
-template <class TypeTag>
-class EclVanguard;
 }
 
 namespace Opm::Properties {
 
 namespace TTag {
+
 //! The type tag for the black-oil problems
 struct BlackOilModel { using InheritsFrom = std::tuple<VtkBlackOilPolymer,
-                                                       VtkBlackOilSolvent,
                                                        VtkBlackOil,
                                                        MultiPhaseBaseModel,
                                                        VtkBlackOilMICP>; };
diff --git a/opm/models/io/vtkblackoilsolventmodule.hh b/opm/models/io/vtkblackoilsolventmodule.hh
index 3b4c5adea..acb47519a 100644
--- a/opm/models/io/vtkblackoilsolventmodule.hh
+++ b/opm/models/io/vtkblackoilsolventmodule.hh
@@ -41,51 +41,14 @@
 #include <opm/models/utils/parametersystem.hh>
 #include <opm/models/utils/propertysystem.hh>
 
-namespace Opm::Properties::TTag {
-
-// create new type tag for the VTK multi-phase output
-struct VtkBlackOilSolvent {};
-
-} // namespace Opm::Properties::TTag
-
 namespace Opm::Parameters {
 
-// create the property tags needed for the solvent output module
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteSolventSaturation { using type = Properties::UndefinedProperty; };
-
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteSolventRsw { using type = Properties::UndefinedProperty; };
-
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteSolventDensity { using type = Properties::UndefinedProperty; };
-template<class TypeTag, class MyTypeTag>
-
-struct VtkWriteSolventViscosity { using type = Properties::UndefinedProperty; };
-
-template<class TypeTag, class MyTypeTag>
-struct VtkWriteSolventMobility { using type = Properties::UndefinedProperty; };
-
 // set default values for what quantities to output
-template<class TypeTag>
-struct VtkWriteSolventSaturation<TypeTag, Properties::TTag::VtkBlackOilSolvent>
-{ static constexpr bool value = true; };
-
-template<class TypeTag>
-struct VtkWriteSolventRsw<TypeTag, Properties::TTag::VtkBlackOilSolvent>
-{ static constexpr bool value = true; };
-
-template<class TypeTag>
-struct VtkWriteSolventDensity<TypeTag, Properties::TTag::VtkBlackOilSolvent>
-{ static constexpr bool value = true; };
-
-template<class TypeTag>
-struct VtkWriteSolventViscosity<TypeTag, Properties::TTag::VtkBlackOilSolvent>
-{ static constexpr bool value = true; };
-
-template<class TypeTag>
-struct VtkWriteSolventMobility<TypeTag, Properties::TTag::VtkBlackOilSolvent>
-{ static constexpr bool value = true; };
+struct VtkWriteSolventSaturation { static constexpr bool value = true; };
+struct VtkWriteSolventRsw { static constexpr bool value = true; };
+struct VtkWriteSolventDensity { static constexpr bool value = true; };
+struct VtkWriteSolventViscosity { static constexpr bool value = true; };
+struct VtkWriteSolventMobility { static constexpr bool value = true; };
 
 } // namespace Opm::Properties
 
@@ -127,19 +90,19 @@ public:
         if (!enableSolvent)
             return;
 
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteSolventSaturation>
+        Parameters::Register<Parameters::VtkWriteSolventSaturation>
             ("Include the \"saturation\" of the solvent component "
              "in the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteSolventRsw>
+        Parameters::Register<Parameters::VtkWriteSolventRsw>
             ("Include the \"dissolved volume in water\" of the solvent component "
              "in the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteSolventDensity>
+        Parameters::Register<Parameters::VtkWriteSolventDensity>
             ("Include the \"density\" of the solvent component "
              "in the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteSolventViscosity>
+        Parameters::Register<Parameters::VtkWriteSolventViscosity>
             ("Include the \"viscosity\" of the solvent component "
              "in the VTK output files");
-        Parameters::registerParam<TypeTag, Parameters::VtkWriteSolventMobility>
+        Parameters::Register<Parameters::VtkWriteSolventMobility>
             ("Include the \"mobility\" of the solvent component "
              "in the VTK output files");
     }
@@ -240,31 +203,31 @@ public:
 private:
     static bool solventSaturationOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteSolventSaturation>();
+        static bool val = Parameters::Get<Parameters::VtkWriteSolventSaturation>();
         return val;
     }
 
     static bool solventRswOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteSolventRsw>();
+        static bool val = Parameters::Get<Parameters::VtkWriteSolventRsw>();
         return val;
     }
 
     static bool solventDensityOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteSolventDensity>();
+        static bool val = Parameters::Get<Parameters::VtkWriteSolventDensity>();
         return val;
     }
 
     static bool solventViscosityOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteSolventViscosity>();
+        static bool val = Parameters::Get<Parameters::VtkWriteSolventViscosity>();
         return val;
     }
 
     static bool solventMobilityOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteSolventMobility>();
+        static bool val = Parameters::Get<Parameters::VtkWriteSolventMobility>();
         return val;
     }