Changeset 1172 for XIOS/dev/branch_yushan_merged/extern/remap/src/parallel_tree.cpp

Timestamp:

06/15/17 19:32:13 (7 years ago)

Author:

yushan

Message:

save dev. need to unify the file type when using EP

File:

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

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

@@ -315 +315 @@
 {
 
-        int assignLevel = 2;
-        int nbSampleNodes = 2*ipow(MAX_NODE_SZ + 1, assignLevel);
+  int assignLevel = 2;
+  int nbSampleNodes = 2*ipow(MAX_NODE_SZ + 1, assignLevel);
 
 
@@ -326 +326 @@
   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) ;
@@ -335 +335 @@
   
 
-//      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);
+  //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);
 
 /*