Changeset 1500 for XIOS/dev/branch_openmp/extern/ep_dev/ep_split.cpp

Timestamp:

05/28/18 09:54:32 (6 years ago)

Author:

yushan

Message:

save dev

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_split.cpp (modified) (3 diffs)

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

@@ -39 +39 @@
     int ep_size, num_ep, mpi_size;
 
-    ep_rank = comm.ep_comm_ptr->size_rank_info[0].first;
-    ep_rank_loc = comm.ep_comm_ptr->size_rank_info[1].first;
-    mpi_rank = comm.ep_comm_ptr->size_rank_info[2].first;
-    ep_size = comm.ep_comm_ptr->size_rank_info[0].second;
-    num_ep = comm.ep_comm_ptr->size_rank_info[1].second;
-    mpi_size = comm.ep_comm_ptr->size_rank_info[2].second;
+    ep_rank = comm->ep_comm_ptr->size_rank_info[0].first;
+    ep_rank_loc = comm->ep_comm_ptr->size_rank_info[1].first;
+    mpi_rank = comm->ep_comm_ptr->size_rank_info[2].first;
+    ep_size = comm->ep_comm_ptr->size_rank_info[0].second;
+    num_ep = comm->ep_comm_ptr->size_rank_info[1].second;
+    mpi_size = comm->ep_comm_ptr->size_rank_info[2].second;
 
     int num_color = 0;
@@ -147 +147 @@
         if(matched_number_loc[j] == 0) master_color = MPI_UNDEFINED;
 
-        ::MPI_Comm_split(to_mpi_comm(comm.mpi_comm), master_color, mpi_rank, split_mpi_comm[j]);
+        ::MPI_Comm_split(to_mpi_comm(comm->mpi_comm), master_color, mpi_rank, split_mpi_comm[j]);
         
-        comm.ep_comm_ptr->comm_list->mpi_bridge = split_mpi_comm[j];
+        comm->ep_comm_ptr->comm_list[0]->mpi_bridge = split_mpi_comm[j];
       }
       MPI_Barrier_local(comm);
@@ -160 +160 @@
         MPI_Comm *ep_comm;
 
-        MPI_Comm_create_endpoints(comm.ep_comm_ptr->comm_list->mpi_bridge, num_new_ep, info, ep_comm);
+        MPI_Comm_create_endpoints(comm->ep_comm_ptr->comm_list[0]->mpi_bridge, num_new_ep, info, ep_comm);
 
 
-        comm.ep_comm_ptr->comm_list->mem_bridge = ep_comm;
+        comm->ep_comm_ptr->comm_list[0]->mem_bridge = ep_comm;
       }
       MPI_Barrier_local(comm);
       if(color == all_color[j])
       {
-        *newcomm = comm.ep_comm_ptr->comm_list->mem_bridge[new_ep_rank_loc];
+        *newcomm = comm->ep_comm_ptr->comm_list[0]->mem_bridge[new_ep_rank_loc];
 
-        (*newcomm).ep_comm_ptr->comm_label = color;
+        (*newcomm)->ep_comm_ptr->comm_label = color;
       }
     }