From 0bedc4db32dbe3e0892ef1d655812de31c918b5b Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Mon, 1 Jul 2024 14:13:14 +0200
Subject: [PATCH] changed: move the VtkBlackoilModule parameters to
 Opm::Parameters

---
 opm/models/io/vtkblackoilmodule.hh | 130 ++++++++++++++++++-----------
 1 file changed, 81 insertions(+), 49 deletions(-)

diff --git a/opm/models/io/vtkblackoilmodule.hh b/opm/models/io/vtkblackoilmodule.hh
index 0e7d9d761..75ed870cd 100644
--- a/opm/models/io/vtkblackoilmodule.hh
+++ b/opm/models/io/vtkblackoilmodule.hh
@@ -41,63 +41,95 @@
 #include <opm/models/utils/parametersystem.hh>
 #include <opm/models/utils/propertysystem.hh>
 
-namespace Opm::Properties {
-
-namespace TTag {
+namespace Opm::Properties::TTag {
 
 // create new type tag for the VTK multi-phase output
 struct VtkBlackOil {};
 
-} // namespace TTag
+} // namespace Opm::Properties::TTag
+
+namespace Opm::Parameters {
 
 // create the property tags needed for the multi phase module
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteGasDissolutionFactor { using type = UndefinedProperty; };
+struct VtkWriteGasDissolutionFactor { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteOilVaporizationFactor { using type = UndefinedProperty; };
+struct VtkWriteOilVaporizationFactor { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteOilFormationVolumeFactor { using type = UndefinedProperty; };
+struct VtkWriteOilFormationVolumeFactor { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteGasFormationVolumeFactor { using type = UndefinedProperty; };
+struct VtkWriteGasFormationVolumeFactor { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteWaterFormationVolumeFactor { using type = UndefinedProperty; };
+struct VtkWriteWaterFormationVolumeFactor { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteOilSaturationPressure { using type = UndefinedProperty; };
+struct VtkWriteOilSaturationPressure { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteGasSaturationPressure { using type = UndefinedProperty; };
+struct VtkWriteGasSaturationPressure { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteSaturationRatios { using type = UndefinedProperty; };
+struct VtkWriteSaturationRatios { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteSaturatedOilGasDissolutionFactor { using type = UndefinedProperty; };
+struct VtkWriteSaturatedOilGasDissolutionFactor { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWriteSaturatedGasOilVaporizationFactor { using type = UndefinedProperty; };
+struct VtkWriteSaturatedGasOilVaporizationFactor { using type = Properties::UndefinedProperty; };
+
 template<class TypeTag, class MyTypeTag>
-struct VtkWritePrimaryVarsMeaning { using type = UndefinedProperty; };
+struct VtkWritePrimaryVarsMeaning { using type = Properties::UndefinedProperty; };
 
 // set default values for what quantities to output
 template<class TypeTag>
-struct VtkWriteGasDissolutionFactor<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteGasDissolutionFactor<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWriteOilVaporizationFactor<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteOilVaporizationFactor<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWriteOilFormationVolumeFactor<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteOilFormationVolumeFactor<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWriteGasFormationVolumeFactor<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteGasFormationVolumeFactor<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWriteWaterFormationVolumeFactor<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteWaterFormationVolumeFactor<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWriteOilSaturationPressure<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteOilSaturationPressure<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWriteGasSaturationPressure<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteGasSaturationPressure<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWriteSaturationRatios<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteSaturationRatios<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWriteSaturatedOilGasDissolutionFactor<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteSaturatedOilGasDissolutionFactor<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWriteSaturatedGasOilVaporizationFactor<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
+struct VtkWriteSaturatedGasOilVaporizationFactor<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
 template<class TypeTag>
-struct VtkWritePrimaryVarsMeaning<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
-} // namespace Opm::Properties
+struct VtkWritePrimaryVarsMeaning<TypeTag, Properties::TTag::VtkBlackOil>
+{ static constexpr bool value = false; };
+
+} // namespace Opm::Parameters
 
 namespace Opm {
 /*!
@@ -142,36 +174,36 @@ public:
      */
     static void registerParameters()
     {
-        Parameters::registerParam<TypeTag, Properties::VtkWriteGasDissolutionFactor>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteGasDissolutionFactor>
             ("Include the gas dissolution factor (R_s) of the observed oil "
              "in the VTK output files");
-        Parameters::registerParam<TypeTag, Properties::VtkWriteOilVaporizationFactor>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteOilVaporizationFactor>
             ("Include the oil vaporization factor (R_v) of the observed gas "
              "in the VTK output files");
-        Parameters::registerParam<TypeTag, Properties::VtkWriteOilFormationVolumeFactor>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteOilFormationVolumeFactor>
             ("Include the oil formation volume factor (B_o) in the VTK output files");
-        Parameters::registerParam<TypeTag, Properties::VtkWriteGasFormationVolumeFactor>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteGasFormationVolumeFactor>
             ("Include the gas formation volume factor (B_g) in the "
              "VTK output files");
-        Parameters::registerParam<TypeTag, Properties::VtkWriteWaterFormationVolumeFactor>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteWaterFormationVolumeFactor>
             ("Include the water formation volume factor (B_w) in the "
              "VTK output files");
-        Parameters::registerParam<TypeTag, Properties::VtkWriteOilSaturationPressure>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteOilSaturationPressure>
             ("Include the saturation pressure of oil (p_o,sat) in the "
              "VTK output files");
-        Parameters::registerParam<TypeTag, Properties::VtkWriteGasSaturationPressure>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteGasSaturationPressure>
             ("Include the saturation pressure of gas (p_g,sat) in the "
              "VTK output files");
-        Parameters::registerParam<TypeTag, Properties::VtkWriteSaturatedOilGasDissolutionFactor>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteSaturatedOilGasDissolutionFactor>
             ("Include the gas dissolution factor (R_s,sat) of gas saturated "
              "oil in the VTK output files");
-        Parameters::registerParam<TypeTag, Properties::VtkWriteSaturatedGasOilVaporizationFactor>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteSaturatedGasOilVaporizationFactor>
             ("Include the oil vaporization factor (R_v,sat) of oil saturated "
              "gas in the VTK output files");
-        Parameters::registerParam<TypeTag, Properties::VtkWriteSaturationRatios>
+        Parameters::registerParam<TypeTag, Parameters::VtkWriteSaturationRatios>
             ("Write the ratio of the actually and maximum dissolved component of "
              "the mixtures");
-        Parameters::registerParam<TypeTag, Properties::VtkWritePrimaryVarsMeaning>
+        Parameters::registerParam<TypeTag, Parameters::VtkWritePrimaryVarsMeaning>
             ("Include how the primary variables should be interpreted to the "
              "VTK output files");
     }
@@ -345,67 +377,67 @@ public:
 private:
     static bool gasDissolutionFactorOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteGasDissolutionFactor>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteGasDissolutionFactor>();
         return val;
     }
 
     static bool oilVaporizationFactorOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteOilVaporizationFactor>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteOilVaporizationFactor>();
         return val;
     }
 
     static bool oilFormationVolumeFactorOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteOilFormationVolumeFactor>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteOilFormationVolumeFactor>();
         return val;
     }
 
     static bool gasFormationVolumeFactorOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteGasFormationVolumeFactor>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteGasFormationVolumeFactor>();
         return val;
     }
 
     static bool waterFormationVolumeFactorOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteWaterFormationVolumeFactor>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteWaterFormationVolumeFactor>();
         return val;
     }
 
     static bool oilSaturationPressureOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteOilSaturationPressure>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteOilSaturationPressure>();
         return val;
     }
 
     static bool gasSaturationPressureOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteGasSaturationPressure>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteGasSaturationPressure>();
         return val;
     }
 
     static bool saturatedOilGasDissolutionFactorOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteSaturatedOilGasDissolutionFactor>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteSaturatedOilGasDissolutionFactor>();
         return val;
     }
 
     static bool saturatedGasOilVaporizationFactorOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteSaturatedGasOilVaporizationFactor>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteSaturatedGasOilVaporizationFactor>();
         return val;
     }
 
     static bool saturationRatiosOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWriteSaturationRatios>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWriteSaturationRatios>();
         return val;
     }
 
     static bool primaryVarsMeaningOutput_()
     {
-        static bool val = Parameters::get<TypeTag, Properties::VtkWritePrimaryVarsMeaning>();
+        static bool val = Parameters::get<TypeTag, Parameters::VtkWritePrimaryVarsMeaning>();
         return val;
     }