Changeset 1646 for XIOS/dev/dev_trunk_omp/extern/remap/src/libmapper.cpp

Timestamp:

01/31/19 12:12:52 (5 years ago)

Author:

yushan

Message:

branch merged with trunk @1645. arch file (ep&mpi) added for ADA

File:

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

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

@@ -15 +15 @@
 #include "cputime.hpp" // cputime
 
+#ifdef _usingEP
 using namespace ep_lib;
+#endif
 
 using namespace sphereRemap ;
@@ -43 +45 @@
         assert(n_cell_dst >= 4);
         assert(1 <= order && order <= 2);
-
+  double* src_area=NULL ;
+  double* dst_area=NULL ;
   mapper = new Mapper(MPI_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 ) ;
 
 /*