[svn-r15541] Description:

Put the  DOUBLE PRECISION interfaces in a separate module. The interfaces are included/excluded depending on
the state of FORTRAN_DEFAULT_REALisDBLE_F which detects if the default REAL is DOUBLE PRECISION. This allows the library to be compiled with -r8 Fortran flag without the user needing to change the source code.

1 files changed, 0 insertions, 1076 deletions

diff --git a/fortran/src/H5Dff.f90 b/fortran/src/H5Dff.f90
index 757e1e2..a01f00d 100644
--- a/fortran/src/H5Dff.f90
+++ b/fortran/src/H5Dff.f90
@@ -47,16 +47,6 @@ MODULE H5D
      MODULE PROCEDURE h5dwrite_real_5
      MODULE PROCEDURE h5dwrite_real_6
      MODULE PROCEDURE h5dwrite_real_7
-     ! Comment if on Crays
-     MODULE PROCEDURE h5dwrite_double_scalar
-     MODULE PROCEDURE h5dwrite_double_1
-     MODULE PROCEDURE h5dwrite_double_2
-     MODULE PROCEDURE h5dwrite_double_3
-     MODULE PROCEDURE h5dwrite_double_4
-     MODULE PROCEDURE h5dwrite_double_5
-     MODULE PROCEDURE h5dwrite_double_6
-     MODULE PROCEDURE h5dwrite_double_7
-     ! End comment if on Crays
   END INTERFACE
 
   INTERFACE h5dread_f
@@ -87,17 +77,6 @@ MODULE H5D
      MODULE PROCEDURE h5dread_real_5
      MODULE PROCEDURE h5dread_real_6
      MODULE PROCEDURE h5dread_real_7
-     ! Comment if on Crays
-     MODULE PROCEDURE h5dread_double_scalar
-     MODULE PROCEDURE h5dread_double_1
-     MODULE PROCEDURE h5dread_double_2
-     MODULE PROCEDURE h5dread_double_3
-     MODULE PROCEDURE h5dread_double_4
-     MODULE PROCEDURE h5dread_double_5
-     MODULE PROCEDURE h5dread_double_6
-     MODULE PROCEDURE h5dread_double_7
-     ! End comment if on Crays
-
   END INTERFACE
 
   INTERFACE h5dwrite_vl_f
@@ -115,7 +94,6 @@ MODULE H5D
   INTERFACE h5dfill_f
      MODULE PROCEDURE h5dfill_integer
      MODULE PROCEDURE h5dfill_real
-     MODULE PROCEDURE h5dfill_double
      MODULE PROCEDURE h5dfill_char
   END INTERFACE
 
@@ -1975,500 +1953,7 @@ CONTAINS
           END SUBROUTINE h5dwrite_real_7
 
 
