Changeset 27375

Timestamp:

11/10/22 07:32:16 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix AMPI

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (3 diffs)
• toolkits/mpi/issmmpi.h (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1453 +1453 @@
                 send_buffers[rank] = xNew<IssmDouble>(this->vertices->Size());
                 #endif
-                send_requests[rank] = MPI_REQUEST_NULL;
+                send_requests[rank] = ISSM_MPI_REQUEST_NULL;
         }
         IssmDouble* recv_buffer = xNew<IssmDouble>(this->vertices->Size());
@@ -1504 +1504 @@
                 send_buffers[rank] = xNew<IssmDouble>(this->vertices->Size());
                 #endif
-                send_requests[rank] = MPI_REQUEST_NULL;
+                send_requests[rank] = ISSM_MPI_REQUEST_NULL;
         }
         IssmDouble* recv_buffer = xNew<IssmDouble>(this->vertices->Size());
@@ -1604 +1604 @@
                 send_buffers[rank] = xNew<IssmDouble>(this->vertices->Size());
                 #endif
-                send_requests[rank] = MPI_REQUEST_NULL;
+                send_requests[rank] = ISSM_MPI_REQUEST_NULL;
         }
         IssmDouble* recv_buffer = xNew<IssmDouble>(this->vertices->Size());

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

@@ -103 +103 @@
         #define ISSM_MPI_ANY_TAG       AMPI_ANY_TAG
         #define ISSM_MPI_ANY_SOURCE    AMPI_ANY_SOURCE
+        #define ISSM_MPI_REQUEST_NULL  AMPI_Request()
 
         #else
@@ -126 +127 @@
                 #define ISSM_MPI_ANY_TAG       MPI_ANY_TAG
                 #define ISSM_MPI_ANY_SOURCE    MPI_ANY_SOURCE
+                #if defined(_HAVE_AMPI_) && !defined(_WRAPPERS_)
+                        #define ISSM_MPI_REQUEST_NULL  AMPI_Request()
+                #else
+                        #define ISSM_MPI_REQUEST_NULL  0
+                #endif
         #endif
 
@@ -159 +165 @@
         #define ISSM_MPI_ANY_TAG       2
         #define ISSM_MPI_ANY_SOURCE    3
+        #define ISSM_MPI_REQUEST_NULL  0
         /*}}}*/
 #endif