From 7ab39dd5dae1191835501b6c10cfcccbd54c7cc4 Mon Sep 17 00:00:00 2001 From: OPMUSER Date: Fri, 30 Sep 2022 19:52:18 +0800 Subject: [PATCH] Update NonlinearSolverEbos.hpp This is one of several PRs that will rename some command line parameters for greater consistency, as agreed with Atgeirr in #4096 Here we rename FlowNewtonMinIterations to NewtonMinIterations --- opm/simulators/flow/NonlinearSolverEbos.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opm/simulators/flow/NonlinearSolverEbos.hpp b/opm/simulators/flow/NonlinearSolverEbos.hpp index 71d0e8790..f320cdbdd 100644 --- a/opm/simulators/flow/NonlinearSolverEbos.hpp +++ b/opm/simulators/flow/NonlinearSolverEbos.hpp @@ -49,7 +49,7 @@ struct FlowNewtonMaxIterations { using type = UndefinedProperty; }; template -struct FlowNewtonMinIterations{ +struct NewtonMinIterations{ using type = UndefinedProperty; }; template @@ -67,7 +67,7 @@ struct FlowNewtonMaxIterations { static constexpr int value = 20; }; template -struct FlowNewtonMinIterations { +struct NewtonMinIterations { static constexpr int value = 1; }; template @@ -113,7 +113,7 @@ class WellState; // overload with given parameters relaxMax_ = EWOMS_GET_PARAM(TypeTag, Scalar, NewtonMaxRelax); maxIter_ = EWOMS_GET_PARAM(TypeTag, int, FlowNewtonMaxIterations); - minIter_ = EWOMS_GET_PARAM(TypeTag, int, FlowNewtonMinIterations); + minIter_ = EWOMS_GET_PARAM(TypeTag, int, NewtonMinIterations); const auto& relaxationTypeString = EWOMS_GET_PARAM(TypeTag, std::string, NewtonRelaxationType); if (relaxationTypeString == "dampen") { @@ -129,7 +129,7 @@ class WellState; { EWOMS_REGISTER_PARAM(TypeTag, Scalar, NewtonMaxRelax, "The maximum relaxation factor of a Newton iteration used by flow"); EWOMS_REGISTER_PARAM(TypeTag, int, FlowNewtonMaxIterations, "The maximum number of Newton iterations per time step used by flow"); - EWOMS_REGISTER_PARAM(TypeTag, int, FlowNewtonMinIterations, "The minimum number of Newton iterations per time step used by flow"); + EWOMS_REGISTER_PARAM(TypeTag, int, NewtonMinIterations, "The minimum number of Newton iterations per time step used by flow"); EWOMS_REGISTER_PARAM(TypeTag, std::string, NewtonRelaxationType, "The type of relaxation used by flow's Newton method"); }