OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove duplicate EclEnableTuning parameter

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-06 08:42:59 +01:00 committed by Markus Blatt
parent 780f282ed8
commit e7f32f44e7
5 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebos/eclproblem.hh
View File

@ -238,8 +238,6 @@ public:
if constexpr (enableExperiments)
EWOMS_REGISTER_PARAM(TypeTag, bool, EclEnableAquifers,
"Enable analytic and numeric aquifer models");
EWOMS_REGISTER_PARAM(TypeTag, bool, EclEnableTuning,
"Honor some aspects of the TUNING keyword from the ECL deck.");
EWOMS_REGISTER_PARAM(TypeTag, std::string, OutputMode,
"Specify which messages are going to be printed. Valid values are: none, log, all (default)");
EWOMS_REGISTER_PARAM(TypeTag, int, NumPressurePointsEquil,
@ -327,7 +325,7 @@ public:
else
enableAquifers_ = true;
this->enableTuning_ = EWOMS_GET_PARAM(TypeTag, bool, EclEnableTuning);
this->enableTuning_ = EWOMS_GET_PARAM(TypeTag, bool, EnableTuning);
this->initialTimeStepSize_ = EWOMS_GET_PARAM(TypeTag, Scalar, InitialTimeStepSize);
this->maxTimeStepAfterWellEvent_ = EWOMS_GET_PARAM(TypeTag, double, TimeStepAfterEventInDays)*24*60*60;

11
ebos/eclproblem_properties.hh
View File

@ -125,11 +125,6 @@ struct EclEnableAquifers {
using type = UndefinedProperty;
};
// time stepping parameters
template<class TypeTag, class MyTypeTag>
struct EclEnableTuning {
using type = UndefinedProperty;
};
template<class TypeTag, class MyTypeTag>
struct OutputMode {
using type = UndefinedProperty;
@ -598,12 +593,6 @@ struct EnableExperiments<TypeTag, TTag::EclBaseProblem> {
static constexpr bool value = false;
};
// set defaults for the time stepping parameters
template<class TypeTag>
struct EclEnableTuning<TypeTag, TTag::EclBaseProblem> {
static constexpr bool value = false;
};
template<class TypeTag>
struct OutputMode<TypeTag, TTag::EclBaseProblem> {
static constexpr auto value = "all";

12
ebos/ecltimesteppingparams.hh
View File

@ -32,6 +32,11 @@ namespace TTag {
struct EclTimeSteppingParameters {};
}
template<class TypeTag, class MyTypeTag>
struct EnableTuning {
using type = UndefinedProperty;
};
template<class TypeTag, class MyTypeTag>
struct SolverGrowthFactor {
using type = UndefinedProperty;
@ -62,6 +67,11 @@ struct TimeStepAfterEventInDays {
using type = UndefinedProperty;
};
template<class TypeTag>
struct EnableTuning<TypeTag, TTag::EclTimeSteppingParameters> {
static constexpr bool value = false;
};
template<class TypeTag>
struct SolverGrowthFactor<TypeTag, TTag::EclTimeSteppingParameters> {
using type = GetPropType<TypeTag, Scalar>;
@ -105,6 +115,8 @@ namespace Opm {
template<class TypeTag>
void registerEclTimeSteppingParameters()
{
EWOMS_REGISTER_PARAM(TypeTag, bool, EnableTuning,
"Honor some aspects of the TUNING keyword.");
EWOMS_REGISTER_PARAM(TypeTag, double, SolverGrowthFactor,
"The factor time steps are elongated after a successful substep");
EWOMS_REGISTER_PARAM(TypeTag, double, SolverMaxGrowth,

2
opm/simulators/flow/FlowMain.hpp
View File

@ -164,8 +164,6 @@ void handleExtraConvergenceOutput(SimulatorReport& report,
EWOMS_HIDE_PARAM(TypeTag, MinTimeStepSize);
EWOMS_HIDE_PARAM(TypeTag, PredeterminedTimeStepsFile);
EWOMS_HIDE_PARAM(TypeTag, EclEnableTuning);
// flow also does not use the eWoms Newton method
EWOMS_HIDE_PARAM(TypeTag, NewtonMaxError);
EWOMS_HIDE_PARAM(TypeTag, NewtonTolerance);

10
opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
View File

@ -63,10 +63,6 @@ template<class TypeTag, class MyTypeTag>
struct EnableAdaptiveTimeStepping {
using type = UndefinedProperty;
};
template<class TypeTag, class MyTypeTag>
struct EnableTuning {
using type = UndefinedProperty;
};
template <class TypeTag, class MyTypeTag>
struct OutputExtraConvergenceInfo
@ -106,10 +102,6 @@ template<class TypeTag>
struct EnableAdaptiveTimeStepping<TypeTag, TTag::EclFlowProblem> {
static constexpr bool value = true;
};
template<class TypeTag>
struct EnableTuning<TypeTag, TTag::EclFlowProblem> {
static constexpr bool value = false;
};
template <class TypeTag>
struct OutputExtraConvergenceInfo<TypeTag, TTag::EclFlowProblem>
@ -231,8 +223,6 @@ public:
"Print high-level information about the simulation's progress to the terminal");
EWOMS_REGISTER_PARAM(TypeTag, bool, EnableAdaptiveTimeStepping,
"Use adaptive time stepping between report steps");
EWOMS_REGISTER_PARAM(TypeTag, bool, EnableTuning,
"Honor some aspects of the TUNING keyword.");
EWOMS_REGISTER_PARAM(TypeTag, std::string, OutputExtraConvergenceInfo,
"Provide additional convergence output "
"files for diagnostic purposes. "