Changeset 812

Timestamp:

01/08/16 11:07:01 (8 years ago)

Author:

ymipsl

Message:

Remapping library : some fix when grid is to small and cannot be shared between requiered number of mpi process

YM

File:

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

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

@@ -290 +290 @@
         nbSampleNodes *= 2;
 
-        assert(node.size() > nbSampleNodes);
-        assert(node2.size() > nbSampleNodes);
+//      assert(node.size() > nbSampleNodes);
+//      assert(node2.size() > nbSampleNodes);
+        assert(node.size() + node2.size() > nbSampleNodes);
         vector<Node> sampleNodes; sampleNodes.reserve(nbSampleNodes);
 
@@ -299 +300 @@
         randomizeArray(randomArray2);
 
-        for (int i = 0; i < nbSampleNodes/2; i++)
-        {
-                sampleNodes.push_back(Node(node[randomArray1[i]].centre,  node[randomArray1[i]].radius, NULL));
-                sampleNodes.push_back(Node(node2[randomArray2[i]].centre, node2[randomArray2[i]].radius, NULL));
-        }
-
+        
+        int s1,s2 ;
+        
+        if (node.size()< nbSampleNodes/2)
+        { 
+          s1 = node.size() ;
+          s2 = nbSampleNodes-s1 ;
+        }
+        else if (node2.size()< nbSampleNodes/2)
+        {
+          s2 = node.size() ;
+          s1 = nbSampleNodes-s2 ;
+        }
+        else
+        {
+          s1=nbSampleNodes/2 ;
+          s2=nbSampleNodes/2 ;
+        }
+        for (int i = 0; i <s1; i++) sampleNodes.push_back(Node(node[randomArray1[i]].centre,  node[randomArray1[i]].radius, NULL));
+        for (int i = 0; i <s2; i++)  sampleNodes.push_back(Node(node2[randomArray2[i]].centre, node2[randomArray2[i]].radius, NULL));
+
+/*          
+        for (int i = 0; i < nbSampleNodes/2; i++)
+        {
+          sampleNodes.push_back(Node(node[randomArray1[i]].centre,  node[randomArray1[i]].radius, NULL));
+          sampleNodes.push_back(Node(node2[randomArray2[i]].centre, node2[randomArray2[i]].radius, NULL));
+        }
+*/
         CTimer::get("buildParallelSampleTree").resume();
         //sampleTree.buildParallelSampleTree(sampleNodes, cascade);