-          SUBROUTINE h5dwrite_double_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dwrite_double_scalar
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(IN) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default
-
-!            INTEGER, EXTERNAL :: h5dwrite_double_s_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dwrite_double_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_S_C'::h5dwrite_double_s_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(IN) :: buf
-              END FUNCTION h5dwrite_double_s_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dwrite_double_s_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dwrite_double_scalar
-
-          SUBROUTINE h5dwrite_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dwrite_double_1
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(IN), &
-            DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default
-
-!            INTEGER, EXTERNAL :: h5dwrite_double_1_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dwrite_double_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_1_C'::h5dwrite_double_1_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-              END FUNCTION h5dwrite_double_1_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dwrite_double_1_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dwrite_double_1
-
-          SUBROUTINE h5dwrite_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dwrite_double_2
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(IN), &
-            DIMENSION(dims(1),dims(2)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dwrite_double_2_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dwrite_double_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_2_C'::h5dwrite_double_2_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-              END FUNCTION h5dwrite_double_2_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dwrite_double_2_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dwrite_double_2
-
-          SUBROUTINE h5dwrite_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dwrite_double_3
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(IN), &
-            DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dwrite_double_3_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dwrite_double_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_3_C'::h5dwrite_double_3_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-              END FUNCTION h5dwrite_double_3_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dwrite_double_3_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dwrite_double_3
-
-          SUBROUTINE h5dwrite_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dwrite_double_4
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(IN), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default
-
-!            INTEGER, EXTERNAL :: h5dwrite_double_4_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dwrite_double_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_4_C'::h5dwrite_double_4_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-              END FUNCTION h5dwrite_double_4_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dwrite_double_4_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dwrite_double_4
-
-          SUBROUTINE h5dwrite_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dwrite_double_5
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(IN), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dwrite_double_5_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dwrite_double_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_5_C'::h5dwrite_double_5_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-              END FUNCTION h5dwrite_double_5_c
-            END INTERFACE
-
 
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dwrite_double_5_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dwrite_double_5
-
-          SUBROUTINE h5dwrite_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dwrite_double_6
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(IN), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dwrite_double_6_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dwrite_double_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_6_C'::h5dwrite_double_6_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-              END FUNCTION h5dwrite_double_6_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dwrite_double_6_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dwrite_double_6
-
-          SUBROUTINE h5dwrite_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dwrite_double_7
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(IN), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dwrite_double_7_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dwrite_double_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_DOUBLE_7_C'::h5dwrite_double_7_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-              END FUNCTION h5dwrite_double_7_c
-            END INTERFACE
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dwrite_double_7_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dwrite_double_7
 
 !----------------------------------------------------------------------
 ! Name:		h5dread_f 
@@ -4140,502 +3625,6 @@ CONTAINS
            
           END SUBROUTINE h5dread_real_7
 
-          SUBROUTINE h5dread_double_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dread_double_scalar
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(INOUT) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default
-
-!            INTEGER, EXTERNAL :: h5dread_double_s_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dread_double_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_S_C'::h5dread_double_s_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(OUT) :: buf
-              END FUNCTION h5dread_double_s_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dread_double_s_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dread_double_scalar
-
-          SUBROUTINE h5dread_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dread_double_1
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(INOUT), &
-            DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dread_double_1_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dread_double_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_1_C'::h5dread_double_1_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1)) :: buf
-              END FUNCTION h5dread_double_1_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dread_double_1_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dread_double_1
-
-          SUBROUTINE h5dread_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dread_double_2
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(INOUT), &
-            DIMENSION(dims(1),dims(2)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dread_double_2_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dread_double_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_2_C'::h5dread_double_2_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(INOUT), & 
-              DIMENSION(dims(1),dims(2)) :: buf
-              END FUNCTION h5dread_double_2_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dread_double_2_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dread_double_2
-
-          SUBROUTINE h5dread_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dread_double_3
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(INOUT), &
-            DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default
-
-!            INTEGER, EXTERNAL :: h5dread_double_3_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dread_double_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_3_C'::h5dread_double_3_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-              END FUNCTION h5dread_double_3_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dread_double_3_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dread_double_3
-
-          SUBROUTINE h5dread_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dread_double_4
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(INOUT), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-                                                ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dread_double_4_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dread_double_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_4_C'::h5dread_double_4_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-              END FUNCTION h5dread_double_4_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dread_double_4_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dread_double_4
-
-          SUBROUTINE h5dread_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dread_double_5
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(INOUT), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dread_double_5_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dread_double_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_5_C'::h5dread_double_5_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-              END FUNCTION h5dread_double_5_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dread_double_5_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dread_double_5
-
-          SUBROUTINE h5dread_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dread_double_6
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(INOUT), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dread_double_6_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dread_double_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_6_C'::h5dread_double_6_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-              END FUNCTION h5dread_double_6_c
-            END INTERFACE
-
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dread_double_6_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dread_double_6
-
-          SUBROUTINE h5dread_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
-                                        mem_space_id, file_space_id, xfer_prp)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dread_double_7
-!DEC$endif
-
-            IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-            INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            DOUBLE PRECISION, INTENT(INOUT), &
-            DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
-
-!            INTEGER, EXTERNAL :: h5dread_double_7_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dread_double_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
-                                          file_space_id_default, &
-                                          xfer_prp_default, buf, dims)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_DOUBLE_7_C'::h5dread_double_7_c
-              !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id
-              INTEGER(HID_T)  :: mem_space_id_default
-              INTEGER(HID_T) :: file_space_id_default
-              INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-              END FUNCTION h5dread_double_7_c
-            END INTERFACE
-
-            xfer_prp_default = H5P_DEFAULT_F
-            mem_space_id_default = H5S_ALL_F
-            file_space_id_default = H5S_ALL_F
-
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-
-            hdferr = h5dread_double_7_c(dset_id, mem_type_id, mem_space_id_default, &
-                                file_space_id_default, xfer_prp_default, buf, dims)
-           
-          END SUBROUTINE h5dread_double_7
-
 !----------------------------------------------------------------------
 ! Name:		h5dget_space_f 
 !
@@ -5507,71 +4496,6 @@ CONTAINS
           END SUBROUTINE h5dfill_real
 
 !----------------------------------------------------------------------
-! Name:		h5dfill_double
-!
-! Purpose:      Fills dataspace elements with a fill value in a memory buffer.	
-!               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes 
-!               of the fillvalues and buffers are supported. Buffer and fillvalue
-!               are assumed to have the same datatype.
-!               Only one-dimesional buffers are supported.
-!
-! Inputs:  
-!		fill_value	- fill value
-!		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
-! Outputs:  
-!		hdferr:		- error code		
-!				 	Success:  0
-!				 	Failure: -1   
-!
-! Programmer:	Elena Pourmal
-!		March 12, 2003
-!
-!----------------------------------------------------------------------
-
-          SUBROUTINE h5dfill_double(fill_value, space_id, buf,  hdferr)
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5dfill_double
-!DEC$endif
-
-            IMPLICIT NONE
-            DOUBLE PRECISION, INTENT(IN) :: fill_value  ! Fill value
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-            DOUBLE PRECISION, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            
-            INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-            INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
-            
-!            INTEGER, EXTERNAL :: h5dfill_double_c
-! MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5dfill_double_c(fill_value, fill_type_id, space_id, &
-                                         buf, mem_type_id)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DFILL_DOUBLE_C'::h5dfill_double_c  
-              !DEC$ ENDIF
-              DOUBLE PRECISION, INTENT(IN) :: fill_value  ! Fill value
-              INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-              INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-              DOUBLE PRECISION, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-              INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
-              END FUNCTION h5dfill_double_c
-            END INTERFACE 
-            fill_type_id = H5T_NATIVE_DOUBLE
-            mem_type_id  = H5T_NATIVE_DOUBLE
-
-            hdferr = h5dfill_double_c(fill_value, fill_type_id, space_id, & 
-                               buf, mem_type_id)
-
-
-          END SUBROUTINE h5dfill_double
-
-!----------------------------------------------------------------------
 ! Name:		h5dfill_char
 !
 ! Purpose:      Fills dataspace elements with a fill value in a memory buffer.