Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 27374)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 27375)
@@ -1453,5 +1453,5 @@
 		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,5 +1504,5 @@
 		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,5 +1604,5 @@
 		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());
Index: /issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h	(revision 27374)
+++ /issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h	(revision 27375)
@@ -103,4 +103,5 @@
 	#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,4 +127,9 @@
 		#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,4 +165,5 @@
 	#define ISSM_MPI_ANY_TAG       2
 	#define ISSM_MPI_ANY_SOURCE    3
+	#define ISSM_MPI_REQUEST_NULL  0
 	/*}}}*/
 #endif