mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
changed: AdaptiveTimeStepping parameters moved to Opm::Parameters namespace
This commit is contained in:
Arne Morten Kvarving
parent
6f7fcb5872
commit
5f5697ff91
@ -47,162 +47,160 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace Opm::Properties {
|
||||
namespace Opm::Properties::TTag {
|
||||
|
||||
namespace TTag {
|
||||
struct FlowTimeSteppingParameters {
|
||||
using InheritsFrom = std::tuple<EclTimeSteppingParameters>;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
namespace Opm::Parameters {
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverContinueOnConvergenceFailure {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct SolverContinueOnConvergenceFailure { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverMaxRestarts {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct SolverMaxRestarts { using type = Properties::UndefinedProperty; };
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct SolverVerbosity {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
|
||||
struct SolverVerbosity { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepVerbosity {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepVerbosity { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct InitialTimeStepInDays {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct InitialTimeStepInDays { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct FullTimeStepInitially {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct FullTimeStepInitially { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControl {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepControl { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlTolerance {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepControlTolerance { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlTargetIterations {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepControlTargetIterations { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlTargetNewtonIterations {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepControlTargetNewtonIterations { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlDecayRate {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepControlDecayRate { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlGrowthRate {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepControlGrowthRate { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlDecayDampingFactor {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepControlDecayDampingFactor { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlGrowthDampingFactor {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepControlGrowthDampingFactor { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct TimeStepControlFileName {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct TimeStepControlFileName { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MinTimeStepBeforeShuttingProblematicWellsInDays {
|
||||
using type = UndefinedProperty;
|
||||
};
|
||||
struct MinTimeStepBeforeShuttingProblematicWellsInDays { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag, class MyTypeTag>
|
||||
struct MinTimeStepBasedOnNewtonIterations {
|
||||
using type = UndefinedProperty;
|
||||
struct MinTimeStepBasedOnNewtonIterations { using type = Properties::UndefinedProperty; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct SolverContinueOnConvergenceFailure<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{ static constexpr bool value = false; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct SolverMaxRestarts<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{ static constexpr int value = 10; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct SolverVerbosity<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{ static constexpr int value = 1; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct TimeStepVerbosity<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{ static constexpr int value = 1; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct InitialTimeStepInDays<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{
|
||||
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||
static constexpr type value = 1.0;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct SolverContinueOnConvergenceFailure<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
static constexpr bool value = false;
|
||||
};
|
||||
struct FullTimeStepInitially<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{ static constexpr bool value = false; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct SolverMaxRestarts<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
static constexpr int value = 10;
|
||||
};
|
||||
struct TimeStepControl<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{ static constexpr auto value = "pid+newtoniteration"; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct SolverVerbosity<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
static constexpr int value = 1;
|
||||
};
|
||||
template<class TypeTag>
|
||||
struct TimeStepVerbosity<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
static constexpr int value = 1;
|
||||
};
|
||||
template<class TypeTag>
|
||||
struct InitialTimeStepInDays<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
using type = GetPropType<TypeTag, Scalar>;
|
||||
static constexpr type value = 1.0;
|
||||
};
|
||||
template<class TypeTag>
|
||||
struct FullTimeStepInitially<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
static constexpr bool value = false;
|
||||
};
|
||||
template<class TypeTag>
|
||||
struct TimeStepControl<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
static constexpr auto value = "pid+newtoniteration";
|
||||
};
|
||||
template<class TypeTag>
|
||||
struct TimeStepControlTolerance<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
using type = GetPropType<TypeTag, Scalar>;
|
||||
struct TimeStepControlTolerance<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{
|
||||
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||
static constexpr type value = 1e-1;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct TimeStepControlTargetIterations<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
static constexpr int value = 30;
|
||||
};
|
||||
struct TimeStepControlTargetIterations<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{ static constexpr int value = 30; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct TimeStepControlTargetNewtonIterations<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
static constexpr int value = 8;
|
||||
};
|
||||
struct TimeStepControlTargetNewtonIterations<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{ static constexpr int value = 8; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct TimeStepControlDecayRate<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
using type = GetPropType<TypeTag, Scalar>;
|
||||
struct TimeStepControlDecayRate<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{
|
||||
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||
static constexpr type value = 0.75;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct TimeStepControlGrowthRate<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
using type = GetPropType<TypeTag, Scalar>;
|
||||
struct TimeStepControlGrowthRate<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{
|
||||
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||
static constexpr type value = 1.25;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct TimeStepControlDecayDampingFactor<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
using type = GetPropType<TypeTag, Scalar>;
|
||||
struct TimeStepControlDecayDampingFactor<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{
|
||||
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||
static constexpr type value = 1.0;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct TimeStepControlGrowthDampingFactor<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
using type = GetPropType<TypeTag, Scalar>;
|
||||
struct TimeStepControlGrowthDampingFactor<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{
|
||||
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||
static constexpr type value = 3.2;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct TimeStepControlFileName<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
static constexpr auto value = "timesteps";
|
||||
};
|
||||
struct TimeStepControlFileName<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{ static constexpr auto value = "timesteps"; };
|
||||
|
||||
template<class TypeTag>
|
||||
struct MinTimeStepBeforeShuttingProblematicWellsInDays<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
using type = GetPropType<TypeTag, Scalar>;
|
||||
struct MinTimeStepBeforeShuttingProblematicWellsInDays<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{
|
||||
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||
static constexpr type value = 0.01;
|
||||
};
|
||||
|
||||
template<class TypeTag>
|
||||
struct MinTimeStepBasedOnNewtonIterations<TypeTag, TTag::FlowTimeSteppingParameters> {
|
||||
using type = GetPropType<TypeTag, Scalar>;
|
||||
struct MinTimeStepBasedOnNewtonIterations<TypeTag, Properties::TTag::FlowTimeSteppingParameters>
|
||||
{
|
||||
using type = GetPropType<TypeTag, Properties::Scalar>;
|
||||
static constexpr type value = 0.0;
|
||||
};
|
||||
|
||||
} // namespace Opm::Properties
|
||||
} // namespace Opm::Parameters
|
||||
|
||||
namespace Opm {
|
||||
|
||||
@ -259,15 +257,15 @@ std::set<std::string> consistentlyFailingWells(const std::vector<StepReport>& sr
|
||||
, maxGrowth_(Parameters::get<TypeTag, Parameters::SolverMaxGrowth>()) // 3.0
|
||||
, maxTimeStep_(Parameters::get<TypeTag, Parameters::SolverMaxTimeStepInDays>() * 24 * 60 * 60) // 365.25
|
||||
, minTimeStep_(unitSystem.to_si(UnitSystem::measure::time, Parameters::get<TypeTag, Parameters::SolverMinTimeStep>())) // 1e-12;
|
||||
, ignoreConvergenceFailure_(Parameters::get<TypeTag, Properties::SolverContinueOnConvergenceFailure>()) // false;
|
||||
, solverRestartMax_(Parameters::get<TypeTag, Properties::SolverMaxRestarts>()) // 10
|
||||
, solverVerbose_(Parameters::get<TypeTag, Properties::SolverVerbosity>() > 0 && terminalOutput) // 2
|
||||
, timestepVerbose_(Parameters::get<TypeTag, Properties::TimeStepVerbosity>() > 0 && terminalOutput) // 2
|
||||
, suggestedNextTimestep_((max_next_tstep <= 0 ? Parameters::get<TypeTag, Properties::InitialTimeStepInDays>() : max_next_tstep) * 24 * 60 * 60) // 1.0
|
||||
, fullTimestepInitially_(Parameters::get<TypeTag, Properties::FullTimeStepInitially>()) // false
|
||||
, ignoreConvergenceFailure_(Parameters::get<TypeTag, Parameters::SolverContinueOnConvergenceFailure>()) // false;
|
||||
, solverRestartMax_(Parameters::get<TypeTag, Parameters::SolverMaxRestarts>()) // 10
|
||||
, solverVerbose_(Parameters::get<TypeTag, Parameters::SolverVerbosity>() > 0 && terminalOutput) // 2
|
||||
, timestepVerbose_(Parameters::get<TypeTag, Parameters::TimeStepVerbosity>() > 0 && terminalOutput) // 2
|
||||
, suggestedNextTimestep_((max_next_tstep <= 0 ? Parameters::get<TypeTag, Parameters::InitialTimeStepInDays>() : max_next_tstep) * 24 * 60 * 60) // 1.0
|
||||
, fullTimestepInitially_(Parameters::get<TypeTag, Parameters::FullTimeStepInitially>()) // false
|
||||
, timestepAfterEvent_(Parameters::get<TypeTag, Parameters::TimeStepAfterEventInDays>() * 24 * 60 * 60) // 1e30
|
||||
, useNewtonIteration_(false)
|
||||
, minTimeStepBeforeShuttingProblematicWells_(Parameters::get<TypeTag, Properties::MinTimeStepBeforeShuttingProblematicWellsInDays>() * unit::day)
|
||||
, minTimeStepBeforeShuttingProblematicWells_(Parameters::get<TypeTag, Parameters::MinTimeStepBeforeShuttingProblematicWellsInDays>() * unit::day)
|
||||
|
||||
{
|
||||
init_(unitSystem);
|
||||
@ -289,14 +287,14 @@ std::set<std::string> consistentlyFailingWells(const std::vector<StepReport>& sr
|
||||
, maxTimeStep_(tuning.TSMAXZ) // 365.25
|
||||
, minTimeStep_(tuning.TSFMIN) // 0.1;
|
||||
, ignoreConvergenceFailure_(true)
|
||||
, solverRestartMax_(Parameters::get<TypeTag, Properties::SolverMaxRestarts>()) // 10
|
||||
, solverVerbose_(Parameters::get<TypeTag, Properties::SolverVerbosity>() > 0 && terminalOutput) // 2
|
||||
, timestepVerbose_(Parameters::get<TypeTag, Properties::TimeStepVerbosity>() > 0 && terminalOutput) // 2
|
||||
, suggestedNextTimestep_(max_next_tstep <= 0 ? Parameters::get<TypeTag, Properties::InitialTimeStepInDays>() * 24 * 60 * 60 : max_next_tstep) // 1.0
|
||||
, fullTimestepInitially_(Parameters::get<TypeTag, Properties::FullTimeStepInitially>()) // false
|
||||
, solverRestartMax_(Parameters::get<TypeTag, Parameters::SolverMaxRestarts>()) // 10
|
||||
, solverVerbose_(Parameters::get<TypeTag, Parameters::SolverVerbosity>() > 0 && terminalOutput) // 2
|
||||
, timestepVerbose_(Parameters::get<TypeTag, Parameters::TimeStepVerbosity>() > 0 && terminalOutput) // 2
|
||||
, suggestedNextTimestep_(max_next_tstep <= 0 ? Parameters::get<TypeTag, Parameters::InitialTimeStepInDays>() * 24 * 60 * 60 : max_next_tstep) // 1.0
|
||||
, fullTimestepInitially_(Parameters::get<TypeTag, Parameters::FullTimeStepInitially>()) // false
|
||||
, timestepAfterEvent_(tuning.TMAXWC) // 1e30
|
||||
, useNewtonIteration_(false)
|
||||
, minTimeStepBeforeShuttingProblematicWells_(Parameters::get<TypeTag, Properties::MinTimeStepBeforeShuttingProblematicWellsInDays>() * unit::day)
|
||||
, minTimeStepBeforeShuttingProblematicWells_(Parameters::get<TypeTag, Parameters::MinTimeStepBeforeShuttingProblematicWellsInDays>() * unit::day)
|
||||
{
|
||||
init_(unitSystem);
|
||||
}
|
||||
@ -305,20 +303,20 @@ std::set<std::string> consistentlyFailingWells(const std::vector<StepReport>& sr
|
||||
{
|
||||
registerEclTimeSteppingParameters<TypeTag>();
|
||||
// TODO: make sure the help messages are correct (and useful)
|
||||
Parameters::registerParam<TypeTag, Properties::SolverContinueOnConvergenceFailure>
|
||||
Parameters::registerParam<TypeTag, Parameters::SolverContinueOnConvergenceFailure>
|
||||
("Continue instead of stop when minimum solver time step is reached");
|
||||
Parameters::registerParam<TypeTag, Properties::SolverMaxRestarts>
|
||||
Parameters::registerParam<TypeTag, Parameters::SolverMaxRestarts>
|
||||
("The maximum number of breakdowns before a substep is given up and "
|
||||
"the simulator is terminated");
|
||||
Parameters::registerParam<TypeTag, Properties::SolverVerbosity>
|
||||
Parameters::registerParam<TypeTag, Parameters::SolverVerbosity>
|
||||
("Specify the \"chattiness\" of the non-linear solver itself");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepVerbosity>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepVerbosity>
|
||||
("Specify the \"chattiness\" during the time integration");
|
||||
Parameters::registerParam<TypeTag, Properties::InitialTimeStepInDays>
|
||||
Parameters::registerParam<TypeTag, Parameters::InitialTimeStepInDays>
|
||||
("The size of the initial time step in days");
|
||||
Parameters::registerParam<TypeTag, Properties::FullTimeStepInitially>
|
||||
Parameters::registerParam<TypeTag, Parameters::FullTimeStepInitially>
|
||||
("Always attempt to finish a report step using a single substep");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepControl>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepControl>
|
||||
("The algorithm used to determine time-step sizes. "
|
||||
"Valid options are: "
|
||||
"'pid' (default), "
|
||||
@ -327,31 +325,31 @@ std::set<std::string> consistentlyFailingWells(const std::vector<StepReport>& sr
|
||||
"'iterationcount', "
|
||||
"'newtoniterationcount' "
|
||||
"and 'hardcoded'");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepControlTolerance>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepControlTolerance>
|
||||
("The tolerance used by the time step size control algorithm");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepControlTargetIterations>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepControlTargetIterations>
|
||||
("The number of linear iterations which the time step control scheme "
|
||||
"should aim for (if applicable)");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepControlTargetNewtonIterations>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepControlTargetNewtonIterations>
|
||||
("The number of Newton iterations which the time step control scheme "
|
||||
"should aim for (if applicable)");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepControlDecayRate>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepControlDecayRate>
|
||||
("The decay rate of the time step size of the number of "
|
||||
"target iterations is exceeded");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepControlGrowthRate>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepControlGrowthRate>
|
||||
("The growth rate of the time step size of the number of "
|
||||
"target iterations is undercut");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepControlDecayDampingFactor>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepControlDecayDampingFactor>
|
||||
("The decay rate of the time step decrease when the "
|
||||
"target iterations is exceeded");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepControlGrowthDampingFactor>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepControlGrowthDampingFactor>
|
||||
("The growth rate of the time step increase when the "
|
||||
"target iterations is undercut");
|
||||
Parameters::registerParam<TypeTag, Properties::TimeStepControlFileName>
|
||||
Parameters::registerParam<TypeTag, Parameters::TimeStepControlFileName>
|
||||
("The name of the file which contains the hardcoded time steps sizes");
|
||||
Parameters::registerParam<TypeTag, Properties::MinTimeStepBeforeShuttingProblematicWellsInDays>
|
||||
Parameters::registerParam<TypeTag, Parameters::MinTimeStepBeforeShuttingProblematicWellsInDays>
|
||||
("The minimum time step size in days for which problematic wells are not shut");
|
||||
Parameters::registerParam<TypeTag, Properties::MinTimeStepBasedOnNewtonIterations>
|
||||
Parameters::registerParam<TypeTag, Parameters::MinTimeStepBasedOnNewtonIterations>
|
||||
("The minimum time step size (in days for field and metric unit and hours for lab unit) "
|
||||
"can be reduced to based on newton iteration counts");
|
||||
}
|
||||
@ -815,25 +813,25 @@ std::set<std::string> consistentlyFailingWells(const std::vector<StepReport>& sr
|
||||
void init_(const UnitSystem& unitSystem)
|
||||
{
|
||||
// valid are "pid" and "pid+iteration"
|
||||
std::string control = Parameters::get<TypeTag, Properties::TimeStepControl>(); // "pid"
|
||||
std::string control = Parameters::get<TypeTag, Parameters::TimeStepControl>(); // "pid"
|
||||
|
||||
const double tol = Parameters::get<TypeTag, Properties::TimeStepControlTolerance>(); // 1e-1
|
||||
const double tol = Parameters::get<TypeTag, Parameters::TimeStepControlTolerance>(); // 1e-1
|
||||
if (control == "pid") {
|
||||
timeStepControl_ = std::make_unique<PIDTimeStepControl>(tol);
|
||||
timeStepControlType_ = TimeStepControlType::PID;
|
||||
}
|
||||
else if (control == "pid+iteration") {
|
||||
const int iterations = Parameters::get<TypeTag, Properties::TimeStepControlTargetIterations>(); // 30
|
||||
const double decayDampingFactor = Parameters::get<TypeTag, Properties::TimeStepControlDecayDampingFactor>(); // 1.0
|
||||
const double growthDampingFactor = Parameters::get<TypeTag, Properties::TimeStepControlGrowthDampingFactor>(); // 3.2
|
||||
const int iterations = Parameters::get<TypeTag, Parameters::TimeStepControlTargetIterations>(); // 30
|
||||
const double decayDampingFactor = Parameters::get<TypeTag, Parameters::TimeStepControlDecayDampingFactor>(); // 1.0
|
||||
const double growthDampingFactor = Parameters::get<TypeTag, Parameters::TimeStepControlGrowthDampingFactor>(); // 3.2
|
||||
timeStepControl_ = std::make_unique<PIDAndIterationCountTimeStepControl>(iterations, decayDampingFactor, growthDampingFactor, tol);
|
||||
timeStepControlType_ = TimeStepControlType::PIDAndIterationCount;
|
||||
}
|
||||
else if (control == "pid+newtoniteration") {
|
||||
const int iterations = Parameters::get<TypeTag, Properties::TimeStepControlTargetNewtonIterations>(); // 8
|
||||
const double decayDampingFactor = Parameters::get<TypeTag, Properties::TimeStepControlDecayDampingFactor>(); // 1.0
|
||||
const double growthDampingFactor = Parameters::get<TypeTag, Properties::TimeStepControlGrowthDampingFactor>(); // 3.2
|
||||
const double nonDimensionalMinTimeStepIterations = Parameters::get<TypeTag, Properties::MinTimeStepBasedOnNewtonIterations>(); // 0.0 by default
|
||||
const int iterations = Parameters::get<TypeTag, Parameters::TimeStepControlTargetNewtonIterations>(); // 8
|
||||
const double decayDampingFactor = Parameters::get<TypeTag, Parameters::TimeStepControlDecayDampingFactor>(); // 1.0
|
||||
const double growthDampingFactor = Parameters::get<TypeTag, Parameters::TimeStepControlGrowthDampingFactor>(); // 3.2
|
||||
const double nonDimensionalMinTimeStepIterations = Parameters::get<TypeTag, Parameters::MinTimeStepBasedOnNewtonIterations>(); // 0.0 by default
|
||||
// the min time step can be reduced by the newton iteration numbers
|
||||
double minTimeStepReducedByIterations = unitSystem.to_si(UnitSystem::measure::time, nonDimensionalMinTimeStepIterations);
|
||||
timeStepControl_ = std::make_unique<PIDAndIterationCountTimeStepControl>(iterations, decayDampingFactor,
|
||||
@ -842,22 +840,22 @@ std::set<std::string> consistentlyFailingWells(const std::vector<StepReport>& sr
|
||||
useNewtonIteration_ = true;
|
||||
}
|
||||
else if (control == "iterationcount") {
|
||||
const int iterations = Parameters::get<TypeTag, Properties::TimeStepControlTargetIterations>(); // 30
|
||||
const double decayrate = Parameters::get<TypeTag, Properties::TimeStepControlDecayRate>(); // 0.75
|
||||
const double growthrate = Parameters::get<TypeTag, Properties::TimeStepControlGrowthRate>(); // 1.25
|
||||
const int iterations = Parameters::get<TypeTag, Parameters::TimeStepControlTargetIterations>(); // 30
|
||||
const double decayrate = Parameters::get<TypeTag, Parameters::TimeStepControlDecayRate>(); // 0.75
|
||||
const double growthrate = Parameters::get<TypeTag, Parameters::TimeStepControlGrowthRate>(); // 1.25
|
||||
timeStepControl_ = std::make_unique<SimpleIterationCountTimeStepControl>(iterations, decayrate, growthrate);
|
||||
timeStepControlType_ = TimeStepControlType::SimpleIterationCount;
|
||||
}
|
||||
else if (control == "newtoniterationcount") {
|
||||
const int iterations = Parameters::get<TypeTag, Properties::TimeStepControlTargetNewtonIterations>(); // 8
|
||||
const double decayrate = Parameters::get<TypeTag, Properties::TimeStepControlDecayRate>(); // 0.75
|
||||
const double growthrate = Parameters::get<TypeTag, Properties::TimeStepControlGrowthRate>(); // 1.25
|
||||
const int iterations = Parameters::get<TypeTag, Parameters::TimeStepControlTargetNewtonIterations>(); // 8
|
||||
const double decayrate = Parameters::get<TypeTag, Parameters::TimeStepControlDecayRate>(); // 0.75
|
||||
const double growthrate = Parameters::get<TypeTag, Parameters::TimeStepControlGrowthRate>(); // 1.25
|
||||
timeStepControl_ = std::make_unique<SimpleIterationCountTimeStepControl>(iterations, decayrate, growthrate);
|
||||
useNewtonIteration_ = true;
|
||||
timeStepControlType_ = TimeStepControlType::SimpleIterationCount;
|
||||
}
|
||||
else if (control == "hardcoded") {
|
||||
const std::string filename = Parameters::get<TypeTag, Properties::TimeStepControlFileName>(); // "timesteps"
|
||||
const std::string filename = Parameters::get<TypeTag, Parameters::TimeStepControlFileName>(); // "timesteps"
|
||||
timeStepControl_ = std::make_unique<HardcodedTimeStepControl>(filename);
|
||||
timeStepControlType_ = TimeStepControlType::HardCodedTimeStep;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user