source: issm/oecreview/Archive/24684-25833/ISSM-24773-24774.diff

Last change on this file was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833

File size: 921 bytes
RevLine 
[25834]1Index: ../trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp
2===================================================================
3--- ../trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp (revision 24773)
4+++ ../trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp (revision 24774)
5@@ -13,6 +13,11 @@
6 #include <cstring> // for memcpy
7
8 #include "./issmmpi.h"
9+
10+#if defined(_HAVE_MPI_) && defined(_HAVE_CODIPACK_)
11+MpiTypes* mpiTypes;
12+#endif
13+
14 #include "../../shared/Numerics/types.h"
15
16 #ifndef _HAVE_MPI_
17@@ -35,17 +40,7 @@
18 }
19 return 0;
20 }/*}}}*/
21-#else
22-#if defined(_HAVE_AMPI_) && !defined(_WRAPPERS_)
23-#if defined(_HAVE_ADJOINTMPI_)
24-#if defined(_HAVE_MEDIPACK_)
25-#if defined(_HAVE_CODIPACK_)
26-MpiTypes* mpiTypes;
27 #endif
28-#endif
29-#endif
30-#endif
31-#endif
32
33 int ISSM_MPI_Allgather(void *sendbuf, int sendcount, ISSM_MPI_Datatype sendtype, void *recvbuf, int recvcount, ISSM_MPI_Datatype recvtype, ISSM_MPI_Comm comm) { /*{{{*/
34 int rc=0;
Note: See TracBrowser for help on using the repository browser.