Merge branch 'issue/collective-communication' into 'master'

Remove all occurences of CollectiveCommunication since it is removed in dune grid

See merge request amdis/amdis!192

CHANGELOG.md

@@ -14,6 +14,7 @@
 - The `Notifiers` stores now all `Observers` in a `std::list` instead of a `std::set`. This solved
   a bug in parallel computations when multiple observers of the same type are registered by pointer
   but the address was not ordered the same way on all processors.
+- Remove all occurences of `CollectiveCommunication` since it is removed in dune grid
 
 ### Changed
 

amdis/AdaptiveGrid.hpp

@@ -333,18 +333,11 @@ namespace AMDiS
   template <class HostGrid>
   class AdaptiveGridFamily
   {
-    template <class HG>
-    using CollectiveCommunication_t = typename HG::Traits::CollectiveCommunication;
-
-    template <class HG>
-    using Communication_t = typename HG::Traits::Communication;
-
   public:
     struct Traits : HostGrid::Traits
     {
       using Grid = AdaptiveGrid<HostGrid>;
-      using CollectiveCommunication = Dune::Std::detected_t<CollectiveCommunication_t, HostGrid>;
-      using Communication = Dune::Std::detected_or_t<CollectiveCommunication, Communication_t, HostGrid>;
+      using Communication = typename HostGrid::Traits::Communication;
       using LeafGridView = Dune::GridView< AMDiS::DefaultLeafGridViewTraits<const Grid> >;
       using LevelGridView = Dune::GridView< AMDiS::DefaultLevelGridViewTraits<const Grid> >;
     };

amdis/common/DefaultGridView.hpp

@@ -39,14 +39,8 @@ namespace AMDiS
     /// type of the intersection iterator
     using IntersectionIterator = typename Grid::Traits::LevelIntersectionIterator;
 
-    template <class G>
-    using CollectiveCommunication_t = typename G::Traits::Communication;
-    using CollectiveCommunication = Dune::Std::detected_t<CollectiveCommunication_t, Grid>;
-
     /// type of the collective communication
-    template <class G>
-    using Communication_t = typename G::Traits::Communication;
-    using Communication = Dune::Std::detected_or_t<CollectiveCommunication, Communication_t, Grid>;
+    using Communication = typename Grid::Traits::Communication;
 
     template <int cd>
     struct Codim
@@ -79,7 +73,6 @@ namespace AMDiS
     using IndexSet = typename Traits::IndexSet;
     using Intersection = typename Traits::Intersection;
     using IntersectionIterator = typename Traits::IntersectionIterator;
-    using CollectiveCommunication = typename Traits::CollectiveCommunication;
     using Communication = typename Traits::Communication;
 
     template <int cd>
@@ -200,14 +193,8 @@ namespace AMDiS
     /// type of the intersection iterator
     using IntersectionIterator = typename Grid::Traits::LeafIntersectionIterator;
 
-    template <class G>
-    using CollectiveCommunication_t = typename G::Traits::Communication;
-    using CollectiveCommunication = Dune::Std::detected_t<CollectiveCommunication_t, Grid>;
-
     /// type of the collective communication
-    template <class G>
-    using Communication_t = typename G::Traits::Communication;
-    using Communication = Dune::Std::detected_or_t<CollectiveCommunication, Communication_t, Grid>;
+    using Communication = typename Grid::Traits::Communication;
 
     template <int cd>
     struct Codim
@@ -240,7 +227,6 @@ namespace AMDiS
     using IndexSet = typename Traits::IndexSet;
     using Intersection = typename Traits::Intersection;
     using IntersectionIterator = typename Traits::IntersectionIterator;
-    using CollectiveCommunication = typename Traits::CollectiveCommunication;
     using Communication = typename Traits::Communication;
 
     template <int cd>

amdis/linearalgebra/istl/IndexDistribution.hpp

@@ -130,7 +130,7 @@ namespace AMDiS
 
   template <class B>
   using ISTLIndexDistribution_t
-    = typename ISTLIndexDistributionType<GlobalIdType_t<B>, typename B::size_type, typename B::GridView::CollectiveCommunication>::type;
+    = typename ISTLIndexDistributionType<GlobalIdType_t<B>, typename B::size_type, typename B::GridView::Communication>::type;
 
 } // end namespace AMDiS
 

amdis/linearalgebra/petsc/IndexDistribution.hpp

@@ -364,7 +364,7 @@ namespace AMDiS
 
   template <class B>
   using PetscIndexDistribution_t
-    = typename PetscIndexDistributionType<GlobalIdType_t<B>, typename B::size_type, typename B::GridView::CollectiveCommunication>::type;
+    = typename PetscIndexDistributionType<GlobalIdType_t<B>, typename B::size_type, typename B::GridView::Communication>::type;
 
 } // end namespace AMDiS