mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-07-29 18:57:56 -05:00
ContinueOnConvergenceError moved to TypeTag-free parameter system
This commit is contained in:
@@ -122,12 +122,6 @@ struct LinearSolverBackend<TypeTag, TTag::FlowExpTypeTag> {
|
|||||||
|
|
||||||
namespace Opm::Parameters {
|
namespace Opm::Parameters {
|
||||||
|
|
||||||
// By default, flowexp accepts the result of the time integration unconditionally if the
|
|
||||||
// smallest time step size is reached.
|
|
||||||
template<class TypeTag>
|
|
||||||
struct ContinueOnConvergenceError<TypeTag, Properties::TTag::FlowExpTypeTag>
|
|
||||||
{ static constexpr bool value = true; };
|
|
||||||
|
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct EnableTerminalOutput<TypeTag, Properties::TTag::FlowExpTypeTag>
|
struct EnableTerminalOutput<TypeTag, Properties::TTag::FlowExpTypeTag>
|
||||||
{ static constexpr bool value = false; };
|
{ static constexpr bool value = false; };
|
||||||
@@ -228,6 +222,10 @@ public:
|
|||||||
#if _OPENMP
|
#if _OPENMP
|
||||||
Parameters::SetDefault<Parameters::ThreadsPerProcess>(2);
|
Parameters::SetDefault<Parameters::ThreadsPerProcess>(2);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// By default, flowexp accepts the result of the time integration unconditionally if the
|
||||||
|
// smallest time step size is reached.
|
||||||
|
Parameters::SetDefault<Parameters::ContinueOnConvergenceError>(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// inherit the constructors
|
// inherit the constructors
|
||||||
|
|||||||
@@ -77,10 +77,6 @@ struct Simulator<TypeTag, TTag::FlowExpProblemBlackOil>
|
|||||||
|
|
||||||
namespace Opm::Parameters {
|
namespace Opm::Parameters {
|
||||||
|
|
||||||
template<class TypeTag>
|
|
||||||
struct ContinueOnConvergenceError<TypeTag, Properties::TTag::FlowExpProblemBlackOil>
|
|
||||||
{ static constexpr bool value = false; };
|
|
||||||
|
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct EclNewtonRelaxedTolerance<TypeTag, Properties::TTag::FlowExpProblemBlackOil>
|
struct EclNewtonRelaxedTolerance<TypeTag, Properties::TTag::FlowExpProblemBlackOil>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -127,12 +127,6 @@ template<class TypeTag>
|
|||||||
struct UseMultisegmentWell<TypeTag, Properties::TTag::TestTypeTag>
|
struct UseMultisegmentWell<TypeTag, Properties::TTag::TestTypeTag>
|
||||||
{ static constexpr bool value = false; };
|
{ static constexpr bool value = false; };
|
||||||
|
|
||||||
// By default, ebos accepts the result of the time integration unconditionally if the
|
|
||||||
// smallest time step size is reached.
|
|
||||||
template<class TypeTag>
|
|
||||||
struct ContinueOnConvergenceError<TypeTag, Properties::TTag::TestTypeTag>
|
|
||||||
{ static constexpr bool value = true; };
|
|
||||||
|
|
||||||
} // namespace Opm::Parameters
|
} // namespace Opm::Parameters
|
||||||
|
|
||||||
#endif // OPM_TEST_TYPETAG_HPP
|
#endif // OPM_TEST_TYPETAG_HPP
|
||||||
|
|||||||
Reference in New Issue
Block a user