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

Timestamp:

01/23/19 10:31:44 (6 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

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

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

@@ -15 +15 @@
 #include "cputime.hpp" // cputime
 
-using namespace ep_lib;
-
 using namespace sphereRemap ;
 
@@ -22 +20 @@
    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
@@ -43 +41 @@
         assert(n_cell_dst >= 4);
         assert(1 <= order && order <= 2);
-
-  mapper = new Mapper(MPI_COMM_WORLD);
+  double* src_area=NULL ;
+  double* dst_area=NULL ;
+  mapper = new Mapper(EP_COMM_WORLD);
   mapper->setVerbosity(PROGRESS) ;
-  mapper->setSourceMesh(src_bounds_lon, src_bounds_lat, n_vert_per_cell_src, n_cell_src, src_pole ) ;
-  mapper->setTargetMesh(dst_bounds_lon, dst_bounds_lat, n_vert_per_cell_dst, n_cell_dst, dst_pole ) ;
+  mapper->setSourceMesh(src_bounds_lon, src_bounds_lat, src_area, n_vert_per_cell_src, n_cell_src, src_pole ) ;
+  mapper->setTargetMesh(dst_bounds_lon, dst_bounds_lat, dst_area, n_vert_per_cell_dst, n_cell_dst, dst_pole ) ;
 
 /*