diff --git a/examples/problems/co2ptflashproblem.hh b/examples/problems/co2ptflashproblem.hh index f3ba95765..24c7af475 100644 --- a/examples/problems/co2ptflashproblem.hh +++ b/examples/problems/co2ptflashproblem.hh @@ -200,16 +200,6 @@ struct VtkWriteFugacityCoeffs { static constexpr bool value = true; }; -template -struct VtkWriteLiquidMoleFractions { - static constexpr bool value = true; -}; - -template -struct VtkWriteEquilibriumConstants { - static constexpr bool value = true; -}; - // this is kinds of telling the report step length template struct EpisodeLength { @@ -309,6 +299,14 @@ template struct NewtonMaxIterations { static constexpr int value = 30; }; +template +struct VtkWriteEquilibriumConstants +{ static constexpr bool value = true; }; + +template +struct VtkWriteLiquidMoleFractions +{ static constexpr bool value = true; }; + } // namespace Opm::Parameters namespace Opm { diff --git a/opm/models/io/vtkptflashmodule.hh b/opm/models/io/vtkptflashmodule.hh index 543e63ac2..c0baad6e5 100644 --- a/opm/models/io/vtkptflashmodule.hh +++ b/opm/models/io/vtkptflashmodule.hh @@ -37,28 +37,32 @@ #include #include -namespace Opm::Properties { - -namespace TTag { +namespace Opm::Properties::TTag { // create new type tag for the VTK PTFlash output struct VtkPTFlash {}; -} // namespace TTag +} // namespace Opm::Properties::TTag + +namespace Opm::Parameters { // create the property tags needed for the composition module template -struct VtkWriteLiquidMoleFractions { using type = UndefinedProperty; }; +struct VtkWriteLiquidMoleFractions { using type = Properties::UndefinedProperty; }; + template -struct VtkWriteEquilibriumConstants { using type = UndefinedProperty; }; +struct VtkWriteEquilibriumConstants { using type = Properties::UndefinedProperty; }; // set default values for what quantities to output template -struct VtkWriteLiquidMoleFractions { static constexpr bool value = false; }; -template -struct VtkWriteEquilibriumConstants { static constexpr bool value = false; }; +struct VtkWriteLiquidMoleFractions +{ static constexpr bool value = false; }; -} // namespace Opm::Properties +template +struct VtkWriteEquilibriumConstants +{ static constexpr bool value = false; }; + +} // namespace Opm::Parameters namespace Opm { @@ -101,9 +105,9 @@ public: */ static void registerParameters() { - Parameters::registerParam + Parameters::registerParam ("Include liquid mole fractions (L) in the VTK output files"); - Parameters::registerParam + Parameters::registerParam ("Include equilibrium constants (K) in the VTK output files"); } @@ -164,13 +168,13 @@ public: private: static bool LOutput_() { - static bool val = Parameters::get(); + static bool val = Parameters::get(); return val; } static bool equilConstOutput_() { - static bool val = Parameters::get(); + static bool val = Parameters::get(); return val; }