From a20cb105726ef44911626c839bfe656b532fd34b Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Sat, 6 Jul 2024 10:22:47 +0200 Subject: [PATCH] InitialTimeStepSize moved to TypeTag-free parameter system --- opm/simulators/flow/FlowMain.hpp | 2 +- opm/simulators/flow/FlowProblem.hpp | 6 +++++- opm/simulators/flow/FlowProblemProperties.hpp | 12 ------------ 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp index 34637de1d..1384aba70 100644 --- a/opm/simulators/flow/FlowMain.hpp +++ b/opm/simulators/flow/FlowMain.hpp @@ -129,7 +129,7 @@ namespace Opm { Parameters::Hide>(); // time stepping is not done by the eWoms code in flow - Parameters::hideParam(); + Parameters::Hide>(); Parameters::hideParam(); Parameters::hideParam(); Parameters::hideParam(); diff --git a/opm/simulators/flow/FlowProblem.hpp b/opm/simulators/flow/FlowProblem.hpp index 40c5265c5..5a2f5b156 100644 --- a/opm/simulators/flow/FlowProblem.hpp +++ b/opm/simulators/flow/FlowProblem.hpp @@ -252,6 +252,10 @@ public: // to exist. (the ECL problem will finish the simulation explicitly // after it simulated the last episode specified in the deck.) Parameters::SetDefault>(1e100); + // 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...) + Parameters::SetDefault>(3600*24); } @@ -325,7 +329,7 @@ public: enableVtkOutput_ = Parameters::get(); this->enableTuning_ = Parameters::get(); - this->initialTimeStepSize_ = Parameters::get(); + this->initialTimeStepSize_ = Parameters::Get>(); this->maxTimeStepAfterWellEvent_ = Parameters::get() * 24 * 60 * 60; // The value N for this parameter is defined in the following order of presedence: diff --git a/opm/simulators/flow/FlowProblemProperties.hpp b/opm/simulators/flow/FlowProblemProperties.hpp index 6e2ae22d0..2c54ba728 100644 --- a/opm/simulators/flow/FlowProblemProperties.hpp +++ b/opm/simulators/flow/FlowProblemProperties.hpp @@ -414,18 +414,6 @@ template struct ExplicitRockCompaction { static constexpr bool value = false; }; -// 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 -struct InitialTimeStepSize -{ - using type = GetPropType; - static constexpr type value = 3600*24; -}; - // the default for the allowed volumetric error for oil per second template struct NewtonTolerance