diff --git a/examples/obstacle_pvs.cpp b/examples/obstacle_pvs.cpp index b07edf293..c5d8a9f94 100644 --- a/examples/obstacle_pvs.cpp +++ b/examples/obstacle_pvs.cpp @@ -48,15 +48,6 @@ struct ObstacleProblem } // namespace Opm::Properties -namespace Opm::Parameters { - -// Verbosity of the PVS model (0=silent, 1=medium, 2=chatty) -template -struct PvsVerbosity -{ static constexpr int value = 1; }; - -} - int main(int argc, char **argv) { using ProblemTypeTag = Opm::Properties::TTag::ObstacleProblem; diff --git a/examples/outflow_pvs.cpp b/examples/outflow_pvs.cpp index 8e7c7cdde..7122dc9cd 100644 --- a/examples/outflow_pvs.cpp +++ b/examples/outflow_pvs.cpp @@ -46,15 +46,6 @@ struct OutflowProblem } // namespace Opm::Properties -namespace Opm::Parameters { - -// Verbosity of the PVS model (0=silent, 1=medium, 2=chatty) -template -struct PvsVerbosity -{ static constexpr int value = 1; }; - -} - int main(int argc, char **argv) { using ProblemTypeTag = Opm::Properties::TTag::OutflowProblem; diff --git a/opm/models/pvs/pvsmodel.hh b/opm/models/pvs/pvsmodel.hh index 00743b43c..f220dc47b 100644 --- a/opm/models/pvs/pvsmodel.hh +++ b/opm/models/pvs/pvsmodel.hh @@ -160,13 +160,7 @@ struct PvsMoleFractionsBaseWeight namespace Opm::Parameters { //! The verbosity of the model (0 -> do not print anything, 2 -> spam stdout a lot) -template -struct PvsVerbosity { using type = Properties::UndefinedProperty; }; - -// set the model to a medium verbosity -template -struct PvsVerbosity -{ static constexpr int value = 1; }; +struct PvsVerbosity { static constexpr int value = 1; }; } // namespace Opm::Parameters @@ -298,7 +292,7 @@ public: PvsModel(Simulator& simulator) : ParentType(simulator) { - verbosity_ = Parameters::get(); + verbosity_ = Parameters::Get(); numSwitched_ = 0; } @@ -319,7 +313,7 @@ public: if (enableEnergy) Opm::VtkEnergyModule::registerParameters(); - Parameters::registerParam + Parameters::Register ("The verbosity level of the primary variable " "switching model"); }