diff --git a/dune.module b/dune.module index b155b9df5..bbfffabaf 100644 --- a/dune.module +++ b/dune.module @@ -10,5 +10,5 @@ Label: 2025.04-pre Maintainer: atgeirr@sintef.no MaintainerName: Atgeirr F. Rasmussen Url: http://opm-project.org -Depends: dune-common (>= 2.7) dune-geometry (>= 2.7) dune-grid (>= 2.7) opm-common -Suggests: dune-istl (>= 2.7) +Depends: dune-common (>= 2.9) dune-geometry (>= 2.9) dune-grid (>= 2.9) opm-common +Suggests: dune-istl (>= 2.9) diff --git a/opm/grid/cpgrid/CpGridData.cpp b/opm/grid/cpgrid/CpGridData.cpp index bd5366d54..b711177de 100644 --- a/opm/grid/cpgrid/CpGridData.cpp +++ b/opm/grid/cpgrid/CpGridData.cpp @@ -946,11 +946,7 @@ struct AttributeDataHandle c2e_(cell_to_entity), grid_(grid) {} -#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8) bool fixedSize() -#else - bool fixedsize() -#endif { return true; } diff --git a/opm/grid/cpgrid/Entity2IndexDataHandle.hpp b/opm/grid/cpgrid/Entity2IndexDataHandle.hpp index c2d6c59c0..6dfc25b27 100644 --- a/opm/grid/cpgrid/Entity2IndexDataHandle.hpp +++ b/opm/grid/cpgrid/Entity2IndexDataHandle.hpp @@ -64,31 +64,28 @@ class Entity2IndexDataHandle : fromGrid_(fromGrid), toGrid_(toGrid), data_(data) {} -#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8) bool fixedSize() { return data_.fixedSize(3, codim); } -#else - bool fixedsize() - { - return data_.fixedSize(3, codim); - } -#endif + std::size_t size(std::size_t i) { return data_.size(Entity(fromGrid_, i, true)); } + template void gather(B& buffer, std::size_t i) { data_.gather(buffer, Entity(fromGrid_, i, true)); } + template void scatter(B& buffer, std::size_t i, std::size_t s) { data_.scatter(buffer, Entity(toGrid_, i, true), s); } + private: const CpGridData& fromGrid_; const CpGridData& toGrid_; diff --git a/opm/grid/polyhedralgrid/grid.hh b/opm/grid/polyhedralgrid/grid.hh index 709b212e5..46d6f0fc8 100644 --- a/opm/grid/polyhedralgrid/grid.hh +++ b/opm/grid/polyhedralgrid/grid.hh @@ -962,9 +962,6 @@ namespace Dune } public: -#if DUNE_VERSION_LT_REV(DUNE_GRID, 2, 7, 1) - using Base::getRealImplementation; -#endif typedef typename Traits :: ExtraData ExtraData; ExtraData extraData () const { return this; } diff --git a/opm/grid/polyhedralgrid/gridfactory.hh b/opm/grid/polyhedralgrid/gridfactory.hh index 91510f06a..dbf4eb350 100644 --- a/opm/grid/polyhedralgrid/gridfactory.hh +++ b/opm/grid/polyhedralgrid/gridfactory.hh @@ -8,9 +8,6 @@ #include #include -#if DUNE_VERSION_LT(DUNE_GRID, 2, 8) -#include -#endif #include #include @@ -40,11 +37,7 @@ namespace Dune typedef Dune::FieldVector CoordinateType; typedef CoordinateType Coordinate; -#if DUNE_VERSION_LT(DUNE_GRID, 2, 8) - typedef ToUniquePtr UniquePtrType; -#else using UniquePtrType = std::unique_ptr; -#endif /** \brief Default constructor */ explicit GridFactory ( const MPICommunicatorType& = MPIHelper::getCommunicator() )