Changeset 1665 for XIOS/dev/dev_trunk_omp/extern

Timestamp:

05/20/19 13:14:51 (5 years ago)

Author:

yushan

Message:

MARK: branch merged with trunk @1660. Add option --omp to enable multithreading.

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

@@ -155 +155 @@
                 #ifdef _usingEP
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, -2, 0, communicator, &request[indexRequest++]);
-                #endif
-                
-                #ifdef _usingMPI
+                #else
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest++]);
                 #endif
@@ -179 +177 @@
 #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]);
+#else
+    MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest]);
 #endif
                 indexRequest++;