mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-07-07 04:53:03 -05:00
Merge pull request #5461 from akva2/basicproperties_split_param
basicproperties: split out params
This commit is contained in:
commit
0137bd566c
|
@ -141,14 +141,14 @@ namespace Opm {
|
||||||
Parameters::hideParam<TypeTag, Parameters::EnableThermodynamicHints>();
|
Parameters::hideParam<TypeTag, Parameters::EnableThermodynamicHints>();
|
||||||
|
|
||||||
// in flow only the deck file determines the end time of the simulation
|
// in flow only the deck file determines the end time of the simulation
|
||||||
Parameters::hideParam<TypeTag, Properties::EndTime>();
|
Parameters::hideParam<TypeTag, Parameters::EndTime>();
|
||||||
|
|
||||||
// time stepping is not done by the eWoms code in flow
|
// time stepping is not done by the eWoms code in flow
|
||||||
Parameters::hideParam<TypeTag, Properties::InitialTimeStepSize>();
|
Parameters::hideParam<TypeTag, Parameters::InitialTimeStepSize>();
|
||||||
Parameters::hideParam<TypeTag, Parameters::MaxTimeStepDivisions>();
|
Parameters::hideParam<TypeTag, Parameters::MaxTimeStepDivisions>();
|
||||||
Parameters::hideParam<TypeTag, Parameters::MaxTimeStepSize>();
|
Parameters::hideParam<TypeTag, Parameters::MaxTimeStepSize>();
|
||||||
Parameters::hideParam<TypeTag, Parameters::MinTimeStepSize>();
|
Parameters::hideParam<TypeTag, Parameters::MinTimeStepSize>();
|
||||||
Parameters::hideParam<TypeTag, Properties::PredeterminedTimeStepsFile>();
|
Parameters::hideParam<TypeTag, Parameters::PredeterminedTimeStepsFile>();
|
||||||
|
|
||||||
// flow also does not use the eWoms Newton method
|
// flow also does not use the eWoms Newton method
|
||||||
Parameters::hideParam<TypeTag, Parameters::NewtonMaxError>();
|
Parameters::hideParam<TypeTag, Parameters::NewtonMaxError>();
|
||||||
|
@ -158,7 +158,7 @@ namespace Opm {
|
||||||
Parameters::hideParam<TypeTag, Parameters::NewtonWriteConvergence>();
|
Parameters::hideParam<TypeTag, Parameters::NewtonWriteConvergence>();
|
||||||
|
|
||||||
// the default eWoms checkpoint/restart mechanism does not work with flow
|
// the default eWoms checkpoint/restart mechanism does not work with flow
|
||||||
Parameters::hideParam<TypeTag, Properties::RestartTime>();
|
Parameters::hideParam<TypeTag, Parameters::RestartTime>();
|
||||||
Parameters::hideParam<TypeTag, Properties::RestartWritingInterval>();
|
Parameters::hideParam<TypeTag, Properties::RestartWritingInterval>();
|
||||||
// hide all vtk related it is not currently possible to do this dependet on if the vtk writing is used
|
// hide all vtk related it is not currently possible to do this dependet on if the vtk writing is used
|
||||||
//if(not(Parameters::get<TypeTag,Properties::EnableVtkOutput>())){
|
//if(not(Parameters::get<TypeTag,Properties::EnableVtkOutput>())){
|
||||||
|
@ -244,13 +244,13 @@ namespace Opm {
|
||||||
|
|
||||||
bool doExit = false;
|
bool doExit = false;
|
||||||
|
|
||||||
if (Parameters::get<TypeTag, Properties::PrintProperties>() == 1) {
|
if (Parameters::get<TypeTag, Parameters::PrintProperties>() == 1) {
|
||||||
doExit = true;
|
doExit = true;
|
||||||
if (mpiRank == 0)
|
if (mpiRank == 0)
|
||||||
Properties::printValues<TypeTag>(std::cout);
|
Properties::printValues<TypeTag>(std::cout);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Parameters::get<TypeTag, Properties::PrintParameters>() == 1) {
|
if (Parameters::get<TypeTag, Parameters::PrintParameters>() == 1) {
|
||||||
doExit = true;
|
doExit = true;
|
||||||
if (mpiRank == 0)
|
if (mpiRank == 0)
|
||||||
Parameters::printValues<TypeTag>();
|
Parameters::printValues<TypeTag>();
|
||||||
|
|
|
@ -316,7 +316,7 @@ public:
|
||||||
enableEclOutput_ = Parameters::get<TypeTag, Properties::EnableEclOutput>();
|
enableEclOutput_ = Parameters::get<TypeTag, Properties::EnableEclOutput>();
|
||||||
|
|
||||||
this->enableTuning_ = Parameters::get<TypeTag, Properties::EnableTuning>();
|
this->enableTuning_ = Parameters::get<TypeTag, Properties::EnableTuning>();
|
||||||
this->initialTimeStepSize_ = Parameters::get<TypeTag, Properties::InitialTimeStepSize>();
|
this->initialTimeStepSize_ = Parameters::get<TypeTag, Parameters::InitialTimeStepSize>();
|
||||||
this->maxTimeStepAfterWellEvent_ = Parameters::get<TypeTag, Properties::TimeStepAfterEventInDays>() * 24 * 60 * 60;
|
this->maxTimeStepAfterWellEvent_ = Parameters::get<TypeTag, Properties::TimeStepAfterEventInDays>() * 24 * 60 * 60;
|
||||||
|
|
||||||
// The value N for this parameter is defined in the following order of presedence:
|
// The value N for this parameter is defined in the following order of presedence:
|
||||||
|
|
|
@ -268,28 +268,6 @@ struct EnableApiTracking<TypeTag, TTag::FlowBaseProblem> {
|
||||||
static constexpr bool value = false;
|
static constexpr bool value = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
// The default for the end time of the simulation [s]
|
|
||||||
//
|
|
||||||
// By default, stop it after the universe will probably have stopped
|
|
||||||
// to exist. (the ECL problem will finish the simulation explicitly
|
|
||||||
// after it simulated the last episode specified in the deck.)
|
|
||||||
template<class TypeTag>
|
|
||||||
struct EndTime<TypeTag, TTag::FlowBaseProblem> {
|
|
||||||
using type = GetPropType<TypeTag, Scalar>;
|
|
||||||
static constexpr type value = 1e100;
|
|
||||||
};
|
|
||||||
|
|
||||||
// The default for the initial time step size of the simulation [s].
|
|
||||||
//
|
|
||||||
// The chosen value means that the size of the first time step is the
|
|
||||||
// one of the initial episode (if the length of the initial episode is
|
|
||||||
// not millions of trillions of years, that is...)
|
|
||||||
template<class TypeTag>
|
|
||||||
struct InitialTimeStepSize<TypeTag, TTag::FlowBaseProblem> {
|
|
||||||
using type = GetPropType<TypeTag, Scalar>;
|
|
||||||
static constexpr type value = 3600*24;
|
|
||||||
};
|
|
||||||
|
|
||||||
// ... but enable the ECL output by default
|
// ... but enable the ECL output by default
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct EnableEclOutput<TypeTag,TTag::FlowBaseProblem> {
|
struct EnableEclOutput<TypeTag,TTag::FlowBaseProblem> {
|
||||||
|
@ -493,11 +471,6 @@ struct ExplicitRockCompaction<TypeTag, TTag::FlowBaseProblem> {
|
||||||
|
|
||||||
namespace Opm::Parameters {
|
namespace Opm::Parameters {
|
||||||
|
|
||||||
// The default location for the ECL output files
|
|
||||||
template<class TypeTag>
|
|
||||||
struct OutputDir<TypeTag, Properties::TTag::FlowBaseProblem>
|
|
||||||
{ static constexpr auto value = "."; };
|
|
||||||
|
|
||||||
// Disable the VTK output by default for this problem ...
|
// Disable the VTK output by default for this problem ...
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct EnableVtkOutput<TypeTag, Properties::TTag::FlowBaseProblem>
|
struct EnableVtkOutput<TypeTag, Properties::TTag::FlowBaseProblem>
|
||||||
|
@ -514,6 +487,30 @@ template<class TypeTag>
|
||||||
struct EnableStorageCache<TypeTag, Properties::TTag::FlowBaseProblem>
|
struct EnableStorageCache<TypeTag, Properties::TTag::FlowBaseProblem>
|
||||||
{ static constexpr bool value = true; };
|
{ static constexpr bool value = true; };
|
||||||
|
|
||||||
|
// The default for the end time of the simulation [s]
|
||||||
|
//
|
||||||
|
// By default, stop it after the universe will probably have stopped
|
||||||
|
// to exist. (the ECL problem will finish the simulation explicitly
|
||||||
|
// after it simulated the last episode specified in the deck.)
|
||||||
|
template<class TypeTag>
|
||||||
|
struct EndTime<TypeTag, Properties::TTag::FlowBaseProblem>
|
||||||
|
{
|
||||||
|
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||||
|
static constexpr type value = 1e100;
|
||||||
|
};
|
||||||
|
|
||||||
|
// The default for the initial time step size of the simulation [s].
|
||||||
|
//
|
||||||
|
// The chosen value means that the size of the first time step is the
|
||||||
|
// one of the initial episode (if the length of the initial episode is
|
||||||
|
// not millions of trillions of years, that is...)
|
||||||
|
template<class TypeTag>
|
||||||
|
struct InitialTimeStepSize<TypeTag, Properties::TTag::FlowBaseProblem>
|
||||||
|
{
|
||||||
|
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||||
|
static constexpr type value = 3600*24;
|
||||||
|
};
|
||||||
|
|
||||||
// the default for the allowed volumetric error for oil per second
|
// the default for the allowed volumetric error for oil per second
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct NewtonTolerance<TypeTag, Properties::TTag::FlowBaseProblem>
|
struct NewtonTolerance<TypeTag, Properties::TTag::FlowBaseProblem>
|
||||||
|
@ -522,6 +519,11 @@ struct NewtonTolerance<TypeTag, Properties::TTag::FlowBaseProblem>
|
||||||
static constexpr type value = 1e-2;
|
static constexpr type value = 1e-2;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// The default location for the ECL output files
|
||||||
|
template<class TypeTag>
|
||||||
|
struct OutputDir<TypeTag, Properties::TTag::FlowBaseProblem>
|
||||||
|
{ static constexpr auto value = "."; };
|
||||||
|
|
||||||
} // namespace Opm::Parameters
|
} // namespace Opm::Parameters
|
||||||
|
|
||||||
#endif // OPM_FLOW_PROBLEM_PROPERTIES_HPP
|
#endif // OPM_FLOW_PROBLEM_PROPERTIES_HPP
|
||||||
|
|
Loading…
Reference in New Issue
Block a user