Changeset 27373 for issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h

Timestamp:

11/10/22 05:47:05 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix ADOLC

File:

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

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

@@ -68 +68 @@
         // types
         #if defined(_HAVE_MEDIPACK_) && !defined(_WRAPPERS_)
-        typedef AMPI_Comm             ISSM_MPI_Comm;
-        typedef AMPI_Datatype         ISSM_MPI_Datatype;
-        typedef AMPI_Op               ISSM_MPI_Op;
-        typedef AMPI_Status           ISSM_MPI_Status;
-        typedef AMPI_Request          ISSM_MPI_Request;
-        #else
-        typedef MPI_Comm             ISSM_MPI_Comm;
-        typedef MPI_Datatype         ISSM_MPI_Datatype;
-        typedef MPI_Op               ISSM_MPI_Op;
-        typedef MPI_Status           ISSM_MPI_Status;
-        typedef MPI_Request          ISSM_MPI_Request;
+        typedef AMPI_Comm     ISSM_MPI_Comm;
+        typedef AMPI_Datatype ISSM_MPI_Datatype;
+        typedef AMPI_Op       ISSM_MPI_Op;
+        typedef AMPI_Status   ISSM_MPI_Status;
+        typedef AMPI_Request  ISSM_MPI_Request;
+        #else
+        typedef MPI_Comm      ISSM_MPI_Comm;
+        typedef MPI_Datatype  ISSM_MPI_Datatype;
+        typedef MPI_Op        ISSM_MPI_Op;
+        typedef MPI_Status    ISSM_MPI_Status;
+        #if defined(_HAVE_AMPI_) && !defined(_WRAPPERS_)
+        typedef AMPI_Request   ISSM_MPI_Request;
+        #else
+        typedef MPI_Request  ISSM_MPI_Request;
+        #endif
         #endif
 
@@ -130 +134 @@
         /*Our ISSM MPI defines: {{{*/
         // types
-        typedef int                  ISSM_MPI_Comm;
-        typedef int                  ISSM_MPI_Datatype;
-        typedef int                  ISSM_MPI_Op;
-        typedef int                  ISSM_MPI_Status;
+        typedef int  ISSM_MPI_Comm;
+        typedef int  ISSM_MPI_Datatype;
+        typedef int  ISSM_MPI_Op;
+        typedef int  ISSM_MPI_Status;
+        typedef int  ISSM_MPI_Request;
 
         // data types