diff --git a/opm/models/io/vtkblackoilpolymermodule.hh b/opm/models/io/vtkblackoilpolymermodule.hh index 31942f59f..eb7f7f23d 100644 --- a/opm/models/io/vtkblackoilpolymermodule.hh +++ b/opm/models/io/vtkblackoilpolymermodule.hh @@ -50,49 +50,13 @@ struct VtkBlackOilPolymer {}; namespace Opm::Parameters { -// create the property tags needed for the polymer output module -template -struct VtkWritePolymerConcentration { using type = Properties::UndefinedProperty; }; - -template -struct VtkWritePolymerDeadPoreVolume { using type = Properties::UndefinedProperty; }; - -template -struct VtkWritePolymerAdsorption { using type = Properties::UndefinedProperty; }; - -template -struct VtkWritePolymerRockDensity { using type = Properties::UndefinedProperty; }; - -template -struct VtkWritePolymerViscosityCorrection { using type = Properties::UndefinedProperty; }; - -template -struct VtkWriteWaterViscosityCorrection { using type = Properties::UndefinedProperty; }; - // set default values for what quantities to output -template -struct VtkWritePolymerConcentration -{ static constexpr bool value = true; }; - -template -struct VtkWritePolymerDeadPoreVolume -{ static constexpr bool value = true; }; - -template -struct VtkWritePolymerViscosityCorrection -{ static constexpr bool value = true; }; - -template -struct VtkWriteWaterViscosityCorrection -{ static constexpr bool value = true; }; - -template -struct VtkWritePolymerRockDensity -{ static constexpr bool value = true; }; - -template -struct VtkWritePolymerAdsorption -{ static constexpr bool value = true; }; +struct VtkWritePolymerConcentration { static constexpr bool value = true; }; +struct VtkWritePolymerDeadPoreVolume { static constexpr bool value = true; }; +struct VtkWritePolymerViscosityCorrection { static constexpr bool value = true; }; +struct VtkWriteWaterViscosityCorrection { static constexpr bool value = true; }; +struct VtkWritePolymerRockDensity { static constexpr bool value = true; }; +struct VtkWritePolymerAdsorption { static constexpr bool value = true; }; } // namespace Opm::Parameters @@ -134,22 +98,22 @@ public: if (!enablePolymer) return; - Parameters::registerParam + Parameters::Register ("Include the concentration of the polymer component in the water phase " "in the VTK output files"); - Parameters::registerParam + Parameters::Register ("Include the fraction of the \"dead\" pore volume " "in the VTK output files"); - Parameters::registerParam + Parameters::Register ("Include the amount of already adsorbed polymer component" "in the VTK output files"); - Parameters::registerParam + Parameters::Register ("Include the adsorption rate of the polymer component" "in the VTK output files"); - Parameters::registerParam + Parameters::Register ("Include the viscosity correction of the polymer component " "in the VTK output files"); - Parameters::registerParam + Parameters::Register ("Include the viscosity correction of the water component " "due to polymers in the VTK output files"); } @@ -258,37 +222,37 @@ public: private: static bool polymerConcentrationOutput_() { - static bool val = Parameters::get(); + static bool val = Parameters::Get(); return val; } static bool polymerDeadPoreVolumeOutput_() { - static bool val = Parameters::get(); + static bool val = Parameters::Get(); return val; } static bool polymerRockDensityOutput_() { - static bool val = Parameters::get(); + static bool val = Parameters::Get(); return val; } static bool polymerAdsorptionOutput_() { - static bool val = Parameters::get(); + static bool val = Parameters::Get(); return val; } static bool polymerViscosityCorrectionOutput_() { - static bool val = Parameters::get(); + static bool val = Parameters::Get(); return val; } static bool waterViscosityCorrectionOutput_() { - static bool val = Parameters::get(); + static bool val = Parameters::Get(); return val; }