OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

move NewtonTargetIterations to TypeTag-free parameter system

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-07-05 17:49:51 +02:00
parent 8285d999e8
commit 930e6c8adf
4 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/problems/co2ptflashproblem.hh
View File

@ -190,13 +190,6 @@ struct LinearSolverTolerance<TypeTag, Properties::TTag::CO2PTBaseProblem>
static constexpr type value = 1e-3; static constexpr type value = 1e-3;
}; };
template <class TypeTag>
struct NewtonTargetIterations<TypeTag, Properties::TTag::CO2PTBaseProblem>
{
using type = GetPropType<TypeTag, Properties::Scalar>;
static constexpr type value = 6;
};
template <class TypeTag> template <class TypeTag>
struct NewtonMaxIterations<TypeTag, Properties::TTag::CO2PTBaseProblem> struct NewtonMaxIterations<TypeTag, Properties::TTag::CO2PTBaseProblem>
{ static constexpr int value = 30; }; { static constexpr int value = 30; };
@ -374,6 +367,7 @@ public:
Parameters::SetDefault<Parameters::EndTime<Scalar>>(60. * 60.); Parameters::SetDefault<Parameters::EndTime<Scalar>>(60. * 60.);
Parameters::SetDefault<Parameters::InitialTimeStepSize<Scalar>>(0.1 * 60. * 60.); Parameters::SetDefault<Parameters::InitialTimeStepSize<Scalar>>(0.1 * 60. * 60.);
Parameters::SetDefault<Parameters::NewtonTolerance<Scalar>>(1e-3); Parameters::SetDefault<Parameters::NewtonTolerance<Scalar>>(1e-3);
Parameters::SetDefault<Parameters::NewtonTargetIterations>(6);
} }
/*! /*!

7
examples/problems/richardslensproblem.hh
View File

@ -108,12 +108,6 @@ template<class TypeTag>
struct EnableGravity<TypeTag, Properties::TTag::RichardsLensProblem> struct EnableGravity<TypeTag, Properties::TTag::RichardsLensProblem>
{ static constexpr bool value = true; }; { static constexpr bool value = true; };
// Set the "desireable" number of newton iterations of a time step
template<class TypeTag>
struct NewtonTargetIterations<TypeTag, Properties::TTag::RichardsLensProblem>
{ static constexpr int value = 18; };
// Set the maximum number of newton iterations of a time step
template<class TypeTag> template<class TypeTag>
struct NewtonMaxIterations<TypeTag, Properties::TTag::RichardsLensProblem> struct NewtonMaxIterations<TypeTag, Properties::TTag::RichardsLensProblem>
{ static constexpr int value = 28; }; { static constexpr int value = 28; };
@ -254,6 +248,7 @@ public:
Parameters::SetDefault<Parameters::EndTime<Scalar>>(3000.0); Parameters::SetDefault<Parameters::EndTime<Scalar>>(3000.0);
Parameters::SetDefault<Parameters::InitialTimeStepSize<Scalar>>(100.0); Parameters::SetDefault<Parameters::InitialTimeStepSize<Scalar>>(100.0);
Parameters::SetDefault<Parameters::NewtonTargetIterations>(18);
} }
/*! /*!

8
opm/models/nonlinear/newtonmethod.hh
View File

@ -81,10 +81,6 @@ struct NewtonConvergenceWriter<TypeTag, TTag::NewtonMethod> { using type = NullC
namespace Opm::Parameters { namespace Opm::Parameters {
template<class TypeTag>
struct NewtonTargetIterations<TypeTag, Properties::TTag::NewtonMethod>
{ static constexpr int value = 10; };
template<class TypeTag> template<class TypeTag>
struct NewtonMaxIterations<TypeTag, Properties::TTag::NewtonMethod> struct NewtonMaxIterations<TypeTag, Properties::TTag::NewtonMethod>
{ static constexpr int value = 20; }; { static constexpr int value = 20; };
@ -148,7 +144,7 @@ public:
Parameters::Register<Parameters::NewtonWriteConvergence> Parameters::Register<Parameters::NewtonWriteConvergence>
("Write the convergence behaviour of the Newton " ("Write the convergence behaviour of the Newton "
"method to a VTK file"); "method to a VTK file");
Parameters::registerParam<TypeTag, Parameters::NewtonTargetIterations> Parameters::Register<Parameters::NewtonTargetIterations>
("The 'optimum' number of Newton iterations per time step"); ("The 'optimum' number of Newton iterations per time step");
Parameters::registerParam<TypeTag, Parameters::NewtonMaxIterations> Parameters::registerParam<TypeTag, Parameters::NewtonMaxIterations>
("The maximum number of Newton iterations per time step"); ("The maximum number of Newton iterations per time step");
@ -846,7 +842,7 @@ protected:
// optimal number of iterations we want to achieve // optimal number of iterations we want to achieve
int targetIterations_() const int targetIterations_() const
{ return Parameters::get<TypeTag, Parameters::NewtonTargetIterations>(); } { return Parameters::Get<Parameters::NewtonTargetIterations>(); }
// maximum number of iterations we do before giving up // maximum number of iterations we do before giving up
int maxIterations_() const int maxIterations_() const
{ return Parameters::get<TypeTag, Parameters::NewtonMaxIterations>(); } { return Parameters::get<TypeTag, Parameters::NewtonMaxIterations>(); }

21
opm/models/nonlinear/newtonmethodparameters.hh
View File

@ -32,6 +32,16 @@ namespace Opm::Parameters {
template<class Scalar> template<class Scalar>
struct NewtonMaxError { static constexpr Scalar value = 1e100; }; struct NewtonMaxError { static constexpr Scalar value = 1e100; };
/*!
* \brief The number of iterations at which the Newton method
* should aim at.
*
* This is used to control the time-step size. The heuristic used
* is to scale the last time-step size by the deviation of the
* number of iterations used from the target steps.
*/
struct NewtonTargetIterations { static constexpr int value = 10; };
/*! /*!
* \brief The value for the error below which convergence is declared * \brief The value for the error below which convergence is declared
* *
@ -48,17 +58,6 @@ struct NewtonVerbose { static constexpr bool value = true; };
//! gets written out to disk for every Newton iteration //! gets written out to disk for every Newton iteration
struct NewtonWriteConvergence { static constexpr bool value = false; }; struct NewtonWriteConvergence { static constexpr bool value = false; };
/*!
* \brief The number of iterations at which the Newton method
* should aim at.
*
* This is used to control the time-step size. The heuristic used
* is to scale the last time-step size by the deviation of the
* number of iterations used from the target steps.
*/
template<class TypeTag, class MyTypeTag>
struct NewtonTargetIterations { using type = Properties::UndefinedProperty; };
//! Number of maximum iterations for the Newton method. //! Number of maximum iterations for the Newton method.
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct NewtonMaxIterations { using type = Properties::UndefinedProperty; }; struct NewtonMaxIterations { using type = Properties::UndefinedProperty; };