Changeset 1328 for XIOS/dev/branch_openmp/src/event_scheduler.cpp

Timestamp:

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

Author:

yushan

Message:

dev_omp

File:

• XIOS/dev/branch_openmp/src/event_scheduler.cpp (modified) (3 diffs)

XIOS/dev/branch_openmp/src/event_scheduler.cpp

@@ -2 +2 @@
 #include "xios_spl.hpp"
 #include "mpi.hpp"
+using namespace ep_lib;
 
 namespace xios
@@ -132 +133 @@
     while(received)
     {
-      #ifdef _usingEP
-      MPI_Iprobe(-1,1,communicator,&received, &status) ;
-      #else
-      MPI_Iprobe(MPI_ANY_SOURCE,1,communicator,&received, &status) ;
-      #endif
+      MPI_Iprobe(-2,1,communicator,&received, &status) ;
       if (received)
       {
         recvRequest=new SPendingRequest ;
-        #ifdef _usingEP
-        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, -1, 1, communicator, &(recvRequest->request)) ;
-        #else
-        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, MPI_ANY_SOURCE, 1, communicator, &(recvRequest->request)) ;
-        #endif
+        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, -2, 1, communicator, &(recvRequest->request)) ;
         pendingRecvParentRequest.push(recvRequest) ;
       }
@@ -182 +175 @@
     while(received)
     {
-      #ifdef _usingEP
-      MPI_Iprobe(-1,0,communicator,&received, &status) ;
-      #else
-      MPI_Iprobe(MPI_ANY_SOURCE,0,communicator,&received, &status) ;
-      #endif
+      MPI_Iprobe(-2,0,communicator,&received, &status) ;
       if (received)
       {
         recvRequest=new SPendingRequest ;
-        #ifdef _usingEP
-        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, -1, 0, communicator, &recvRequest->request) ;
-        #else
-        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, MPI_ANY_SOURCE, 0, communicator, &recvRequest->request) ;
-        #endif
+        MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, -2, 0, communicator, &recvRequest->request) ;
         pendingRecvChildRequest.push_back(recvRequest) ;
       }