Changeset 1053 for XIOS/dev/branch_yushan/extern/src_ep_dev/ep_free.cpp

Timestamp:

02/17/17 17:55:37 (7 years ago)

Author:

yushan

Message:

ep_lib namespace specified when netcdf involved

File:

• XIOS/dev/branch_yushan/extern/src_ep_dev/ep_free.cpp (modified) (10 diffs)

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

@@ -10 +10 @@
   int MPI_Comm_free(MPI_Comm *comm)
   {
-    //return 0;
-    
-    if(comm == NULL) return 0;
+    //if(comm == NULL) return 0;
 
     MPI_Barrier(*comm);
@@ -19 +17 @@
     if(! comm->is_ep)
     {
-      if(comm->mpi_comm)
+      if(comm->mpi_comm != MPI_COMM_NULL_STD)
       {
         ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->mpi_comm);
@@ -31 +29 @@
     else
     {
-      if(! comm->mpi_comm) return 0;
+      if(comm->mpi_comm == MPI_COMM_NULL_STD ) return 0;
 
       int ep_rank, ep_rank_loc, mpi_rank;
@@ -47 +45 @@
 
       #pragma omp critical (memory_free)
-      if(comm->is_intercomm && comm->ep_comm_ptr->intercomm)
+      if(comm->is_intercomm && comm->ep_comm_ptr->intercomm != NULL)
       {
         if(comm->ep_comm_ptr->intercomm->local_rank_map) comm->ep_comm_ptr->intercomm->local_rank_map->clear();
@@ -62 +60 @@
 
 /*
-        if(comm->my_buffer)
+        if(comm->my_buffer != NULL)
         {
-          if(comm->my_buffer->buf_int) delete[] comm->my_buffer->buf_int; Debug("buf_int freed\n");
-          if(comm->my_buffer->buf_float) delete[] comm->my_buffer->buf_float; Debug("buf_float freed\n");
-          if(comm->my_buffer->buf_double) delete[] comm->my_buffer->buf_double; Debug("buf_double freed\n");
-          if(comm->my_buffer->buf_long) delete[] comm->my_buffer->buf_long; Debug("buf_long freed\n");
-          if(comm->my_buffer->buf_ulong) delete[] comm->my_buffer->buf_ulong; Debug("buf_ulong freed\n");
-          if(comm->my_buffer->buf_char) delete[] comm->my_buffer->buf_char; Debug("buf_char freed\n");
+          if(comm->my_buffer->buf_int != NULL) delete[] comm->my_buffer->buf_int; Debug("buf_int freed\n");
+          if(comm->my_buffer->buf_float != NULL) delete[] comm->my_buffer->buf_float; Debug("buf_float freed\n");
+          if(comm->my_buffer->buf_double != NULL) delete[] comm->my_buffer->buf_double; Debug("buf_double freed\n");
+          if(comm->my_buffer->buf_long != NULL) delete[] comm->my_buffer->buf_long; Debug("buf_long freed\n");
+          if(comm->my_buffer->buf_ulong != NULL) delete[] comm->my_buffer->buf_ulong; Debug("buf_ulong freed\n");
+          if(comm->my_buffer->buf_char != NULL) delete[] comm->my_buffer->buf_char; Debug("buf_char freed\n");
         }
 */
-        if(comm->ep_barrier)
+        if(comm->ep_barrier != NULL)
         {
           comm->ep_barrier->~OMPbarrier();
@@ -79 +77 @@
 
 
-        if(comm->rank_map)
+        if(comm->rank_map != NULL)
         {
           comm->rank_map->clear();
@@ -86 +84 @@
 
 
-        if(comm->is_intercomm && comm->ep_comm_ptr->intercomm->mpi_inter_comm)
+        if(comm->is_intercomm && comm->ep_comm_ptr->intercomm->mpi_inter_comm != MPI_COMM_NULL_STD)
         {
           ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->ep_comm_ptr->intercomm->mpi_inter_comm);
 
           ::MPI_Comm_free(&mpi_comm);
-          comm->ep_comm_ptr->intercomm->mpi_inter_comm = NULL;
+          //comm->ep_comm_ptr->intercomm->mpi_inter_comm = NULL;
           Debug("mpi_intercomm freed\n");
         }
@@ -99 +97 @@
         for(int i=0; i<num_ep; i++)
         {
-          if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue)
+          if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue != NULL)
           {
             comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue->clear();
@@ -105 +103 @@
           }
 
-          if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr)
+          if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr != NULL)
           {
             delete comm->ep_comm_ptr->comm_list[i].ep_comm_ptr;
@@ -112 +110 @@
         }
 
-        if(comm->mpi_comm)
+        if(comm->mpi_comm != MPI_COMM_NULL_STD)
         {
           ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->mpi_comm);
-          #ifdef _serialized
-          #pragma omp critical (_mpi_call)
-          #endif // _serialized
           ::MPI_Comm_free(&mpi_comm);
-          comm->mpi_comm = NULL;
+          //comm->mpi_comm = NULL;
 //          printf("label = %d, mpi_comm freed\n", comm->ep_comm_ptr->comm_label);
         }
 
-       if(comm) {delete[] comm->ep_comm_ptr->comm_list; Debug("comm freed\n");}
+       if(comm != NULL) {delete[] comm->ep_comm_ptr->comm_list; Debug("comm freed\n");}
 
       }