Changeset 20150

Timestamp:

02/12/16 16:16:14 (9 years ago)

Author:

Eric.Larour

Message:

CHG: fixed redefinition of ISSM_MPI_Send.

File:

• issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp

@@ -494 +494 @@
 #endif
 }/*}}}*/
-int ISSM_MPI_Send(void *buf, int count, ISSM_MPI_Datatype datatype, int dest, int tag, ISSM_MPI_Comm comm){ /*{{{*/
-
-  int rc=0;
-#ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
-  rc=AMPI_Send(buf, 
-               count,
-               datatype,
-               dest,
-               tag,
-               AMPI_TO_RECV, // as long as there are no other variants
-               comm);
-# else
-  rc=MPI_Send(buf, 
-              count,
-              datatype,
-              dest,
-              tag,
-              comm);
+int ISSM_MPI_Comm_split(ISSM_MPI_Comm comm, int color, int key, ISSM_MPI_Comm *newcomm){ /*{{{*/
+
+int rc=0;
+#ifdef _HAVE_MPI_
+# ifdef _HAVE_AMPI_
+rc MPI_Comm_split(comm, color, key, newcomm);
+# else
+rc MPI_Comm_split(comm, color, key, newcomm);
 # endif
 #else 
@@ -519 +508 @@
   return rc;
 }/*}}}*/
-int ISSM_MPI_Comm_split(ISSM_MPI_Comm comm, int color, int key, ISSM_MPI_Comm *newcomm){ /*{{{*/
-
-int rc=0;
-#ifdef _HAVE_MPI_
-# ifdef _HAVE_AMPI_
-rc MPI_Comm_split(comm, color, key, newcomm);
-# else
-rc MPI_Comm_split(comm, color, key, newcomm);
-# endif
-#else 
-// nothing to be done here 
-#endif
-  return rc;
-}/*}}}*/