Changeset 1053 for XIOS/dev/branch_yushan/extern/src_ep_dev/ep_scan.cpp

Timestamp:

02/17/17 17:55:37 (7 years ago)

Author:

yushan

Message:

ep_lib namespace specified when netcdf involved

File:

• XIOS/dev/branch_yushan/extern/src_ep_dev/ep_scan.cpp (modified) (3 diffs)

XIOS/dev/branch_yushan/extern/src_ep_dev/ep_scan.cpp

@@ -432 +432 @@
     if(!comm.is_ep)
     {
-      #ifdef _serialized
-      #pragma omp critical (_mpi_call)
-      #endif // _serialized
+
       ::MPI_Scan(sendbuf, recvbuf, count, static_cast< ::MPI_Datatype>(datatype),
                  static_cast< ::MPI_Op>(op), static_cast< ::MPI_Comm>(comm.mpi_comm));
@@ -455 +453 @@
 
     ::MPI_Aint datasize, lb;
-    #ifdef _serialized
-    #pragma omp critical (_mpi_call)
-    #endif // _serialized
+
     ::MPI_Type_get_extent(static_cast< ::MPI_Datatype>(datatype), &lb, &datasize);
 
@@ -484 +480 @@
     if(ep_rank_loc == 0)
     {
-      #ifdef _serialized
-      #pragma omp critical (_mpi_call)
-      #endif // _serialized
       ::MPI_Exscan(local_sum, mpi_scan_recvbuf, count, static_cast< ::MPI_Datatype>(datatype), static_cast< ::MPI_Op>(op), static_cast< ::MPI_Comm>(comm.mpi_comm));
     }