adapt mpif.h for rma

[simgrid.git] / include / smpi / mpif.h.in

diff --git a/include/smpi/mpif.h.in b/include/smpi/mpif.h.in
index 213fe84..5732217 100644 (file)
--- a/include/smpi/mpif.h.in
+++ b/include/smpi/mpif.h.in
@@ -1,5 +1,5 @@
 ! -*- fortran -*-
-! Copyright (c) 2010, 2012-2013. The SimGrid Team.
+! Copyright (c) 2010, 2012-2014. The SimGrid Team.
 ! All rights reserved.
 
 ! This program is free software; you can redistribute it and/or modify it
@@ -18,7 +18,7 @@
       integer MPI_MAX_DATAREP_STRIN, MPI_MAX_INFO_KEY
       integer MPI_MAX_INFO_VAL, MPI_MAX_OBJECT_NAME, MPI_MAX_PORT_NAME
       integer MPI_ANY_SOURCE, MPI_PROC_NULL, MPI_ANY_TAG, MPI_UNDEFINED
-      integer MPI_IN_PLACE, MPI_BOTTOM, MPI_TAG_UB, MPI_TAG_LB
+      integer MPI_TAG_UB, MPI_TAG_LB
       integer MPI_SOURCE, MPI_TAG, MPI_ERROR
       integer MPI_VERSION, MPI_SUBVERSION
       parameter(MPI_MAX_PROCESSOR_NAME=100)
@@ -32,8 +32,6 @@
       parameter(MPI_PROC_NULL=-666)
       parameter(MPI_ANY_TAG=-444)
       parameter(MPI_UNDEFINED=-333)
-      parameter(MPI_IN_PLACE=-222)
-      parameter(MPI_BOTTOM=-111)
       parameter(MPI_SOURCE=1)
       parameter(MPI_TAG=2)
       parameter(MPI_ERROR=3)
@@ -41,6 +39,13 @@
       parameter(MPI_TAG_LB=0)
       parameter(MPI_VERSION=1)
       parameter(MPI_SUBVERSION=1)
+      integer MPI_MODE_NOSTORE, MPI_MODE_NOPUT, MPI_MODE_NOPRECEDE
+      integer MPI_MODE_NOSUCCEED, MPI_MODE_NOCHECK
+      parameter(MPI_MODE_NOSTORE=1)
+      parameter(MPI_MODE_NOPUT=2)
+      parameter(MPI_MODE_NOPRECEDE=4)
+      parameter(MPI_MODE_NOSUCCEED=8)
+      parameter(MPI_MODE_NOCHECK=16)
 
       integer MPI_SUCCESS, MPI_ERR_COMM, MPI_ERR_ARG, MPI_ERR_TYPE
       integer MPI_ERR_REQUEST, MPI_ERR_INTERN, MPI_ERR_COUNT
@@ -109,12 +114,14 @@
       parameter(MPI_ERRHANDLER_NULL=2)
 
 ! This should be equal to the number of int fields in MPI_Status
-      integer MPI_STATUS_SIZE, MPI_STATUSES_IGNORE
+      integer MPI_STATUS_SIZE
       parameter(MPI_STATUS_SIZE=4)
-      parameter(MPI_STATUSES_IGNORE=-1)
 
-      integer MPI_STATUS_IGNORE
-      parameter(MPI_STATUS_IGNORE=-1)
+! These should be ordered as in smpi_f77.c
+      integer MPI_IN_PLACE, MPI_BOTTOM
+      integer MPI_STATUS_IGNORE, MPI_STATUSES_IGNORE
+      common /smpi/ MPI_IN_PLACE, MPI_BOTTOM
+      common /smpi/ MPI_STATUS_IGNORE, MPI_STATUSES_IGNORE
 
       integer MPI_REQUEST_NULL
       parameter(MPI_REQUEST_NULL=-1)
@@ -122,7 +129,6 @@
       integer MPI_INTEGER_KIND
       parameter(MPI_INTEGER_KIND=4)
 
-! These should be ordered as in smpi_f77.c
       integer MPI_DATATYPE_NULL, MPI_BYTE, MPI_CHARACTER, MPI_LOGICAL
       integer MPI_INTEGER, MPI_INTEGER1, MPI_INTEGER2, MPI_INTEGER4
       integer MPI_INTEGER8, MPI_REAL, MPI_REAL4, MPI_REAL8
@@ -184,9 +190,6 @@
       INTEGER MPI_ADDRESS_KIND, MPI_OFFSET_KIND
       PARAMETER (MPI_ADDRESS_KIND=@MPI_ADDRESS_SIZE@)
       PARAMETER (MPI_OFFSET_KIND=@MPI_ADDRESS_SIZE@)
-      
-      INTEGER MPI_MODE_NOPRECEDE
-      PARAMETER (MPI_MODE_NOPRECEDE=8192)
 
       integer MPI_COMBINER_NAMED, MPI_COMBINER_DUP
       integer MPI_COMBINER_CONTIGUOUS, MPI_COMBINER_VECTOR
@@ -224,8 +227,8 @@
       parameter(MPI_ORDER_FORTRAN=0)
 
       external MPI_INIT, MPI_FINALIZE, MPI_ABORT
-      external MPI_COMM_RANK, MPI_COMM_SIZE, MPI_COMM_DUP, MPI_COMM_SPLIT
-      external MPI_SEND_INIT, MPI_ISEND, MPI_SEND
+      external MPI_COMM_RANK, MPI_COMM_SIZE, MPI_COMM_DUP
+      external MPI_SEND_INIT, MPI_ISEND, MPI_SEND, MPI_COMM_SPLIT
       external MPI_RECV_INIT, MPI_IRECV, MPI_RECV
       external MPI_START, MPI_STARTALL
       external MPI_WAIT, MPI_WAITANY, MPI_WAITALL