Changeset 1328 for XIOS/dev/branch_openmp/extern/remap/src/parallel_tree.cpp

Timestamp:

11/15/17 12:14:34 (6 years ago)

Author:

yushan

Message:

dev_omp

File:

• XIOS/dev/branch_openmp/extern/remap/src/parallel_tree.cpp (modified) (5 diffs)

XIOS/dev/branch_openmp/extern/remap/src/parallel_tree.cpp

@@ -12 +12 @@
 
 #include "parallel_tree.hpp"
+using namespace ep_lib;
 
 namespace sphereRemap {
-
-extern CRemapGrid srcGrid;
-#pragma omp threadprivate(srcGrid)
-
-extern CRemapGrid tgtGrid;
-#pragma omp threadprivate(tgtGrid)
 
 static const int assignLevel = 2;
@@ -292 +287 @@
 {
 
-  int assignLevel = 2;
-  int nbSampleNodes = 2*ipow(MAX_NODE_SZ + 1, assignLevel);
+        int assignLevel = 2;
+        int nbSampleNodes = 2*ipow(MAX_NODE_SZ + 1, assignLevel);
 
 
@@ -305 +300 @@
   MPI_Comm_size(communicator,&commSize) ;
   
-  // make multiple of two
-  nbSampleNodes /= 2;
-  nbSampleNodes *= 2;
-  //assert( nbTot > nbSampleNodes*commSize) ;
+        // make multiple of two
+        nbSampleNodes /= 2;
+        nbSampleNodes *= 2;
+//  assert( nbTot > nbSampleNodes*commSize) ;
     
   int nbSampleNodes1 = nbSampleNodes * (nb1*commSize)/(1.*nbTot) ;
@@ -314 +309 @@
   
 
-  //assert(node.size() > nbSampleNodes);
-  //assert(node2.size() > nbSampleNodes);
-  //assert(node.size() + node2.size() > nbSampleNodes);
-  vector<Node> sampleNodes; sampleNodes.reserve(nbSampleNodes1+nbSampleNodes2);
-
-  vector<int> randomArray1(node.size());
-  randomizeArray(randomArray1);
-  vector<int> randomArray2(node2.size());
-  randomizeArray(randomArray2);
-
-  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));
+//      assert(node.size() > nbSampleNodes);
+//      assert(node2.size() > nbSampleNodes);
+//      assert(node.size() + node2.size() > nbSampleNodes);
+        vector<Node> sampleNodes; sampleNodes.reserve(nbSampleNodes1+nbSampleNodes2);
+
+        vector<int> randomArray1(node.size());
+        randomizeArray(randomArray1);
+        vector<int> randomArray2(node2.size());
+        randomizeArray(randomArray2);
+
+        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));
 
         CTimer::get("buildParallelSampleTree").resume();
@@ -336 +331 @@
         CTimer::get("parallelRouteNode").resume();
         vector<int> route(node.size());
+        cout<<"node.size = "<<node.size()<<endl;
         routeNodes(route /*out*/, node);
         CTimer::get("parallelRouteNode").suspend();