Changeset 1661 for XIOS/dev/dev_trunk_omp/extern/remap/src/mpi_routing.cpp

Timestamp:

05/15/19 17:19:08 (5 years ago)

Author:

yushan

Message:

MARK: branch merged with trunk @1660. Test (test_complete, test_remap) on ADA with IntelMPI and _usingEP/_usingMPI as switch.

File:

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

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

@@ -153 +153 @@
         for (int i = 0; i < nbSource; i++)
         {
+                #ifdef _usingEP
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, -2, 0, communicator, &request[indexRequest++]);
+                #endif
+                
+                #ifdef _usingMPI
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest++]);
+                #endif
         }
         MPI_Barrier(communicator);
@@ -171 +177 @@
         for (int i = 0; i < nbSource; i++)
         {
+#ifdef _usingEP
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, -2, 0, communicator, &request[indexRequest]);
+#endif
+#ifdef _usingMPI
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest]);
+#endif
                 indexRequest++;
         }