From 58bb7da544a829965287591349b7d0ad05fd6891 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 28 Jun 2024 12:17:13 +0200
Subject: [PATCH 1/6] changed: VtkMultiPhaseModule parameters moved to
 Opm::Parameters namespace

---
 opm/simulators/flow/FlowMain.hpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp
index 3ae346498..cfb7a914e 100644
--- a/opm/simulators/flow/FlowMain.hpp
+++ b/opm/simulators/flow/FlowMain.hpp
@@ -165,32 +165,32 @@ namespace Opm {
                 Parameters::hideParam<TypeTag, Properties::VtkWriteOilFormationVolumeFactor>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteOilSaturationPressure>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteOilVaporizationFactor>();
-                Parameters::hideParam<TypeTag, Properties::VtkWritePorosity>();
-                Parameters::hideParam<TypeTag, Properties::VtkWritePotentialGradients>();
-                Parameters::hideParam<TypeTag, Properties::VtkWritePressures>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWritePorosity>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWritePotentialGradients>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWritePressures>();
                 Parameters::hideParam<TypeTag, Properties::VtkWritePrimaryVars>();
                 Parameters::hideParam<TypeTag, Properties::VtkWritePrimaryVarsMeaning>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteProcessRank>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteRelativePermeabilities>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteRelativePermeabilities>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteSaturatedGasOilVaporizationFactor>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteSaturatedOilGasDissolutionFactor>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteSaturationRatios>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteSaturations>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturations>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteTemperature>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteViscosities>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteViscosities>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteWaterFormationVolumeFactor>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteGasDissolutionFactor>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteGasFormationVolumeFactor>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteGasSaturationPressure>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteIntrinsicPermeabilities>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteIntrinsicPermeabilities>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteTracerConcentration>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteExtrusionFactor>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteFilterVelocities>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteDensities>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteExtrusionFactor>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteFilterVelocities>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteDensities>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteDofIndex>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteMobilities>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteMobilities>();
                 //}
-            Parameters::hideParam<TypeTag, Properties::VtkWriteAverageMolarMasses>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteAverageMolarMasses>();
             Parameters::hideParam<TypeTag, Properties::VtkWriteFugacities>();
             Parameters::hideParam<TypeTag, Properties::VtkWriteFugacityCoeffs>();
             Parameters::hideParam<TypeTag, Properties::VtkWriteMassFractions>();

From 22794f83d137b934041bb2205f789f26655c3031 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 28 Jun 2024 12:17:13 +0200
Subject: [PATCH 2/6] changed: VtkDiffusionModule parameters moved to
 Opm::Parameters namespace

---
 opm/simulators/flow/FlowMain.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp
index cfb7a914e..f10d55415 100644
--- a/opm/simulators/flow/FlowMain.hpp
+++ b/opm/simulators/flow/FlowMain.hpp
@@ -199,9 +199,9 @@ namespace Opm {
             Parameters::hideParam<TypeTag, Properties::VtkWriteTotalMassFractions>();
             Parameters::hideParam<TypeTag, Properties::VtkWriteTotalMoleFractions>();
 
-            Parameters::hideParam<TypeTag, Properties::VtkWriteTortuosities>();
-            Parameters::hideParam<TypeTag, Properties::VtkWriteDiffusionCoefficients>();
-            Parameters::hideParam<TypeTag, Properties::VtkWriteEffectiveDiffusionCoefficients>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteTortuosities>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteDiffusionCoefficients>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteEffectiveDiffusionCoefficients>();
             
             // hide average density option
             Parameters::hideParam<TypeTag, Properties::UseAverageDensityMsWells>();

From 1759d37f892e82ce72ce09732232b64e40bac654 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 28 Jun 2024 12:17:13 +0200
Subject: [PATCH 3/6] changed: VtkBlackoilModule parameters moved to
 Opm::Parameters namespace

---
 opm/simulators/flow/FlowMain.hpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp
index f10d55415..3f66e2a86 100644
--- a/opm/simulators/flow/FlowMain.hpp
+++ b/opm/simulators/flow/FlowMain.hpp
@@ -162,26 +162,26 @@ namespace Opm {
             Parameters::hideParam<TypeTag, Properties::RestartWritingInterval>();
             // hide all vtk related it is not currently possible to do this dependet on if the vtk writing is used
             //if(not(Parameters::get<TypeTag,Properties::EnableVtkOutput>())){
-                Parameters::hideParam<TypeTag, Properties::VtkWriteOilFormationVolumeFactor>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteOilSaturationPressure>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteOilVaporizationFactor>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteOilFormationVolumeFactor>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteOilSaturationPressure>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteOilVaporizationFactor>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWritePorosity>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWritePotentialGradients>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWritePressures>();
                 Parameters::hideParam<TypeTag, Properties::VtkWritePrimaryVars>();
-                Parameters::hideParam<TypeTag, Properties::VtkWritePrimaryVarsMeaning>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWritePrimaryVarsMeaning>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteProcessRank>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteRelativePermeabilities>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteSaturatedGasOilVaporizationFactor>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteSaturatedOilGasDissolutionFactor>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteSaturationRatios>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturatedGasOilVaporizationFactor>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturatedOilGasDissolutionFactor>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturationRatios>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturations>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteTemperature>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteViscosities>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteWaterFormationVolumeFactor>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteGasDissolutionFactor>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteGasFormationVolumeFactor>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteGasSaturationPressure>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteWaterFormationVolumeFactor>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteGasDissolutionFactor>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteGasFormationVolumeFactor>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteGasSaturationPressure>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteIntrinsicPermeabilities>();
                 Parameters::hideParam<TypeTag, Properties::VtkWriteTracerConcentration>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteExtrusionFactor>();

From 825540691cf90b15fa43af90cbece4dd50165390 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 28 Jun 2024 12:17:13 +0200
Subject: [PATCH 4/6] changed: VtkCompositionModule parameters moved to
 Opm::Parameters namespace

---
 opm/simulators/flow/FlowMain.hpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp
index 3f66e2a86..729ae62e0 100644
--- a/opm/simulators/flow/FlowMain.hpp
+++ b/opm/simulators/flow/FlowMain.hpp
@@ -191,13 +191,13 @@ namespace Opm {
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteMobilities>();
                 //}
             Parameters::hideParam<TypeTag, Parameters::VtkWriteAverageMolarMasses>();
-            Parameters::hideParam<TypeTag, Properties::VtkWriteFugacities>();
-            Parameters::hideParam<TypeTag, Properties::VtkWriteFugacityCoeffs>();
-            Parameters::hideParam<TypeTag, Properties::VtkWriteMassFractions>();
-            Parameters::hideParam<TypeTag, Properties::VtkWriteMolarities>();
-            Parameters::hideParam<TypeTag, Properties::VtkWriteMoleFractions>();
-            Parameters::hideParam<TypeTag, Properties::VtkWriteTotalMassFractions>();
-            Parameters::hideParam<TypeTag, Properties::VtkWriteTotalMoleFractions>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteFugacities>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteFugacityCoeffs>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteMassFractions>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteMolarities>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteMoleFractions>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteTotalMassFractions>();
+            Parameters::hideParam<TypeTag, Parameters::VtkWriteTotalMoleFractions>();
 
             Parameters::hideParam<TypeTag, Parameters::VtkWriteTortuosities>();
             Parameters::hideParam<TypeTag, Parameters::VtkWriteDiffusionCoefficients>();

From ec01d7694b51b67af9cf60ca86ded995e9432ada Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 28 Jun 2024 12:17:13 +0200
Subject: [PATCH 5/6] changed: VtkPrimaryVarsModule parameters moved to
 Opm::Parameters namespace

---
 opm/simulators/flow/FlowMain.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp
index 729ae62e0..c96451869 100644
--- a/opm/simulators/flow/FlowMain.hpp
+++ b/opm/simulators/flow/FlowMain.hpp
@@ -168,9 +168,9 @@ namespace Opm {
                 Parameters::hideParam<TypeTag, Parameters::VtkWritePorosity>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWritePotentialGradients>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWritePressures>();
-                Parameters::hideParam<TypeTag, Properties::VtkWritePrimaryVars>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWritePrimaryVars>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWritePrimaryVarsMeaning>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteProcessRank>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteProcessRank>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteRelativePermeabilities>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturatedGasOilVaporizationFactor>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturatedOilGasDissolutionFactor>();
@@ -187,7 +187,7 @@ namespace Opm {
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteExtrusionFactor>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteFilterVelocities>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteDensities>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteDofIndex>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteDofIndex>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteMobilities>();
                 //}
             Parameters::hideParam<TypeTag, Parameters::VtkWriteAverageMolarMasses>();

From c8a372919906b0a9b8e50f0fd98c15db6871137d Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 28 Jun 2024 12:17:13 +0200
Subject: [PATCH 6/6] changed: VtkWriteTemperature parameter moved to
 Opm::Parameters namespace

---
 opm/simulators/flow/FlowMain.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp
index c96451869..f218fa249 100644
--- a/opm/simulators/flow/FlowMain.hpp
+++ b/opm/simulators/flow/FlowMain.hpp
@@ -176,7 +176,7 @@ namespace Opm {
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturatedOilGasDissolutionFactor>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturationRatios>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteSaturations>();
-                Parameters::hideParam<TypeTag, Properties::VtkWriteTemperature>();
+                Parameters::hideParam<TypeTag, Parameters::VtkWriteTemperature>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteViscosities>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteWaterFormationVolumeFactor>();
                 Parameters::hideParam<TypeTag, Parameters::VtkWriteGasDissolutionFactor>();