Changeset 1295 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_free.cpp

Timestamp:

10/06/17 13:56:33 (7 years ago)

Author:

yushan

Message:

EP update all

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_free.cpp (modified) (3 diffs)

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

@@ -5 +5 @@
 namespace ep_lib
 {
-
-
 
   int MPI_Comm_free(MPI_Comm *comm)
@@ -41 +39 @@
         Debug("comm is EP, mpi_comm_ptr != NULL\n");
 
-        if(comm->my_buffer != NULL)
-        {
-          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");
-        }
+        delete comm->my_buffer;
+
 
         if(comm->ep_barrier != NULL)
@@ -108 +99 @@
       Debug("comm is EP, mpi_comm_ptr != NULL\n");
 
-      if(comm->my_buffer != NULL)
-      {
-        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 != NULL)