Changeset 1602 for XIOS/dev/dev_trunk_omp/extern/remap/src/parallel_tree.cpp

Timestamp:

11/19/18 16:28:03 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

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

XIOS/dev/dev_trunk_omp/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;
@@ -114 +121 @@
 }
 
-//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);
-        for (int lev = 0; lev < cascade.num_levels; lev++)
-                treeCascade.push_back(CSampleTree(cascade.level[lev].group_size, assignLevel));
+CParallelTree::CParallelTree(MPI_Comm comm) : communicator(comm), cascade(MIN_NODE_SZ*MIN_NODE_SZ*2, comm)
+{
+  treeCascade.reserve(cascade.num_levels);
+  for (int lev = 0; lev < cascade.num_levels; lev++)
+    treeCascade.push_back(CSampleTree(cascade.level[lev].group_size, assignLevel));
 }