Merge branch 'feature/use-new-communication-headers-with-dune-2.7' into 'master'

[comm] Use new communication headers with Dune 2.7

See merge request !1835

dumux/common/timeloop.hh

@@ -30,7 +30,14 @@
 
 #include <dune/common/float_cmp.hh>
 #include <dune/common/timer.hh>
+
+#include <dune/common/version.hh>
+#if DUNE_VERSION_LT(DUNE_COMMON,2,7)
 #include <dune/common/parallel/collectivecommunication.hh>
+#else
+#include <dune/common/parallel/communication.hh>
+#endif
+
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/exceptions.hh>
 

dumux/io/grid/gmshgriddatahandle.hh

@@ -28,13 +28,17 @@
 #include <algorithm>
 #include <map>
 
+#include <dune/common/version.hh>
+#if DUNE_VERSION_LT(DUNE_COMMON,2,7)
 #include <dune/common/parallel/collectivecommunication.hh>
+#else
+#include <dune/common/parallel/communication.hh>
+#endif
+
 #include <dune/geometry/dimension.hh>
 #include <dune/grid/common/partitionset.hh>
 #include <dune/grid/common/datahandleif.hh>
 
-
-
 // UGGrid specific includes
 #if HAVE_UG
 #include <dune/grid/uggrid.hh>

dumux/io/grid/griddata.hh

@@ -29,7 +29,14 @@
 #include <type_traits>
 
 #include <dune/common/exceptions.hh>
+
+#include <dune/common/version.hh>
+#if DUNE_VERSION_LT(DUNE_COMMON,2,7)
 #include <dune/common/parallel/collectivecommunication.hh>
+#else
+#include <dune/common/parallel/communication.hh>
+#endif
+
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/grid/common/gridfactory.hh>
 #include <dune/grid/io/file/dgfparser/parser.hh>

dumux/io/grid/gridmanager_base.hh

@@ -32,7 +32,14 @@
 
 #include <dune/common/exceptions.hh>
 #include <dune/common/classname.hh>
+
+#include <dune/common/version.hh>
+#if DUNE_VERSION_LT(DUNE_COMMON,2,7)
 #include <dune/common/parallel/collectivecommunication.hh>
+#else
+#include <dune/common/parallel/communication.hh>
+#endif
+
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/grid/io/file/dgfparser/dgfparser.hh>
 #include <dune/grid/io/file/gmshreader.hh>

dumux/linear/amgbackend.hh

@@ -29,7 +29,14 @@
 
 #include <dune/common/exceptions.hh>
 #include <dune/common/parallel/indexset.hh>
+
+#include <dune/common/version.hh>
+#if DUNE_VERSION_LT(DUNE_COMMON,2,7)
 #include <dune/common/parallel/mpicollectivecommunication.hh>
+#else
+#include <dune/common/parallel/mpicommunication.hh>
+#endif
+
 #include <dune/grid/common/capabilities.hh>
 #include <dune/istl/paamg/amg.hh>
 #include <dune/istl/paamg/pinfo.hh>

dumux/linear/pdesolver.hh

@@ -31,7 +31,14 @@
 
 #include <dune/common/timer.hh>
 #include <dune/common/exceptions.hh>
+
+#include <dune/common/version.hh>
+#if DUNE_VERSION_LT(DUNE_COMMON,2,7)
 #include <dune/common/parallel/mpicollectivecommunication.hh>
+#else
+#include <dune/common/parallel/mpicommunication.hh>
+#endif
+
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/std/type_traits.hh>
 #include <dune/istl/bvector.hh>

dumux/nonlinear/newtonsolver.hh

@@ -33,7 +33,14 @@
 
 #include <dune/common/timer.hh>
 #include <dune/common/exceptions.hh>
+
+#include <dune/common/version.hh>
+#if DUNE_VERSION_LT(DUNE_COMMON,2,7)
 #include <dune/common/parallel/mpicollectivecommunication.hh>
+#else
+#include <dune/common/parallel/mpicommunication.hh>
+#endif
+
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/std/type_traits.hh>
 #include <dune/istl/bvector.hh>