Changeset 1540 for XIOS/dev/branch_openmp/extern/ep_dev/ep_intercomm.cpp

Timestamp:

06/12/18 14:21:57 (6 years ago)

Author:

yushan

Message:

add modif for workflow_cmip6

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_intercomm.cpp (modified) (2 diffs)

XIOS/dev/branch_openmp/extern/ep_dev/ep_intercomm.cpp

@@ -418 +418 @@
     }
 
-    int my_turn = ownership==1? ep_rank_loc : ep_rank_loc+repeated;
-
-#ifdef _showinfo
-
-    MPI_Barrier(peer_comm);
-    MPI_Barrier(peer_comm);
-    printf("peer_rank = %d, ep_rank_loc = %d, ownership = %d, repeated = %d, my_turn = %d\n", peer_comm->ep_comm_ptr->size_rank_info[0].first, ep_rank_loc, ownership, repeated, my_turn);
+    int new_ep_rank_loc = ownership==1? ep_rank_loc : ep_rank_loc+repeated;
+
+#ifdef _showinfo
+
+    MPI_Barrier(peer_comm);
+    MPI_Barrier(peer_comm);
+    printf("peer_rank = %d, ep_rank_loc = %d, ownership = %d, repeated = %d, new_ep_rank_loc = %d\n", peer_comm->ep_comm_ptr->size_rank_info[0].first, ep_rank_loc, ownership, repeated, new_ep_rank_loc);
     MPI_Barrier(peer_comm);
     MPI_Barrier(peer_comm);
@@ -441 +441 @@
           if(iter->first == make_pair(tag, min(local_leader_rank_in_world, remote_leader_rank_in_world)))
           {
-            *newintercomm = iter->second.first[my_turn];
+            *newintercomm = iter->second.first[new_ep_rank_loc];
             
             iter->second.second.second++;