[svn-r21421] Merged the Fortran 2003 changes from the trunk into the 1.8 branch, used:

svn merge -r 20506:21414 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested: jam (gnu, intel, pgi compilers)

Also merged effected non-Fortran files: 
svn merge -r21247:r21248 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/src/libhdf5.settings.in

1 files changed, 53 insertions, 33 deletions

diff --git a/fortran/src/HDF5mpio.f90 b/fortran/src/HDF5mpio.f90
index 15d3a93..ac4d2b1 100644
--- a/fortran/src/HDF5mpio.f90
+++ b/fortran/src/HDF5mpio.f90
@@ -1,34 +1,54 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!****h* ROBODoc/HDF5 (mpio)
 !
-    MODULE HDF5
-       USE H5GLOBAL
-       USE H5F
-       USE H5E
-       USE H5G
-       USE H5I
-       USE H5L
-       USE H5S
-       USE H5D
-       USE H5A
-       USE H5T
-       USE H5O
-       USE H5P
-       USE H5FDMPIO
-       USE H5R
-       USE H5Z
-       USE H5_DBLE_INTERFACE
-       USE H5LIB
-    END MODULE HDF5
+! NAME
+!  HDF5
+!
+! PURPOSE
+!  This is the main module used for linking to the Fortran parallel HDF library.
+!  This file replaces HDF5.f90 when compiling the parallel library.
+!
+! COPYRIGHT
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!  Copyright by The HDF Group.                                                 *
+!  Copyright by the Board of Trustees of the University of Illinois.           *
+!  All rights reserved.                                                        *
+!                                                                              *
+!  This file is part of HDF5.  The full HDF5 copyright notice, including       *
+!  terms governing use, modification, and redistribution, is contained in      *
+!  the files COPYING and Copyright.html.  COPYING can be found at the root     *
+!  of the source code distribution tree; Copyright.html can be found at the    *
+!  root level of an installed copy of the electronic HDF5 document set and     *
+!  is linked from the top-level documents page.  It can also be found at       *
+!  http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have            *
+!  access to either file, you may request a copy from help@hdfgroup.org.       *
+!  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+!*****
+
+MODULE HDF5
+  USE H5GLOBAL
+  USE H5F
+  USE H5G
+  USE H5E
+  USE H5E_PROVISIONAL
+  USE H5I
+  USE H5L
+  USE H5L_PROVISIONAL
+  USE H5S
+  USE H5D
+  USE H5D_PROVISIONAL
+  USE H5A
+  USE H5A_PROVISIONAL
+  USE H5T
+  USE H5T_PROVISIONAL
+  USE H5O
+  USE H5O_PROVISIONAL
+  USE H5P
+  USE H5P_PROVISIONAL
+  USE H5FDMPIO
+  USE H5R
+  USE H5R_PROVISIONAL
+  USE H5Z
+  USE H5_DBLE_INTERFACE
+  USE H5LIB
+END MODULE HDF5