mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
move PredeterminedTimeStepsFile to TypeTag-free parameter system
This commit is contained in:
parent
db62f4d936
commit
6c7f40b786
@ -65,9 +65,8 @@ struct InitialTimeStepSize { using type = Properties::UndefinedProperty; };
|
||||
//! Set a value for the ParameterFile property
|
||||
struct ParameterFile { static constexpr auto value = ""; };
|
||||
|
||||
//! The name of the file with a number of forced time step lengths
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct PredeterminedTimeStepsFile { using type = Properties::UndefinedProperty; };
|
||||
//! By default, do not force any time steps
|
||||
struct PredeterminedTimeStepsFile { static constexpr auto value = ""; };
|
||||
|
||||
/*!
|
||||
* \brief Print all parameters on startup?
|
||||
|
@ -195,11 +195,6 @@ struct InitialTimeStepSize<TypeTag, Properties::TTag::NumericModel>
|
||||
static constexpr type value = -1e35;
|
||||
};
|
||||
|
||||
//! By default, do not force any time steps
|
||||
template<class TypeTag>
|
||||
struct PredeterminedTimeStepsFile<TypeTag, Properties::TTag::NumericModel>
|
||||
{ static constexpr auto value = ""; };
|
||||
|
||||
//! By default, print the values of the run-time parameters on startup
|
||||
template<class TypeTag>
|
||||
struct PrintParameters<TypeTag, Properties::TTag::NumericModel>
|
||||
|
@ -133,7 +133,7 @@ public:
|
||||
timeStepSize_ = Parameters::get<TypeTag, Parameters::InitialTimeStepSize>();
|
||||
assert(timeStepSize_ > 0);
|
||||
const std::string& predetTimeStepFile =
|
||||
Parameters::get<TypeTag, Parameters::PredeterminedTimeStepsFile>();
|
||||
Parameters::Get<Parameters::PredeterminedTimeStepsFile>();
|
||||
if (!predetTimeStepFile.empty()) {
|
||||
std::ifstream is(predetTimeStepFile);
|
||||
while (!is.eof()) {
|
||||
@ -260,7 +260,7 @@ public:
|
||||
("The size of the initial time step [s]");
|
||||
Parameters::registerParam<TypeTag, Parameters::RestartTime>
|
||||
("The simulation time at which a restart should be attempted [s]");
|
||||
Parameters::registerParam<TypeTag, Parameters::PredeterminedTimeStepsFile>
|
||||
Parameters::Register<Parameters::PredeterminedTimeStepsFile>
|
||||
("A file with a list of predetermined time step sizes (one "
|
||||
"time step per line)");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user