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

Timestamp:

10/04/17 11:45:14 (7 years ago)

Author:

yushan

Message:

EP updated

File:

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

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

@@ -6 +6 @@
 {
 
-
-
   int MPI_Comm_free(MPI_Comm *comm)
   {
@@ -13 +11 @@
     if(! comm->is_ep)
     {
-      if(comm->mpi_comm != MPI_COMM_NULL_STD)
+      if(comm->mpi_comm != static_cast< ::MPI_Comm>(MPI_COMM_NULL.mpi_comm))
       {
         ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->mpi_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");
-        }
 
         if(comm->ep_barrier != NULL)
@@ -77 +66 @@
         }
 
-        if(comm->mpi_comm != MPI_COMM_NULL_STD)
+        if(  comm->mpi_comm != static_cast< ::MPI_Comm>(MPI_COMM_NULL.mpi_comm) 
+          && comm->mpi_comm != static_cast< ::MPI_Comm>(MPI_COMM_WORLD.mpi_comm))
         {
           ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->mpi_comm);
@@ -107 +97 @@
       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)
@@ -151 +132 @@
       }
 
-      if(comm->mpi_comm != MPI_COMM_NULL_STD)
+      if(comm->mpi_comm != static_cast< ::MPI_Comm>(MPI_COMM_NULL.mpi_comm))
       {
         ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm>(comm->mpi_comm);