Changeset 1072 for XIOS/dev/branch_yushan/extern/src_ep_dev/ep_intercomm_world.cpp

Timestamp:

03/14/17 19:12:25 (7 years ago)

Author:

yushan

Message:

Using threads : modif for xios_initialize

File:

• XIOS/dev/branch_yushan/extern/src_ep_dev/ep_intercomm_world.cpp (modified) (4 diffs)

XIOS/dev/branch_yushan/extern/src_ep_dev/ep_intercomm_world.cpp

@@ -417 +417 @@
 
             found = true;
-            tag_list.erase(iter);
+            //tag_list.erase(iter);
             break;
           }
@@ -426 +426 @@
     MPI_Barrier_local(local_comm);
 
-    // if(is_proc_master)
-    // {
-    //   for(std::list<std::pair < std::pair<int,int>, MPI_Comm* > >::iterator iter = tag_list.begin(); iter!=tag_list.end(); iter++)
-    //   {
-    //     if((*iter).first == make_pair(tag, min(leader_info[0], leader_info[1])))
-    //     {
-    //       tag_list.erase(iter);
-    //     }
-    //   }
-    // }
+    if(is_proc_master)
+    {
+      for(std::list<std::pair < std::pair<int,int>, MPI_Comm* > >::iterator iter = tag_list.begin(); iter!=tag_list.end(); iter++)
+      {
+        if((*iter).first == make_pair(tag, min(leader_info[0], leader_info[1])))
+        {
+          tag_list.erase(iter);
+          break;
+        }
+      }
+    }
 
     
@@ -934 +935 @@
 
             found = true;
-            tag_list.erase(iter);
+            //tag_list.erase(iter);
             break;
           }
@@ -943 +944 @@
     MPI_Barrier_local(local_comm);
 
-    // if(is_proc_master)
-    // {
-    //   for(std::list<std::pair < std::pair<int,int>, MPI_Comm* > >::iterator iter = tag_list.begin(); iter!=tag_list.end(); iter++)
-    //   {
-    //     if((*iter).first == make_pair(tag, min(leader_info[0], leader_info[1])))
-    //     {
-    //       tag_list.erase(iter);
-    //     }
-    //   }
-    // }
+    if(is_proc_master)
+    {
+      for(std::list<std::pair < std::pair<int,int>, MPI_Comm* > >::iterator iter = tag_list.begin(); iter!=tag_list.end(); iter++)
+      {
+        if((*iter).first == make_pair(tag, min(leader_info[0], leader_info[1])))
+        {
+          tag_list.erase(iter);
+          break;
+        }
+      }
+    }
 
     int intercomm_ep_rank, intercomm_ep_rank_loc, intercomm_mpi_rank;