Changeset 2690 for XIOS2/trunk/extern

Timestamp:

12/16/24 09:48:02 (7 weeks ago)

Author:

jderouillat

Message:

Added the sorting of the localTree to ensure the reproductibilty of second order interpolation

File:

• XIOS2/trunk/extern/remap/src/parallel_tree.cpp (modified) (3 diffs)

XIOS2/trunk/extern/remap/src/parallel_tree.cpp

@@ -261 +261 @@
 }
 
+struct compareElts
+{
+  bool operator()(const std::tuple<double, double, double>& lhs, const std::tuple<double, double, double>& rhs) const
+  {
+    if (get<0>(lhs) < get<0>(rhs)) return true;
+    else if (get<0>(lhs) > get<0>(rhs)) return false;
+    else {
+      if (get<1>(lhs) < get<1>(rhs)) return true;
+      else if (get<1>(lhs) > get<1>(rhs)) return false;
+      else {
+        if (get<2>(lhs) < get<2>(rhs)) return true;
+        else if (get<2>(lhs) > get<2>(rhs)) return false;
+        else return true;
+      }
+    }
+  }
+};
 
 void CParallelTree::buildLocalTree(const vector<Node>& node, const vector<int>& route)
@@ -282 +299 @@
                 ptLocalElement[i] = &localElements[i];
 
+        
         CTimer::get("buildLocalTree(transfer)").resume();
         MPIRoute.transferToTarget(&ptElement[0], &ptLocalElement[0], packElement, unpackElement);
@@ -288 +306 @@
 
         CTimer::get("buildLocalTree(local)").resume();
+        
+        // Force order access to localElements for reproductibilty using the map below
+        std::map<std::tuple<double, double, double>, int, compareElts> indexesFromCoords;
+        for (int i = 0; i < nbLocalElements; i++)
+        {
+            Elt& elt = localElements[i];
+            indexesFromCoords[{elt.x.x,elt.x.y,elt.x.z}] = i;
+        }
 
         int mpiRank;
         MPI_Comm_rank(communicator, &mpiRank);
         localTree.leafs.reserve(nbLocalElements);
-        for (int i = 0; i < nbLocalElements; i++)
-        {
+        for (const auto& itIndex : indexesFromCoords)
+        {
+                int i = itIndex.second; 
                 Elt& elt = localElements[i];
                 elt.id.ind = i;