mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
move PvsVerbosity to TypeTag-free parameter system
This commit is contained in:
parent
cbbf1fcc2e
commit
db62f4d936
@ -48,15 +48,6 @@ struct ObstacleProblem
|
|||||||
|
|
||||||
} // namespace Opm::Properties
|
} // namespace Opm::Properties
|
||||||
|
|
||||||
namespace Opm::Parameters {
|
|
||||||
|
|
||||||
// Verbosity of the PVS model (0=silent, 1=medium, 2=chatty)
|
|
||||||
template<class TypeTag>
|
|
||||||
struct PvsVerbosity<TypeTag, Properties::TTag::ObstacleProblem>
|
|
||||||
{ static constexpr int value = 1; };
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
using ProblemTypeTag = Opm::Properties::TTag::ObstacleProblem;
|
using ProblemTypeTag = Opm::Properties::TTag::ObstacleProblem;
|
||||||
|
@ -46,15 +46,6 @@ struct OutflowProblem
|
|||||||
|
|
||||||
} // namespace Opm::Properties
|
} // namespace Opm::Properties
|
||||||
|
|
||||||
namespace Opm::Parameters {
|
|
||||||
|
|
||||||
// Verbosity of the PVS model (0=silent, 1=medium, 2=chatty)
|
|
||||||
template<class TypeTag>
|
|
||||||
struct PvsVerbosity<TypeTag, Properties::TTag::OutflowProblem>
|
|
||||||
{ static constexpr int value = 1; };
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
using ProblemTypeTag = Opm::Properties::TTag::OutflowProblem;
|
using ProblemTypeTag = Opm::Properties::TTag::OutflowProblem;
|
||||||
|
@ -160,13 +160,7 @@ struct PvsMoleFractionsBaseWeight<TypeTag, TTag::PvsModel>
|
|||||||
namespace Opm::Parameters {
|
namespace Opm::Parameters {
|
||||||
|
|
||||||
//! The verbosity of the model (0 -> do not print anything, 2 -> spam stdout a lot)
|
//! The verbosity of the model (0 -> do not print anything, 2 -> spam stdout a lot)
|
||||||
template<class TypeTag, class MyTypeTag>
|
struct PvsVerbosity { static constexpr int value = 1; };
|
||||||
struct PvsVerbosity { using type = Properties::UndefinedProperty; };
|
|
||||||
|
|
||||||
// set the model to a medium verbosity
|
|
||||||
template<class TypeTag>
|
|
||||||
struct PvsVerbosity<TypeTag, Properties::TTag::PvsModel>
|
|
||||||
{ static constexpr int value = 1; };
|
|
||||||
|
|
||||||
} // namespace Opm::Parameters
|
} // namespace Opm::Parameters
|
||||||
|
|
||||||
@ -298,7 +292,7 @@ public:
|
|||||||
PvsModel(Simulator& simulator)
|
PvsModel(Simulator& simulator)
|
||||||
: ParentType(simulator)
|
: ParentType(simulator)
|
||||||
{
|
{
|
||||||
verbosity_ = Parameters::get<TypeTag, Parameters::PvsVerbosity>();
|
verbosity_ = Parameters::Get<Parameters::PvsVerbosity>();
|
||||||
numSwitched_ = 0;
|
numSwitched_ = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -319,7 +313,7 @@ public:
|
|||||||
if (enableEnergy)
|
if (enableEnergy)
|
||||||
Opm::VtkEnergyModule<TypeTag>::registerParameters();
|
Opm::VtkEnergyModule<TypeTag>::registerParameters();
|
||||||
|
|
||||||
Parameters::registerParam<TypeTag, Parameters::PvsVerbosity>
|
Parameters::Register<Parameters::PvsVerbosity>
|
||||||
("The verbosity level of the primary variable "
|
("The verbosity level of the primary variable "
|
||||||
"switching model");
|
"switching model");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user