update UniqueBorderPartition to support UGGrid

src/amdis/linearalgebra/istl/Communication.inc.hpp

@@ -83,18 +83,20 @@ void ISTLCommunication<Basis>
   auto const& gv = basis.gridView();
 
   // make disjoint partition of border entities
-  EntitySet borderEntities;
-  using DataHandle = UniqueBorderPartitionDataHandle<Grid>;
-  DataHandle handle(gv.comm().rank(), borderEntities, gv.grid().globalIdSet());
-  gv.communicate(handle,
-    Dune::InterfaceType::InteriorBorder_InteriorBorder_Interface,
-    Dune::CommunicationDirection::ForwardCommunication);
+  using DataHandle = UniqueBorderPartition<Grid>;
+  DataHandle borderEntities(gv.comm().rank(), gv.grid());
+  for (int i = 0; i < borderEntities.numIterations(); ++i) {
+    gv.communicate(borderEntities,
+      Dune::InterfaceType::InteriorBorder_All_Interface,
+      Dune::CommunicationDirection::ForwardCommunication);
+  }
 
   if (gv.overlapSize(0) + gv.ghostSize(0) == 0)
     // TODO(FM): Add support for this special case
     error_exit("Using grids with ghostSize(0) + overlapSize(0) == 0 is not supported\n");
 
   auto lv = basis.localView();
+  std::vector<bool> visited(basis.dimension(), false);
   GlobalBasisIdSet<Basis> dofIdSet(basis);
 
   pis.beginResize();
@@ -104,28 +106,34 @@ void ISTLCommunication<Basis>
     dofIdSet.bind(e);
     for (std::size_t i = 0; i < dofIdSet.size(); ++i)
     {
-      LocalCommIdType localId = lv.index(i);
-      GlobalCommIdType globalId = dofIdSet.id(i);
-      PType attribute = dofIdSet.partitionType(i);
-      switch (attribute)
-      {
-      case PType::InteriorEntity:
-        pis.add(globalId, LI(localId, Attribute::owner, true));
-        break;
-      case PType::BorderEntity:
-        // mark border entity as owned iff it is part of the process's borderEntities set
-        if (borderEntities.count(dofIdSet.entityId(i)) == 1)
-          pis.add(globalId, LI(localId, Attribute::owner, true));
-        else
-          pis.add(globalId, LI(localId, Attribute::overlap, true));
-        break;
-      case PType::OverlapEntity:
-      case PType::FrontEntity:
-        pis.add(globalId, LI(localId, Attribute::overlap, true));
-        break;
-      case PType::GhostEntity:
-        pis.add(globalId, LI(localId, Attribute::copy, true));
-        break;
+      LocalCommIdType localIndex = lv.index(i);
+      if (!visited[localIndex]) {
+        GlobalCommIdType globalId = dofIdSet.id(i);
+        PType attribute = dofIdSet.partitionType(i);
+        switch (attribute)
+        {
+        case PType::InteriorEntity:
+          pis.add(globalId, LI(localIndex, Attribute::owner, true));
+          break;
+        case PType::BorderEntity:
+          // mark border entity as owned iff it is part of the process's borderEntities set
+          if (borderEntities.contains(dofIdSet.entityId(i)))
+            pis.add(globalId, LI(localIndex, Attribute::owner, true));
+          else
+            pis.add(globalId, LI(localIndex, Attribute::overlap, true));
+          break;
+        case PType::OverlapEntity:
+        case PType::FrontEntity:
+          pis.add(globalId, LI(localIndex, Attribute::overlap, true));
+          break;
+        case PType::GhostEntity:
+          pis.add(globalId, LI(localIndex, Attribute::copy, true));
+          break;
+        default:
+          error_exit("Unknown partition type.");
+        }
+
+        visited[localIndex] = true;
       }
     }
     dofIdSet.unbind();