From 0db393fc070838e3832a3c355204b03557998b9f Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 28 Jun 2024 12:17:13 +0200 Subject: [PATCH 1/6] changed: PrintProperties parameter moved to Opm::Parameters namespace --- opm/simulators/flow/FlowMain.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp index 3793c7b8e..15f781a64 100644 --- a/opm/simulators/flow/FlowMain.hpp +++ b/opm/simulators/flow/FlowMain.hpp @@ -244,7 +244,7 @@ namespace Opm { bool doExit = false; - if (Parameters::get() == 1) { + if (Parameters::get() == 1) { doExit = true; if (mpiRank == 0) Properties::printValues(std::cout); From 1e0f2b61b6eead58a3bf19710bdbae32f573700e Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 28 Jun 2024 12:17:13 +0200 Subject: [PATCH 2/6] changed: PrintParameters parameter moved to Opm::Parameters namespace --- opm/simulators/flow/FlowMain.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp index 15f781a64..7f692d958 100644 --- a/opm/simulators/flow/FlowMain.hpp +++ b/opm/simulators/flow/FlowMain.hpp @@ -250,7 +250,7 @@ namespace Opm { Properties::printValues(std::cout); } - if (Parameters::get() == 1) { + if (Parameters::get() == 1) { doExit = true; if (mpiRank == 0) Parameters::printValues(); From 1f967940f16c8734d3dd1961a07fa9cc3802aec7 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 28 Jun 2024 12:17:13 +0200 Subject: [PATCH 3/6] changed: EndTime parameter moved to Opm::Parameters namespace --- opm/simulators/flow/FlowMain.hpp | 2 +- opm/simulators/flow/FlowProblemProperties.hpp | 33 ++++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp index 7f692d958..fb7c10ae4 100644 --- a/opm/simulators/flow/FlowMain.hpp +++ b/opm/simulators/flow/FlowMain.hpp @@ -141,7 +141,7 @@ namespace Opm { Parameters::hideParam(); // in flow only the deck file determines the end time of the simulation - Parameters::hideParam(); + Parameters::hideParam(); // time stepping is not done by the eWoms code in flow Parameters::hideParam(); diff --git a/opm/simulators/flow/FlowProblemProperties.hpp b/opm/simulators/flow/FlowProblemProperties.hpp index 6587f3e68..d3f29c204 100644 --- a/opm/simulators/flow/FlowProblemProperties.hpp +++ b/opm/simulators/flow/FlowProblemProperties.hpp @@ -268,17 +268,6 @@ struct EnableApiTracking { 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 -struct EndTime { - using type = GetPropType; - 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 @@ -493,11 +482,6 @@ struct ExplicitRockCompaction { namespace Opm::Parameters { -// The default location for the ECL output files -template -struct OutputDir -{ static constexpr auto value = "."; }; - // Disable the VTK output by default for this problem ... template struct EnableVtkOutput @@ -514,6 +498,18 @@ template struct EnableStorageCache { 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 +struct EndTime +{ + using type = GetPropType; + static constexpr type value = 1e100; +}; + // the default for the allowed volumetric error for oil per second template struct NewtonTolerance @@ -522,6 +518,11 @@ struct NewtonTolerance static constexpr type value = 1e-2; }; +// The default location for the ECL output files +template +struct OutputDir +{ static constexpr auto value = "."; }; + } // namespace Opm::Parameters #endif // OPM_FLOW_PROBLEM_PROPERTIES_HPP From b4c6a1a2405bfcc35c1ab36d414d5ea8f7d01d26 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 28 Jun 2024 12:17:13 +0200 Subject: [PATCH 4/6] changed: InitialTimeStepSize parameter moved to Opm::Parameters namespace --- opm/simulators/flow/FlowMain.hpp | 2 +- opm/simulators/flow/FlowProblem.hpp | 2 +- opm/simulators/flow/FlowProblemProperties.hpp | 23 ++++++++++--------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp index fb7c10ae4..7fc9417a4 100644 --- a/opm/simulators/flow/FlowMain.hpp +++ b/opm/simulators/flow/FlowMain.hpp @@ -144,7 +144,7 @@ namespace Opm { Parameters::hideParam(); // time stepping is not done by the eWoms code in flow - Parameters::hideParam(); + Parameters::hideParam(); Parameters::hideParam(); Parameters::hideParam(); Parameters::hideParam(); diff --git a/opm/simulators/flow/FlowProblem.hpp b/opm/simulators/flow/FlowProblem.hpp index e0fc892bb..b676ebd07 100644 --- a/opm/simulators/flow/FlowProblem.hpp +++ b/opm/simulators/flow/FlowProblem.hpp @@ -316,7 +316,7 @@ public: enableEclOutput_ = 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 d3f29c204..adf251a0d 100644 --- a/opm/simulators/flow/FlowProblemProperties.hpp +++ b/opm/simulators/flow/FlowProblemProperties.hpp @@ -268,17 +268,6 @@ struct EnableApiTracking { 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; -}; - // ... but enable the ECL output by default template struct EnableEclOutput { @@ -510,6 +499,18 @@ struct EndTime 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 +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 From dfcf2358fea15088cc2006411427baa40b953b02 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 28 Jun 2024 12:17:13 +0200 Subject: [PATCH 5/6] changed: RestartTime parameter moved to Opm::Parameters namespace --- opm/simulators/flow/FlowMain.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp index 7fc9417a4..20cff3c84 100644 --- a/opm/simulators/flow/FlowMain.hpp +++ b/opm/simulators/flow/FlowMain.hpp @@ -158,7 +158,7 @@ namespace Opm { Parameters::hideParam(); // the default eWoms checkpoint/restart mechanism does not work with flow - Parameters::hideParam(); + Parameters::hideParam(); Parameters::hideParam(); // hide all vtk related it is not currently possible to do this dependet on if the vtk writing is used //if(not(Parameters::get())){ From fb6286d795b2d7ee4c1b0ae0550f0d5dd9463c37 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 28 Jun 2024 12:17:13 +0200 Subject: [PATCH 6/6] changed: PredeterminedTimeStepsFile parameter moved to Opm::Parameters namespace --- opm/simulators/flow/FlowMain.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp index 20cff3c84..5480759ca 100644 --- a/opm/simulators/flow/FlowMain.hpp +++ b/opm/simulators/flow/FlowMain.hpp @@ -148,7 +148,7 @@ namespace Opm { Parameters::hideParam(); Parameters::hideParam(); Parameters::hideParam(); - Parameters::hideParam(); + Parameters::hideParam(); // flow also does not use the eWoms Newton method Parameters::hideParam();