Changeset 1060 for XIOS/dev/branch_yushan/extern

Timestamp:

02/23/17 15:51:56 (7 years ago)

Author:

yushan

Message:

minor corrections + clean up

Location:

XIOS/dev/branch_yushan/extern/src_ep_dev

Files:

• ep_create.cpp (modified) (1 diff)
• ep_fortran.cpp (modified) (2 diffs)
• ep_intercomm.cpp (modified) (3 diffs)
• ep_lib.cpp (modified) (1 diff)
• ep_probe.cpp (modified) (2 diffs)

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

@@ -185 +185 @@
     }
 
-    printf("ep_lib::MPI_Comm_create_endpoints()       OK from void*\n");
+    //printf("ep_lib::MPI_Comm_create_endpoints()       OK from void*\n");
 
     return 0;

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

@@ -32 +32 @@
     {
       fc_comm_map.insert(std::make_pair( std::make_pair( fint, omp_get_thread_num()) , comm));
-      printf("EP_Comm_c2f : MAP insert: %d, %d, %p\n", fint, omp_get_thread_num(), &comm);
+      //printf("EP_Comm_c2f : MAP insert: %d, %d, %p\n", fint, omp_get_thread_num(), &comm);
     }
     
@@ -52 +52 @@
       MPI_Comm comm_ptr;
       comm_ptr =  it->second;
-      printf("EP_Comm_f2c : MAP find: %d, %d, %p\n", it->first.first, it->first.second, &comm_ptr);
+      //printf("EP_Comm_f2c : MAP find: %d, %d, %p\n", it->first.first, it->first.second, &comm_ptr);
       return  comm_ptr;
     }

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

@@ -56 +56 @@
       if( leader_ranks[1] * leader_ranks[4] == 1)
       {
-        if(ep_rank == local_leader) printf("calling MPI_Intercomm_create_unique_leader\n");
+        if(ep_rank == local_leader) Debug("calling MPI_Intercomm_create_unique_leader\n");
         local_comm.ep_comm_ptr->comm_label = -99;
 
@@ -64 +64 @@
       {
         // change leader
-        if(ep_rank == local_leader) printf("calling MPI_Intercomm_create_from_world\n");
+        if(ep_rank == local_leader) Debug("calling MPI_Intercomm_create_from_world\n");
 
         int new_local_leader;
@@ -179 +179 @@
     }
 
-    if(ep_rank == local_leader) printf("calling MPI_Intercomm_create_kernel\n");
+    if(ep_rank == local_leader) Debug("calling MPI_Intercomm_create_kernel\n");
 
     return MPI_Intercomm_create_kernel(local_comm, local_leader, peer_comm, remote_leader, tag, newintercomm);

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

@@ -52 +52 @@
       if(  comm.ep_comm_ptr->intercomm->remote_rank_map->at(i).first  == inter_rank  )
       {
-        printf("get_ep_rank for intercomm, ep_rank_loc = %d, mpi_rank = %d => ep_src = %d\n", ep_rank_loc, mpi_rank, i);
+        //printf("get_ep_rank for intercomm, ep_rank_loc = %d, mpi_rank = %d => ep_src = %d\n", ep_rank_loc, mpi_rank, i);
         return i;
       }

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

@@ -36 +36 @@
 
     #pragma omp critical (_query)
-    if(comm.ep_comm_ptr->message_queue->size() > 0)
+    if(!comm.ep_comm_ptr->message_queue->empty())
     {
-      for(Message_list::iterator it = comm.ep_comm_ptr->message_queue->begin(); it!= comm.ep_comm_ptr->message_queue->end(); it++)
+      for(Message_list::iterator it = comm.ep_comm_ptr->message_queue->begin(); it!= comm.ep_comm_ptr->message_queue->end(); ++it)
       {
         bool src_matched = src<0? true: it->ep_src == src;
@@ -107 +107 @@
 
     #pragma omp critical (_query)
-    if(comm.ep_comm_ptr->message_queue->size() > 0)
+    if(! comm.ep_comm_ptr->message_queue->empty())
     {
-      for(Message_list::iterator it = comm.ep_comm_ptr->message_queue->begin(); it!= comm.ep_comm_ptr->message_queue->end(); it++)
+      for(Message_list::iterator it = comm.ep_comm_ptr->message_queue->begin(); it!= comm.ep_comm_ptr->message_queue->end(); ++it)
       {
         bool src_matched = src<0? true: it->ep_src == src;