Merge pull request #2327 from akva2/bump_dune

Bump required dune version to 2.6
This commit is contained in:
Atgeirr Flø Rasmussen
2020-02-11 09:41:44 +01:00
committed by GitHub
22 changed files with 48 additions and 314 deletions

View File

@@ -94,13 +94,7 @@ namespace Opm {
typedef Dune::FieldVector<Scalar, numEq > VectorBlockType;
typedef Dune::BlockVector<VectorBlockType> BVector;
#if DUNE_VERSION_NEWER_REV(DUNE_ISTL, 2 , 5, 1)
// 3x3 matrix block inversion was unstable from at least 2.3 until and
// including 2.5.0
typedef Dune::FieldMatrix<Scalar, numEq, numEq > MatrixBlockType;
#else
typedef Dune::FieldMatrix<Scalar, numEq, numEq > MatrixBlockType;
#endif
typedef Opm::BlackOilPolymerModule<TypeTag> PolymerModule;