Changeset 1328 for XIOS/dev/branch_openmp/extern/remap/src/mpi_routing.cpp

Timestamp:

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

Author:

yushan

Message:

dev_omp

File:

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

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

@@ -5 +5 @@
 #include "timerRemap.hpp"
 #include <iostream>
-#ifdef _usingEP
-#include "ep_declaration.hpp"
-#endif
+using namespace ep_lib;
 
 namespace sphereRemap {
@@ -125 +123 @@
         CTimer::get("CMPIRouting::init(reduce_scatter)").print();
 
-        MPI_Info info_null;
-
-        // MPI_Alloc_mem(nbTarget *sizeof(int), info_null, &targetRank);
-        // MPI_Alloc_mem(nbSource *sizeof(int), info_null, &sourceRank);
         MPI_Alloc_mem(nbTarget *sizeof(int), MPI_INFO_NULL, &targetRank);
         MPI_Alloc_mem(nbSource *sizeof(int), MPI_INFO_NULL, &sourceRank);
@@ -158 +152 @@
         {
                 #ifdef _usingEP
-                MPI_Irecv(&sourceRank[i], 1, MPI_INT, -1, 0, communicator, &request[indexRequest]);
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, -2, 0, communicator, &request[indexRequest]);
                 #else
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest]);
@@ -182 +176 @@
         {
                 #ifdef _usingEP
-                MPI_Irecv(&sourceRank[i], 1, MPI_INT, -1, 0, communicator, &request[indexRequest]);
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, -2, 0, communicator, &request[indexRequest]);
                 #else
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest]);