Changeset 1646 for XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_intercomm.cpp

Timestamp:

01/31/19 12:12:52 (5 years ago)

Author:

yushan

Message:

branch merged with trunk @1645. arch file (ep&mpi) added for ADA

File:

• XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_intercomm.cpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_intercomm.cpp

@@ +1 @@
+#ifdef _usingEP
 #include "ep_lib.hpp"
 #include <mpi.h>
@@ -354 +355 @@
       if(is_real_involved)
       {
+        #pragma omp critical (_mpi_call)
         ::MPI_Intercomm_create(extracted_comm, local_leader_rank_in_extracted_comm, to_mpi_comm(peer_comm->mpi_comm), remote_leader_rank_in_peer_mpi, tag, &mpi_inter_comm);
         ::MPI_Intercomm_merge(mpi_inter_comm, !priority, intracomm);
@@ -550 +552 @@
 
 }
+#endif