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

changed: move the ContinueOnConvergenceError parameter to Opm::Parameters

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-06-28 12:16:28 +02:00
parent 3f1e2eb73c
commit f77c12bce9
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/models/discretization/common/fvbasediscretization.hh
View File

@ -120,12 +120,6 @@ struct DiscExtensiveQuantities<TypeTag, TTag::FvBaseDiscretization> { using type
template<class TypeTag> template<class TypeTag>
struct GradientCalculator<TypeTag, TTag::FvBaseDiscretization> { using type = FvBaseGradientCalculator<TypeTag>; }; struct GradientCalculator<TypeTag, TTag::FvBaseDiscretization> { using type = FvBaseGradientCalculator<TypeTag>; };
//! By default, do not continue with a non-converged solution instead of giving up
//! if we encounter a time step size smaller than the minimum time
//! step size.
template<class TypeTag>
struct ContinueOnConvergenceError<TypeTag, TTag::FvBaseDiscretization> { static constexpr bool value = false; };
/*! /*!
* \brief A vector of quanties, each for one equation. * \brief A vector of quanties, each for one equation.
*/ */
@ -345,6 +339,13 @@ template<class TypeTag>
struct MaxTimeStepDivisions<TypeTag, Properties::TTag::FvBaseDiscretization> struct MaxTimeStepDivisions<TypeTag, Properties::TTag::FvBaseDiscretization>
{ static constexpr unsigned value = 10; }; { static constexpr unsigned value = 10; };
//! By default, do not continue with a non-converged solution instead of giving up
//! if we encounter a time step size smaller than the minimum time
//! step size.
template<class TypeTag>
struct ContinueOnConvergenceError<TypeTag, Properties::TTag::FvBaseDiscretization>
{ static constexpr bool value = false; };
} // namespace Opm::Parameters } // namespace Opm::Parameters
namespace Opm { namespace Opm {

8
opm/models/discretization/common/fvbaseparameters.hh
View File

@ -96,6 +96,14 @@ struct MinTimeStepSize { using type = Properties::UndefinedProperty; };
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct MaxTimeStepDivisions { using type = Properties::UndefinedProperty; }; struct MaxTimeStepDivisions { using type = Properties::UndefinedProperty; };
/*!
* \brief Continue with a non-converged solution instead of giving up
* if we encounter a time step size smaller than the minimum time
* step size.
*/
template<class TypeTag, class MyTypeTag>
struct ContinueOnConvergenceError { using type = Properties::UndefinedProperty; };
} // namespace Opm::Parameters } // namespace Opm::Parameters
#endif #endif

4
opm/models/discretization/common/fvbaseproblem.hh
View File

@ -178,7 +178,7 @@ public:
"before the simulation bails out"); "before the simulation bails out");
Parameters::registerParam<TypeTag, Parameters::EnableAsyncVtkOutput> Parameters::registerParam<TypeTag, Parameters::EnableAsyncVtkOutput>
("Dispatch a separate thread to write the VTK output"); ("Dispatch a separate thread to write the VTK output");
Parameters::registerParam<TypeTag, Properties::ContinueOnConvergenceError> Parameters::registerParam<TypeTag, Parameters::ContinueOnConvergenceError>
("Continue with a non-converged solution instead of giving up " ("Continue with a non-converged solution instead of giving up "
"if we encounter a time step size smaller than the minimum time " "if we encounter a time step size smaller than the minimum time "
"step size."); "step size.");
@ -575,7 +575,7 @@ public:
* step size. * step size.
*/ */
bool continueOnConvergenceError() const bool continueOnConvergenceError() const
{ return Parameters::get<TypeTag, Properties::ContinueOnConvergenceError>(); } { return Parameters::get<TypeTag, Parameters::ContinueOnConvergenceError>(); }
/*! /*!
* \brief Impose the next time step size to be used externally. * \brief Impose the next time step size to be used externally.

8
opm/models/discretization/common/fvbaseproperties.hh
View File

@ -215,14 +215,6 @@ struct VtkOutputFormat { using type = UndefinedProperty; };
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct EnableConstraints { using type = UndefinedProperty; }; struct EnableConstraints { using type = UndefinedProperty; };
/*!
* \brief Continue with a non-converged solution instead of giving up
* if we encounter a time step size smaller than the minimum time
* step size.
*/
template<class TypeTag, class MyTypeTag>
struct ContinueOnConvergenceError { using type = UndefinedProperty; };
/*! /*!
* \brief Specify whether all intensive quantities for the grid should be * \brief Specify whether all intensive quantities for the grid should be
* cached in the discretization. * cached in the discretization.