Changeset 898

Timestamp:

07/12/16 18:11:42 (7 years ago)

Author:

ymipsl

Message:

fix remaping for a small number of cells

YM

File:

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

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

@@ -288 +288 @@
 
   long int nb1, nb2, nb, nbTot ;
-  nb1=node.size() ; nb2=node.size() ;
+  nb1=node.size() ; nb2=node2.size() ;
   nb=nb1+nb2 ;
   MPI_Allreduce(&nb, &nbTot, 1, MPI_LONG, MPI_SUM, communicator) ;
@@ -297 +297 @@
         nbSampleNodes /= 2;
         nbSampleNodes *= 2;
-  assert( nbTot > nbSampleNodes*commSize) ;
+//  assert( nbTot > nbSampleNodes*commSize) ;
     
   int nbSampleNodes1 = nbSampleNodes * (nb1*commSize)/(1.*nbTot) ;
@@ -332 +332 @@
         }
 */
-        for (int i = 0; i <nbSampleNodes1; i++) sampleNodes.push_back(Node(node[randomArray1[i]].centre,  node[randomArray1[i]].radius, NULL));
-        for (int i = 0; i <nbSampleNodes2; i++) sampleNodes.push_back(Node(node2[randomArray2[i]].centre, node2[randomArray2[i]].radius, NULL));
+        for (int i = 0; i <nbSampleNodes1; i++) sampleNodes.push_back(Node(node[randomArray1[i%nb1]].centre,  node[randomArray1[i%nb1]].radius, NULL));
+        for (int i = 0; i <nbSampleNodes2; i++) sampleNodes.push_back(Node(node2[randomArray2[i%nb2]].centre, node2[randomArray2[i%nb2]].radius, NULL));
 
 /*