OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3414 from akva2/require_dune_2.7

Browse Source 
minimum dune version required is now 2.7
This commit is contained in:
Arne Morten Kvarving 2023-04-12 09:19:14 +02:00 committed by GitHub
commit dcd5ecf0d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dune.module
View File

@ -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)

5
opm/material/constraintsolvers/ImmiscibleFlash.hpp
View File

@ -37,7 +37,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/version.hh>
#include <limits>
@ -144,10 +143,6 @@ public:
typedef Dune::FieldVector<FlashEval, numEq> FlashDefectVector;
typedef ImmiscibleFluidState<FlashEval, FluidSystem> FlashFluidState;
#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2,7)
Dune::FMatrixPrecision<InputEval>::set_singular_limit(1e-35);
#endif
if (tolerance <= 0)
tolerance = std::min<Scalar>(1e-5,
1e8*std::numeric_limits<Scalar>::epsilon());

5
opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp
View File

@ -35,7 +35,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/version.hh>
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<Scalar>::min()*1000.0;
Dune::FMatrixPrecision<Scalar>::set_singular_limit(eps);
#endif
M.solve(x, b);
}
catch (const Dune::FMatrixError& e) {

5
opm/material/constraintsolvers/NcpFlash.hpp
View File

@ -39,7 +39,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/version.hh>
#include <limits>
@ -161,10 +160,6 @@ public:
typedef Dune::FieldVector<FlashEval, numEq> FlashDefectVector;
typedef CompositionalFluidState<FlashEval, FluidSystem, /*energy=*/false> FlashFluidState;
#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2,7)
Dune::FMatrixPrecision<InputEval>::set_singular_limit(1e-35);
#endif
if (tolerance <= 0)
tolerance = std::min<Scalar>(1e-3,
1e8*std::numeric_limits<Scalar>::epsilon());

4
opm/material/constraintsolvers/PTFlash.hpp
View File

@ -41,7 +41,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/version.hh>
#include <dune/common/classname.hh>
#include <limits>
@ -89,9 +88,6 @@ public:
using InputEval = typename FluidState::Scalar;
using ComponentVector = Dune::FieldVector<typename FluidState::Scalar, numComponents>;
#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2,7)
Dune::FMatrixPrecision<InputEval>::set_singular_limit(1e-35);
#endif
if (tolerance <= 0) {
tolerance = std::min<Scalar>(1e-3, 1e8 * std::numeric_limits<Scalar>::epsilon());
}