Changeset 1335 for XIOS

Timestamp:

11/20/17 15:25:03 (6 years ago)

Author:

yushan

Message:

dev_omp

Location:

XIOS/dev/branch_openmp/extern/remap/src

Files:

• gridRemap.cpp (modified) (1 diff)
• gridRemap.hpp (modified) (1 diff)
• intersect.cpp (modified) (1 diff)
• intersection_ym.cpp (modified) (1 diff)
• libmapper.cpp (modified) (1 diff)
• mapper.cpp (modified) (1 diff)
• parallel_tree.cpp (modified) (1 diff)

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

@@ -11 +11 @@
 
 CRemapGrid srcGrid;
+#pragma omp threadprivate(srcGrid)
 
 CRemapGrid tgtGrid;
+#pragma omp threadprivate(tgtGrid)
 
 }

XIOS/dev/branch_openmp/extern/remap/src/gridRemap.hpp

@@ -14 +14 @@
 Coord readPole(std::istream&);
 
-extern CRemapGrid srcGrid;
-extern CRemapGrid tgtGrid;
+
 
 }

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

@@ -14 +14 @@
 
 namespace sphereRemap {
+
+extern CRemapGrid srcGrid;
+#pragma omp threadprivate(srcGrid)
+
+extern CRemapGrid tgtGrid;
+#pragma omp threadprivate(tgtGrid)
 
 using namespace std;

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

@@ -13 +13 @@
 
 namespace sphereRemap {
+
+extern CRemapGrid srcGrid;
+#pragma omp threadprivate(srcGrid)
+
+extern CRemapGrid tgtGrid;
+#pragma omp threadprivate(tgtGrid)
+
 
 using namespace std;

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

@@ -22 +22 @@
    and deallocated during the second step (computing the weights) */
 Mapper *mapper;
-
+#pragma omp threadprivate(mapper)
 
 /** xxx_bounds_yyy is of length n_vert_per_cell_xxx*n_cell_xxx

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

@@ -15 +15 @@
 
 namespace sphereRemap {
+
+extern CRemapGrid srcGrid;
+#pragma omp threadprivate(srcGrid)
+
+extern CRemapGrid tgtGrid;
+#pragma omp threadprivate(tgtGrid)
+
 
 /* A subdivition of an array into N sub-arays

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

@@ -15 +15 @@
 
 namespace sphereRemap {
+
+extern CRemapGrid srcGrid;
+#pragma omp threadprivate(srcGrid)
+
+extern CRemapGrid tgtGrid;
+#pragma omp threadprivate(tgtGrid)
 
 static const int assignLevel = 2;