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

Timestamp:

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

Author:

yushan

Message:

dev_omp

File:

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

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

@@ -14 +14 @@
 #include "mapper.hpp"
 #include "cputime.hpp" // cputime
-#include <stdio.h>
+
+using namespace ep_lib;
 
 using namespace sphereRemap ;
@@ -21 +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
@@ -33 +34 @@
                      int order, int* n_weights)
 {
-  assert(src_bounds_lon);
-  assert(src_bounds_lat);
-  assert(n_vert_per_cell_src >= 3);
-  assert(n_cell_src >= 4);
-  assert(dst_bounds_lon);
-  assert(dst_bounds_lat);
-  assert(n_vert_per_cell_dst >= 3);
-  assert(n_cell_dst >= 4);
-  assert(1 <= order && order <= 2);
+        assert(src_bounds_lon);
+        assert(src_bounds_lat);
+        assert(n_vert_per_cell_src >= 3);
+        assert(n_cell_src >= 4);
+        assert(dst_bounds_lon);
+        assert(dst_bounds_lat);
+        assert(n_vert_per_cell_dst >= 3);
+        assert(n_cell_dst >= 4);
+        assert(1 <= order && order <= 2);
 
   mapper = new Mapper(MPI_COMM_WORLD);
@@ -80 +81 @@
         double tic = cputime();
         mapper = new Mapper(MPI_COMM_WORLD);
-        mapper->setVerbosity(PROGRESS) ;
+  mapper->setVerbosity(PROGRESS) ;
         mapper->buildSSTree(src_msh, dst_msh);
         double tac = cputime();
@@ -149 +150 @@
         char **argv = NULL;
         MPI_Init(&argc, &argv);*/
-        //MPI_Init(NULL, NULL);
-        int provided;
-        MPI_Init_thread(NULL, NULL, 3, &provided);
-        assert(provided >= 3);
+        MPI_Init(NULL, NULL);
 }