Changeset 923 for XIOS/trunk/extern/remap/src/parallel_tree.cpp

Timestamp:

08/26/16 15:07:20 (8 years ago)

Author:

ymipsl

Message:

Improve remapper :

• increase stability for smal grid remapping
• increase stability for large number of processes

YM

File:

• XIOS/trunk/extern/remap/src/parallel_tree.cpp (modified) (7 diffs)

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

@@ -114 +114 @@
 }
 
-CParallelTree::CParallelTree(MPI_Comm comm) : communicator(comm), cascade(MIN_NODE_SZ*MIN_NODE_SZ, comm)
+//CParallelTree::CParallelTree(MPI_Comm comm) : communicator(comm), cascade(MIN_NODE_SZ*MIN_NODE_SZ, comm)
+CParallelTree::CParallelTree(MPI_Comm comm) : communicator(comm), cascade(MAX_NODE_SZ*MAX_NODE_SZ*2, comm)
 {
         treeCascade.reserve(cascade.num_levels);
@@ -188 +189 @@
 
         /* unpack */
+/*
         randomArray.resize(nrecv);
         randomizeArray(randomArray);
         tree.leafs.resize(nrecv);
         index = 0;
-        for (int i = 0; i < nrecv; i++)
+
+
+  for (int i = 0; i < nrecv; i++)
         {
                 Coord x = *(Coord *)(&recvBuffer[index]);
@@ -201 +205 @@
 
         }
+*/
+
+  randomArray.resize(blocSize);
+        randomizeArray(randomArray);
+        tree.leafs.resize(blocSize);
+        index = 0;
+  
+  size_t s=(sizeof(Coord)/sizeof(*recvBuffer)+1)*nrecv ;
+  
+  for (int i = 0; i < blocSize; i++)
+        {
+                Coord x = *(Coord *)(&recvBuffer[index%s]);
+                index += sizeof(Coord)/sizeof(*recvBuffer);
+                double radius = recvBuffer[index%s];
+    index++ ;
+                tree.leafs[randomArray[i]].centre = x;
+                tree.leafs[randomArray[i]].radius = radius;
+
+        }
+
 
         delete [] recvBuffer;
@@ -206 +230 @@
         CTimer::get("buildSampleTree(local)").resume();
         tree.build(tree.leafs);
-        cout << "SampleTree build : assign Level " << assignLevel << " nb Nodes : " << tree.levelSize[assignLevel] << endl;
+//      cout << "SampleTree build : assign Level " << assignLevel << " nb Nodes : " << tree.levelSize[assignLevel] << endl;
         CTimer::get("buildSampleTree(local)").suspend();
         CTimer::get("buildSampleTree(local)").print();
@@ -214 +238 @@
         if (!ok)
   {
-    cerr << comm.rank << ": PROBLEM: (node assign)" << tree.levelSize[assignLevel] << " != " << comm.group_size << " (keepNodes)" << endl;
+    cerr << comm.rank << ": PROBLEM: (node assign)" << tree.levelSize[assignLevel] << " != " << comm.group_size << " (keepNodes)" 
+         << "   node size : "<<node.size()<<"   bloc size : "<<blocSize<<"  total number of leaf : "<<tree.leafs.size()<<endl ;
 /*
         MPI_Allreduce(&ok, &allok, 1, MPI_INT, MPI_PROD, communicator);
@@ -224 +249 @@
     MPI_Abort(MPI_COMM_WORLD,-1) ;
   }
+/*
   cout<<"*******************************************"<<endl ;
   cout<<"******* Sample Tree output        *********"<<endl ;
@@ -230 +256 @@
 
   cout<<"*******************************************"<<endl ;
-
+*/
 
   assert(tree.root->incluCheck() == 0);