diff --git a/dune.module b/dune.module index 587ffb0ec..391adf046 100644 --- a/dune.module +++ b/dune.module @@ -10,4 +10,4 @@ Label: 2023.04-pre Maintainer: opm@opm-project.org MaintainerName: OPM community Url: http://opm-project.org -Depends: dune-common +Depends: dune-common (>= 2.7) diff --git a/opm/material/constraintsolvers/ImmiscibleFlash.hpp b/opm/material/constraintsolvers/ImmiscibleFlash.hpp index dda088793..8fa68620c 100644 --- a/opm/material/constraintsolvers/ImmiscibleFlash.hpp +++ b/opm/material/constraintsolvers/ImmiscibleFlash.hpp @@ -37,7 +37,6 @@ #include #include -#include #include @@ -144,10 +143,6 @@ public: typedef Dune::FieldVector FlashDefectVector; typedef ImmiscibleFluidState FlashFluidState; -#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2,7) - Dune::FMatrixPrecision::set_singular_limit(1e-35); -#endif - if (tolerance <= 0) tolerance = std::min(1e-5, 1e8*std::numeric_limits::epsilon()); diff --git a/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp b/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp index 031eb92f0..e983be3e5 100644 --- a/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp +++ b/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp @@ -35,7 +35,6 @@ #include #include -#include namespace Opm { @@ -252,10 +251,6 @@ public: // solve for all mole fractions try { -#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2,7) - static constexpr Scalar eps = std::numeric_limits::min()*1000.0; - Dune::FMatrixPrecision::set_singular_limit(eps); -#endif M.solve(x, b); } catch (const Dune::FMatrixError& e) { diff --git a/opm/material/constraintsolvers/NcpFlash.hpp b/opm/material/constraintsolvers/NcpFlash.hpp index 15d1ca0ac..ef4515c3f 100644 --- a/opm/material/constraintsolvers/NcpFlash.hpp +++ b/opm/material/constraintsolvers/NcpFlash.hpp @@ -39,7 +39,6 @@ #include #include -#include #include @@ -161,10 +160,6 @@ public: typedef Dune::FieldVector FlashDefectVector; typedef CompositionalFluidState FlashFluidState; -#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2,7) - Dune::FMatrixPrecision::set_singular_limit(1e-35); -#endif - if (tolerance <= 0) tolerance = std::min(1e-3, 1e8*std::numeric_limits::epsilon()); diff --git a/opm/material/constraintsolvers/PTFlash.hpp b/opm/material/constraintsolvers/PTFlash.hpp index a1a99fd39..ae4880501 100644 --- a/opm/material/constraintsolvers/PTFlash.hpp +++ b/opm/material/constraintsolvers/PTFlash.hpp @@ -41,7 +41,6 @@ #include #include -#include #include #include @@ -89,9 +88,6 @@ public: using InputEval = typename FluidState::Scalar; using ComponentVector = Dune::FieldVector; -#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2,7) - Dune::FMatrixPrecision::set_singular_limit(1e-35); -#endif if (tolerance <= 0) { tolerance = std::min(1e-3, 1e8 * std::numeric_limits::epsilon()); }