Changeset 1539 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_comm.hpp

Timestamp:

06/12/18 11:54:13 (6 years ago)

Author:

yushan

Message:

update intercomm_merge and remove redundant files

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_comm.hpp (modified) (4 diffs)

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_comm.hpp

@@ -3 +3 @@
 
 #include "ep_message.hpp"
-#include "ep_intercomm.hpp"
 #include "ep_barrier.hpp"
 #include "ep_buffer.hpp"
@@ -10 +9 @@
 typedef std::vector< std::pair<int, int> > RANK_MAP;  // at(ep_rank) = <ep_rank_local, mpi_rank>
 typedef std::map<int, std::pair<int, int> > EP_RANK_MAP;  // key(ep_rank) = <ep_rank_local, mpi_rank>
-//typedef std::vector<std::pair< std::pair<int, int>, std::pair<int, int> > > INTERCOMM_RANK_MAP;
 typedef std::list<ep_lib::MPI_Message > Message_list;
+typedef std::map<int, int > INTER_RANK_MAP;
 
 namespace ep_lib
@@ -26 +25 @@
                                       // 2: mpi_rank,    mpi_size
 
-                                      // for intercomm : = size_rank_info of local_comm
-
-
     ep_comm **comm_list;
 
     Message_list *message_queue;
 
-
-    int comm_label;
-
-    ep_intercomm *intercomm;
-    
   };
   
@@ -52 +43 @@
     ep_barrier *ep_barrier;
 
-    EP_RANK_MAP   *ep_rank_map;      // for intercomm : = ep_rank_map of newcomm
+    EP_RANK_MAP   *ep_rank_map;
     
-
+    INTER_RANK_MAP *inter_rank_map;
 
     void* mpi_comm;