OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-11-04 05:06:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed default parameters from constructor

Browse Source
This commit is contained in:
Erik Hide Saeternes committed 2025-06-03 13:55:43 +02:00
1 parent 108c964978
commit 752fba50f7
2 files changed
+17 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/simulators/timestepping/AdaptiveTimeStepping.cpp
+8 -6
View File
@@ -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
};
}},
opm/simulators/timestepping/TimeStepControl.hpp
+9 -7
View File
@@ -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();