Prepare OPM for DUNE 2.10

DUNE_VERSION_NEWER has been removed. Falling back to DUNE_VERSION_GTE which exists since at least DUNE 2.7 Use Dune::Communcation instead of removed Dune::CollectiveCommunication (there since at least DUNE 2.7)l
OPM · Oct 2, 2024 · 513e76c · 513e76c
1 parent 057de17
commit 513e76c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/examples/finitevolume/finitevolume.cc b/examples/finitevolume/finitevolume.cc
@@ -36,7 +36,7 @@ template<class G>
 void timeloop(const G& grid, double tend)
 {
     // make a mapper for codim 0 entities in the leaf grid
-#if DUNE_VERSION_NEWER(DUNE_GEOMETRY, 2, 8)
+#if DUNE_VERSION_GTE(DUNE_GEOMETRY, 2, 8)
     Dune::MultipleCodimMultipleGeomTypeMapper<typename G::LeafGridView>  mapper(grid.leafGridView(), Dune::mcmgElementLayout());
 #else
     Dune::LeafMultipleCodimMultipleGeomTypeMapper<G> mapper(grid, Dune::mcmgElementLayout());

diff --git a/opm/grid/common/SubGridPart.hpp b/opm/grid/common/SubGridPart.hpp
@@ -50,7 +50,7 @@ struct SubGridPartTraits {
     using IntersectionIterator = typename Grid ::Traits ::LeafIntersectionIterator;
 
     /** \brief type of the collective communication */
-    using CollectiveCommunication = typename Grid ::Traits ::CollectiveCommunication;
+    using CollectiveCommunication = typename Grid ::Traits ::Communication;
 
 
     template <class BaseEntityType>

diff --git a/opm/grid/cpgrid/CpGridData.cpp b/opm/grid/cpgrid/CpGridData.cpp
@@ -945,7 +945,7 @@ struct AttributeDataHandle
           c2e_(cell_to_entity), grid_(grid)
     {}
 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8)
+#if DUNE_VERSION_GTE(DUNE_COMMON, 2, 8)
     bool fixedSize()
 #else
         bool fixedsize()

diff --git a/opm/grid/cpgrid/Entity2IndexDataHandle.hpp b/opm/grid/cpgrid/Entity2IndexDataHandle.hpp
@@ -64,7 +64,7 @@ class Entity2IndexDataHandle
         : fromGrid_(fromGrid), toGrid_(toGrid), data_(data)
     {}
 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8)
+#if DUNE_VERSION_GTE(DUNE_COMMON, 2, 8)
     bool fixedSize()
     {
         return data_.fixedSize(3, codim);

diff --git a/tests/cpgrid/distribution_test.cpp b/tests/cpgrid/distribution_test.cpp
@@ -120,7 +120,7 @@ class CheckGlobalCellHandle
 
     typedef int DataType;
 
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8)
+#if DUNE_VERSION_GTE(DUNE_COMMON, 2, 8)
     bool fixedSize()
 #else
     bool fixedsize()
@@ -217,7 +217,7 @@ class CheckBoundaryIdHandle
     {}
 
     typedef int DataType;
-#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 8)
+#if DUNE_VERSION_GTE(DUNE_COMMON, 2, 8)
     bool fixedSize()
 #else
     bool fixedsize()