Changeset 1134 for XIOS/dev/branch_yushan_merged/extern/remap/src/mpi_routing.cpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/extern/remap/src/mpi_routing.cpp (modified) (4 diffs)

XIOS/dev/branch_yushan_merged/extern/remap/src/mpi_routing.cpp

@@ -5 +5 @@
 #include "timerRemap.hpp"
 #include <iostream>
+#ifdef _usingEP
+#include "ep_declaration.hpp"
+#endif
 
 namespace sphereRemap {
@@ -122 +125 @@
         CTimer::get("CMPIRouting::init(reduce_scatter)").print();
 
-        MPI_Alloc_mem(nbTarget *sizeof(int), MPI_INFO_NULL, &targetRank);
-        MPI_Alloc_mem(nbSource *sizeof(int), MPI_INFO_NULL, &sourceRank);
+        MPI_Info info_null;
+
+        MPI_Alloc_mem(nbTarget *sizeof(int), info_null, &targetRank);
+        MPI_Alloc_mem(nbSource *sizeof(int), info_null, &sourceRank);
 
         targetRankToIndex = new int[mpiSize];
@@ -150 +155 @@
         for (int i = 0; i < nbSource; i++)
         {
+                #ifdef _usingEP
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, -1, 0, communicator, &request[indexRequest]);
+                #else
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest]);
+                #endif
                 indexRequest++;
         }
@@ -170 +179 @@
         for (int i = 0; i < nbSource; i++)
         {
+                #ifdef _usingEP
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, -1, 0, communicator, &request[indexRequest]);
+                #else
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest]);
+                #endif
                 indexRequest++;
         }