[svn-r23352] merged -r22826:23050 and -r23060:23351 from trunk into branch.

Tested: jam (gnu, intel)

1 files changed, 21 insertions, 22 deletions

diff --git a/fortran/src/H5FDmpioff.f90 b/fortran/src/H5FDmpioff.f90
index f6f3108..5c81bc8 100644
--- a/fortran/src/H5FDmpioff.f90
+++ b/fortran/src/H5FDmpioff.f90
@@ -26,7 +26,7 @@
 ! NOTES
 !                         *** IMPORTANT ***
 !  If you add a new H5P function you must add the function name to the
-!  Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
+!  Windows dll file 'hdf5_fortrandll.def.in' in the fortran/src directory.
 !  This is needed for Windows based operating systems.
 !
 !*****
@@ -174,24 +174,23 @@ CONTAINS
 !  access property list.
 !
 ! INPUTS
-!  prp_id 	 - file access property list identifier
-!  comm 	 - MPI-2 communicator
-!  use_gpfs 	 - logical flag to use the GPFS hints
+!  prp_id    - File access property list identifier.
+!  comm      - MPI-2 communicator.
+!  use_gpfs  - Logical flag to use the GPFS hints.
 ! OUTPUTS
-!  hdferr 	 - Returns 0 if successful and -1 if fails
+!  hdferr    - Returns 0 if successful and -1 if fails.
 !
 ! AUTHOR
 !  Elena Pourmal
 !  May 6, 2003
 !
-! SOURCE
+! Fortran90 Interface:
   SUBROUTINE h5pset_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER, INTENT(IN) :: comm ! MPI communicator to be used for file open
-                                ! as defined in MPI_FILE_OPEN of MPI-2
-    LOGICAL, INTENT(IN) :: use_gpfs
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
+    INTEGER(HID_T), INTENT(IN)  :: prp_id
+    INTEGER,        INTENT(IN)  :: comm
+    LOGICAL,        INTENT(IN)  :: use_gpfs
+    INTEGER,        INTENT(OUT) :: hdferr
 !*****
     INTEGER :: flag
     INTEGER, EXTERNAL :: h5pset_fapl_mpiposix_c
@@ -209,22 +208,22 @@ CONTAINS
 !  Returns MPI communicator information.
 !
 ! INPUTS
-!  prp_id 	 - file access property list identifier
+!  prp_id    - File access property list identifier.
 ! OUTPUTS
-!  comm 	 - MPI-2 communicator
-!  use_gpfs 	 - flag to use GPFS hints
-!  hdferr 	 - Returns 0 if successful and -1 if fails
+!  comm      - MPI-2 communicator.
+!  use_gpfs  - Flag to use GPFS hints.
+!  hdferr    - Returns 0 if successful and -1 if fails.
 ! AUTHOR
 !  Elena Pourmal
 !  May 6, 2003
 !
-! SOURCE
+! Fortran90 Interface:
   SUBROUTINE h5pget_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER, INTENT(OUT) :: comm         ! Buffer to return communicator
-    LOGICAL, INTENT(OUT) :: use_gpfs
-    INTEGER, INTENT(OUT) :: hdferr       ! Error code
+    INTEGER(HID_T), INTENT(IN)  :: prp_id
+    INTEGER,        INTENT(OUT) :: comm
+    LOGICAL,        INTENT(OUT) :: use_gpfs
+    INTEGER,        INTENT(OUT) :: hdferr
 !*****
     INTEGER :: flag
 
@@ -260,8 +259,8 @@ CONTAINS
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN)  :: dxpl_id
     INTEGER       , INTENT(OUT) :: actual_io_mode
-    INTEGER       , INTENT(OUT) :: hdferr 
-!*****    
+    INTEGER       , INTENT(OUT) :: hdferr
+!***** 
     INTERFACE
        INTEGER FUNCTION h5pget_mpio_actual_io_mode_c(dxpl_id, actual_io_mode)
          USE H5GLOBAL