From 752fba50f7d114e4e7e2385aff86f7c736fa52de Mon Sep 17 00:00:00 2001
From: Erik Hide Saeternes <erikhs@simula.no>
Date: Tue, 3 Jun 2025 13:55:43 +0200
Subject: [PATCH] Removed default parameters from constructor

---
 .../timestepping/AdaptiveTimeStepping.cpp        | 14 ++++++++------
 opm/simulators/timestepping/TimeStepControl.hpp  | 16 +++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/opm/simulators/timestepping/AdaptiveTimeStepping.cpp b/opm/simulators/timestepping/AdaptiveTimeStepping.cpp
index f919763f57..a6150bf1b0 100644
--- a/opm/simulators/timestepping/AdaptiveTimeStepping.cpp
+++ b/opm/simulators/timestepping/AdaptiveTimeStepping.cpp
@@ -233,11 +233,12 @@ createController(const UnitSystem& unitSystem)
          }},
         {"general3rdorder",
          [tol]() {
-             const double safetyFactor = Parameters::Get<Parameters::TimeStepControlSafetyFactor>(); // 0.8
-             const bool rejectCompletedStep = Parameters::Get<Parameters::TimeStepControlRejectCompletedStep>(); // false
-             const std::string toleranceTestVersion = Parameters::Get<Parameters::TimeStepControlToleranceTestVersion>(); // "standard"
-             const double maxReductionTimeStep = Parameters::Get<Parameters::TimeStepControlMaxReductionTimeStep>(); // 0.1
-             const std::string parameters = Parameters::Get<Parameters::TimeStepControlParameters>(); // ""
+             const double safetyFactor = Parameters::Get<Parameters::TimeStepControlSafetyFactor>();
+             const bool rejectCompletedStep = Parameters::Get<Parameters::TimeStepControlRejectCompletedStep>();
+             const std::string toleranceTestVersion = Parameters::Get<Parameters::TimeStepControlToleranceTestVersion>();
+             const double maxReductionTimeStep = Parameters::Get<Parameters::TimeStepControlMaxReductionTimeStep>();
+             const std::string parameters = Parameters::Get<Parameters::TimeStepControlParameters>();
+             const bool verbose = Parameters::Get<Parameters::TimeStepVerbosity>();
              return RetVal{
                  TimeStepControlType::General3rdOrder,
                  std::make_unique<General3rdOrderController>(tol,
@@ -245,7 +246,8 @@ createController(const UnitSystem& unitSystem)
                                                              rejectCompletedStep,
                                                              toleranceTestVersion,
                                                              maxReductionTimeStep,
-                                                             parameters),
+                                                             parameters,
+                                                             verbose),
                  false
              };
         }},
diff --git a/opm/simulators/timestepping/TimeStepControl.hpp b/opm/simulators/timestepping/TimeStepControl.hpp
index 005e725e77..e7e5da5a55 100644
--- a/opm/simulators/timestepping/TimeStepControl.hpp
+++ b/opm/simulators/timestepping/TimeStepControl.hpp
@@ -211,13 +211,15 @@ namespace Opm
     public:
         static constexpr TimeStepControlType Type = TimeStepControlType::General3rdOrder;
 
-        General3rdOrderController( const double tolerance = 1e-3,
-                                   const double safetyFactor = 0.8,
-                                   const bool rejectCompletedStep = false,
-                                   const std::string& toleranceTestVersion = "",
-                                   const double maxReductionTimeStep = 0.1,
-                                   const std::string& parameters = "",
-                                   const bool verbose = false);
+        General3rdOrderController() = default;
+
+        General3rdOrderController( const double tolerance,
+                                   const double safetyFactor,
+                                   const bool rejectCompletedStep,
+                                   const std::string& toleranceTestVersion,
+                                   const double maxReductionTimeStep,
+                                   const std::string& parameters,
+                                   const bool verbose);
 
         static General3rdOrderController serializationTestObject();