Changeset 1354 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_merge.cpp

Timestamp:

12/04/17 17:12:00 (6 years ago)

Author:

yushan

Message:

omp dev : unify MPI_Comm type

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_merge.cpp (modified) (4 diffs)

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_merge.cpp

@@ -2 +2 @@
 #include <mpi.h>
 #include "ep_declaration.hpp"
+#include "ep_mpi.hpp"
 
 using namespace std;
@@ -84 +85 @@
     if(intra_ep_rank_loc == 0)
     {
-      ::MPI_Bcast(reorder, intra_ep_size, static_cast< ::MPI_Datatype> (MPI_INT), 0, static_cast< ::MPI_Comm>(newintracomm->mpi_comm));
+      ::MPI_Bcast(reorder, intra_ep_size, to_mpi_type(MPI_INT), 0, to_mpi_comm(newintracomm->mpi_comm));
 
       vector< pair<int, int> > tmp_rank_map(intra_ep_size);
@@ -142 +143 @@
 
 
-    ::MPI_Comm mpi_intracomm;
+    ::MPI_Comm *mpi_intracomm = new ::MPI_Comm;
     MPI_Comm *ep_intracomm;
 
@@ -148 +149 @@
     {
 
-      ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(inter_comm.ep_comm_ptr->intercomm->mpi_inter_comm);
-
-      ::MPI_Intercomm_merge(mpi_comm, high, &mpi_intracomm);
+      ::MPI_Comm mpi_comm = to_mpi_comm(inter_comm.ep_comm_ptr->intercomm->mpi_inter_comm);
+
+      ::MPI_Intercomm_merge(mpi_comm, high, mpi_intracomm);
       MPI_Info info;
       MPI_Comm_create_endpoints(mpi_intracomm, num_ep, info, ep_intracomm);