Changeset 1155 for XIOS/dev/branch_yushan_merged/extern

Timestamp:

06/06/17 15:12:34 (7 years ago)

Author:

yushan

Message:

test_remap OK with openmp

Location:

XIOS/dev/branch_yushan_merged/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) (2 diffs)
• mapper.cpp (modified) (1 diff)
• node.cpp (modified) (1 diff)
• parallel_tree.cpp (modified) (1 diff)

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

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

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

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

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

@@ -16 +16 @@
 
 using namespace std;
+
+extern CRemapGrid srcGrid;
+#pragma omp threadprivate(srcGrid)
+
+extern CRemapGrid tgtGrid;
+#pragma omp threadprivate(tgtGrid)
 
 /** returns index of edge of a that is shared with b,

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

@@ -16 +16 @@
 using namespace std;
 using namespace ClipperLib ;
+
+extern CRemapGrid srcGrid;
+#pragma omp threadprivate(srcGrid)
+
+extern CRemapGrid tgtGrid;
+#pragma omp threadprivate(tgtGrid)
 
 double intersect_ym(Elt *a, Elt *b)

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

@@ -14 +14 @@
 #include "mapper.hpp"
 #include "cputime.hpp" // cputime
+#include "gridRemap.hpp"
 
 using namespace sphereRemap ;
+
+extern CRemapGrid srcGrid;
+#pragma omp threadprivate(srcGrid)
+
+extern CRemapGrid tgtGrid;
+#pragma omp threadprivate(tgtGrid)
+
 
 /* mapper is a ponter to a global class instance whoes members are allocated in the first step (finding the sizes of the weight arrays)
    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
@@ -148 +156 @@
         char **argv = NULL;
         MPI_Init(&argc, &argv);*/
-        MPI_Init(NULL, NULL);
+        //MPI_Init(NULL, NULL);
+        int provided;
+        MPI_Init_thread(NULL, NULL, 3, &provided);
+        assert(provided >= 3);
 }
 

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

@@ -14 +14 @@
 
 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_yushan_merged/extern/remap/src/node.cpp

@@ -254 +254 @@
 NodePtr insert(NodePtr thIs, NodePtr node)
 {
-        int la = thIs->level; // node to be inserted
-        int lb = node->level; // node where insertation
-        assert(la < lb); // node to be inserted must have lower level then parent
-        //if (thIs->parent) assert(find_in_tree1(thIs) == true);
-        NodePtr q = NULL;
-        NodePtr chd = NULL;
-        node->move(thIs);
-        if (la == lb - 1)
-        {
+  int la = thIs->level; // node to be inserted
+  int lb = node->level; // node where insertation
+  assert(la < lb); // node to be inserted must have lower level then parent
+  //if (thIs->parent) assert(find_in_tree1(thIs) == true);
+  NodePtr q = NULL;
+  NodePtr chd = NULL;
+  node->move(thIs);
+  if (la == lb - 1)
+  {
     node->child.push_back(thIs);
-                thIs->parent = node;
-                if (node->child.size() > MAX_NODE_SZ &&  node->tree->canSplit() ) // with us as additional child `node` is now too large :(
-                        return (node->reinserted || node->parent == NULL) ? split(node) : reinsert(node);
-        }
-        else // la < lb - 1
-        {
-                chd = thIs->closest(node->child);
-                q = insert(thIs, chd);
-        }
-        if ((node->updateCount + 1) % UPDATE_EVERY == 0)
-                node->update();
-        else
-        {
-                if (q) node->remove(q);
-                node->inflate(chd);
-        }
-
+    thIs->parent = node;
+    if (node->child.size() > MAX_NODE_SZ &&  node->tree->canSplit() ) // with us as additional child `node` is now too large :(
+    return (node->reinserted || node->parent == NULL) ? split(node) : reinsert(node);
+  }
+  else // la < lb - 1
+  {
+    chd = thIs->closest(node->child);
+    q = insert(thIs, chd);
+  }
+  if ((node->updateCount + 1) % UPDATE_EVERY == 0)
+    node->update();
+  else
+  {
+    if (q) node->remove(q);
+    node->inflate(chd);
+  }
 
   return q;

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

@@ -16 +16 @@
 
 static const int assignLevel = 2;
+
+extern CRemapGrid srcGrid;
+#pragma omp threadprivate(srcGrid)
+
+extern CRemapGrid tgtGrid;
+#pragma omp threadprivate(tgtGrid)
 
 // only the circle is packed, rest of node will be initialized on unpacking