[svn-r23330] Merged r23325 from the trunk into the branch.

Tested: jam (intel)

7 files changed, 616 insertions, 448 deletions

diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 6fc8487..dba2aa4 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -1937,28 +1937,29 @@ DONE:
 
 /****if* H5Pf/h5pset_external_c
  * NAME
- *        h5pset_external_c
+ *  h5pset_external_c
  * PURPOSE
- *     Call H5Pset_external to add an external file to the
- *              list of external files.
+ *  Call H5Pset_external to add an external file to the
+ *  list of external files.
  * INPUTS
- *      prp_id - property list identifier
- *              name - Name of an external file
- *              namelen - length of name
- *              offset - Offset, in bytes, from the beginning of the file
- *                       to the location in the file where the data starts.
- *              bytes - Number of bytes reserved in the file for the data.
+ *  prp_id  - property list identifier
+ *  name    - Name of an external file
+ *  namelen - length of name
+ *  offset  - Offset, in bytes, from the beginning of the file
+ *            to the location in the file where the data starts.
+ *  bytes   - Number of bytes reserved in the file for the data.
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Xiangyang Su
- *              Wednesday, February 23, 2000
+ *  Wednesday, February 23, 2000
  * HISTORY
- *
+ *  Changed type of 'offset' from int_f to off_t_f -- MSB January 9, 2012
+ *  
  * SOURCE
 */
 int_f
-nh5pset_external_c (hid_t_f *prp_id, _fcd name, int_f* namelen, int_f* offset, hsize_t_f*bytes)
+nh5pset_external_c (hid_t_f *prp_id, _fcd name, int_f* namelen, off_t_f* offset, hsize_t_f*bytes)
 /******/
 {
      int ret_value = -1;
@@ -2029,14 +2030,14 @@ nh5pget_external_count_c (hid_t_f *prp_id, int_f* count)
 
 /****if* H5Pf/h5pget_external_c
  * NAME
- *        h5pget_external_c
+ *  h5pget_external_c
  * PURPOSE
- *     Call H5Pget_external to get nformation about an external file.
+ *  Call H5Pget_external to get nformation about an external file.
  * INPUTS
  *    prp_id - property list identifier
  * name_size - length of name
  *       idx - External file index.
- *OUTPUT
+ * OUTPUT
  *      name - Name of an external file
  *    offset - Offset, in bytes, from the beginning of the file
  *             to the location in the file where the data starts.
@@ -2047,11 +2048,12 @@ nh5pget_external_count_c (hid_t_f *prp_id, int_f* count)
  *  Xiangyang Su
  *  Wednesday, February 23, 2000
  * HISTORY
+ *  Changed type of 'offset' from integer to off_t -- MSB January 9, 2012
  *
  * SOURCE
 */
 int_f
-nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f* name_size, _fcd name, int_f* offset, hsize_t_f*bytes)
+nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f* name_size, _fcd name, off_t_f* offset, hsize_t_f*bytes)
 /******/
 {
      int ret_value = -1;
@@ -2079,7 +2081,7 @@ nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f* name_size, _fcd name,
 
      if (status < 0) goto DONE;
 
-     *offset = (int_f)c_offset;
+     *offset = (off_t_f)c_offset;
      *bytes = (hsize_t_f)size;
      /* Note: if the size of the fortran buffer is larger then the returned string
       *       from the function then we need to give HD5packFstring the fortran buffer size so
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index 9f7022c..587f6f9 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -2329,14 +2329,16 @@ CONTAINS
 ! HISTORY
 !  Explicit Fortran interfaces were added for 
 !  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
+!  port).  March 14, 2001
+!
+!  Changed type of 'offset' from integer to off_t -- MSB January 9, 2012
 !  
 ! SOURCE
-  SUBROUTINE h5pset_external_f(prp_id, name, offset,bytes, hdferr)
+  SUBROUTINE h5pset_external_f(prp_id, name, offset, bytes, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
     CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of an external file
-    INTEGER, INTENT(IN) :: offset         ! Offset, in bytes, from the beginning 
+    INTEGER(OFF_T), INTENT(IN) :: offset  ! Offset, in bytes, from the beginning 
                                           !  of the file to the location in the file 
                                           !  where the data starts.
     INTEGER(HSIZE_T), INTENT(IN) :: bytes ! Number of bytes reserved in the 
@@ -2347,9 +2349,6 @@ CONTAINS
 
     INTEGER :: namelen
 
-!            INTEGER, EXTERNAL :: h5pset_external_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
     INTERFACE
        INTEGER FUNCTION h5pset_external_c(prp_id, name,namelen, offset, bytes)
          USE H5GLOBAL
@@ -2360,7 +2359,7 @@ CONTAINS
          INTEGER(HID_T), INTENT(IN) :: prp_id
          CHARACTER(LEN=*), INTENT(IN) :: name
          INTEGER :: namelen
-         INTEGER, INTENT(IN) :: offset
+         INTEGER(OFF_T), INTENT(IN) :: offset
          INTEGER(HSIZE_T), INTENT(IN) :: bytes
        END FUNCTION h5pset_external_c
     END INTERFACE
@@ -2453,7 +2452,9 @@ CONTAINS
 ! HISTORY
 !  Explicit Fortran interfaces were added for 
 !  called C functions (it is needed for Windows
-!  port).  March 14, 2001 
+!  port).  March 14, 2001
+!
+! Changed type of 'offset' from integer to off_t -- MSB January 9, 2012
 !  
 ! SOURCE
   SUBROUTINE h5pget_external_f(prp_id, idx, name_size, name, offset,bytes, hdferr)
@@ -2462,7 +2463,7 @@ CONTAINS
     INTEGER, INTENT(IN) :: idx           ! External file index.
     INTEGER(SIZE_T), INTENT(IN) :: name_size ! Maximum length of name array 
     CHARACTER(LEN=*), INTENT(OUT) :: name    ! Name of an external file
-    INTEGER, INTENT(OUT) :: offset           ! Offset, in bytes, from the beginning 
+    INTEGER(OFF_T), INTENT(OUT) :: offset    ! Offset, in bytes, from the beginning 
                                              !  of the file to the location in the file 
                                              !  where the data starts.
     INTEGER(HSIZE_T), INTENT(OUT) :: bytes   ! Number of bytes reserved in the 
@@ -2485,7 +2486,7 @@ CONTAINS
          INTEGER, INTENT(IN) :: idx 
          INTEGER(SIZE_T), INTENT(IN) :: name_size
          CHARACTER(LEN=*), INTENT(OUT) :: name
-         INTEGER, INTENT(OUT) :: offset
+         INTEGER(OFF_T), INTENT(OUT) :: offset
          INTEGER(HSIZE_T), INTENT(OUT) :: bytes
        END FUNCTION h5pget_external_c
     END INTERFACE
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index b1e650a..61c5db4 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -1063,9 +1063,9 @@ H5_FCDLL int_f nh5pmodify_filter_c (hid_t_f *prp_id, int_f* filter, int_f* flags
 H5_FCDLL int_f nh5pget_nfilters_c (hid_t_f *prp_id, int_f* nfilters);
 H5_FCDLL int_f nh5pget_filter_c(hid_t_f *prp_id, int_f* filter_number, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values, size_t_f *namelen, _fcd name, int_f* filter_id);
 H5_FCDLL int_f nh5pget_filter_by_id_c(hid_t_f *prp_id, int_f* filter_id, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values, size_t_f *namelen, _fcd name);
-H5_FCDLL int_f nh5pset_external_c (hid_t_f *prp_id, _fcd name, int_f* namelen, int_f* offset, hsize_t_f*bytes);
+H5_FCDLL int_f nh5pset_external_c (hid_t_f *prp_id, _fcd name, int_f* namelen, off_t_f* offset, hsize_t_f*bytes);
 H5_FCDLL int_f nh5pget_external_count_c (hid_t_f *prp_id, int_f* count);
-H5_FCDLL int_f nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f* name_size, _fcd name, int_f* offset, hsize_t_f*bytes);
+H5_FCDLL int_f nh5pget_external_c(hid_t_f *prp_id, int_f *idx, size_t_f* name_size, _fcd name, off_t_f* offset, hsize_t_f*bytes);
 H5_FCDLL int_f nh5pget_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right);
 H5_FCDLL int_f nh5pset_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right);
 H5_FCDLL int_f nh5pget_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info);
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index 4c83d21..eb30775 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -321,6 +321,19 @@ int main(void)
     return -1;
 #endif
 
+  /* off_t */
+#if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_OFF_T >= 8
+    writeToFiles("OFF_T", "off_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
+#elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_OFF_T >= 4
+    writeToFiles("OFF_T", "off_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
+#elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_OFF_T >= 2
+    writeToFiles("OFF_T", "off_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
+#elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_OFF_T >= 1
+    writeToFiles("OFF_T", "off_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
+#else
+    /* Error: couldn't find a size for off_t */
+    return -1;
+#endif
 
   /* size_t */
 #if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_SIZE_T >= 8
diff --git a/fortran/test/fortranlib_test_F03.f90 b/fortran/test/fortranlib_test_F03.f90
index bdc12d6..9dfd06a 100644
--- a/fortran/test/fortranlib_test_F03.f90
+++ b/fortran/test/fortranlib_test_F03.f90
@@ -143,7 +143,10 @@ PROGRAM fortranlibtest_F03
   CALL test_nbit(ret_total_error)
   CALL write_test_status(ret_total_error, ' Testing nbit filter', total_error)
 
- 
+  ret_total_error = 0
+  CALL external_test_offset(cleanup, ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing external dataset with offset', total_error)
+
 !     write(*,*)
 !     write(*,*) '========================================='
 !     write(*,*) 'Testing GROUP interface             '
diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90
index 3faaac2..4c78334 100644
--- a/fortran/test/tH5P.f90
+++ b/fortran/test/tH5P.f90
@@ -27,385 +27,376 @@
 !
 !*****
 
-    SUBROUTINE external_test(cleanup, total_error)
+SUBROUTINE external_test(cleanup, total_error)
 
 !   This subroutine tests following functionalities:
 !   h5pset_external_f,  h5pget_external_count_f,
 !   h5pget_external_f
 
-     USE HDF5 ! This module contains all necessary modules
-
-     IMPLICIT NONE
-     LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error
-
-     CHARACTER(LEN=8), PARAMETER :: filename = "external"
-     CHARACTER(LEN=80) :: fix_filename
-     INTEGER(HID_T) :: file_id
-     INTEGER(HID_T) :: plist_id
-     INTEGER(HID_T) :: space_id
-     INTEGER(HID_T) :: dataset_id
-     INTEGER(HSIZE_T), DIMENSION(1) :: cur_size !data space current size
-     INTEGER(HSIZE_T), DIMENSION(1) :: max_size !data space maximum size
-     CHARACTER(LEN=256) :: name !external file name
-     INTEGER :: file_offset !external file offset
-     INTEGER(HSIZE_T) :: file_size   !sizeof external file segment
-     INTEGER :: error !error code
-     INTEGER(SIZE_T) :: int_size !size of integer
-     INTEGER(HSIZE_T) :: file_bytes !Number of bytes reserved
-                                   !in the file for the data
-     INTEGER :: RANK = 1 !dataset rank
-     INTEGER :: count !number of external files for the
-                      !specified dataset
-     INTEGER(SIZE_T) :: namesize
-     INTEGER(HSIZE_T) :: size, buf_size
-     INTEGER :: idx
-
-     buf_size = 4*1024*1024
-
-     !
-     !Create file "external.h5" using default properties.
-     !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
-     CALL check("h5fcreate_f",error,total_error)
-
-
-     CALL h5pcreate_f(H5P_DATASET_XFER_F, plist_id, error)
-         CALL check("h5pcreate_f", error, total_error)
-     CALL h5pset_buffer_f(plist_id, buf_size, error)
-         CALL check("h5pset_buffer_f", error, total_error)
-     CALL h5pget_buffer_f(plist_id, size, error)
-         CALL check("h5pget_buffer_f", error, total_error)
-     if (size .ne.buf_size) then
-         total_error = total_error + 1
-         write(*,*) "h5pget_buffer_f returned wrong size, error"
-      endif
-     CALL h5pclose_f(plist_id, error)
-         CALL check("h5pclose_f", error, total_error)
-
-     CALL h5pcreate_f(H5P_DATASET_CREATE_F, plist_id, error)
-     CALL check("h5pcreate_f",error,total_error)
-     cur_size(1) =100
-     max_size(1) = 100;
-     call h5tget_size_f(H5T_NATIVE_INTEGER, int_size, error)
-     CALL check("h5tget_size_f",error,total_error)
-     file_size = int_size * max_size(1);
-     CALL h5pset_external_f(plist_id, "ext1.data", 0, file_size, error)
-     CALL check("h5pset_external_f",error,total_error)
-     CALL h5screate_simple_f(RANK, cur_size, space_id, error, max_size)
-     CALL check("h5screate_simple_f", error, total_error)
-     CALL h5dcreate_f(file_id, "dset1", H5T_NATIVE_INTEGER, space_id, &
-                           dataset_id, error, plist_id)
-     CALL check("h5dcreate_f", error, total_error)
-
-     CALL h5dclose_f(dataset_id, error)
-     CALL check("h5dclose_f", error, total_error)
-     CALL h5pclose_f(plist_id, error)
-     CALL check("h5pclose_f", error, total_error)
-     CALL h5sclose_f(space_id, error)
-     CALL check("h5sclose_f", error, total_error)
-     CALL h5fclose_f(file_id, error)
-
-     CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, file_id, error)
-     CALL h5dopen_f(file_id, "dset1", dataset_id, error)
-     CALL check("h5dopen_f",error,total_error)
-
-     ! Read dataset creation information
-     CALL h5dget_create_plist_f(dataset_id, plist_id, error)
-     CALL check("h5dget_create_plist_f",error,total_error)
-     CALL h5pget_external_count_f(plist_id, count, error)
-     CALL check("h5pget_external_count_f",error,total_error)
-     if(count .ne. 1 ) then
-         write (*,*) "got external_count is not correct"
-         total_error = total_error + 1
-     end if
-     namesize = 10
-     idx = 0
-     CALL h5pget_external_f(plist_id, idx, namesize, name, file_offset, &
-                            file_bytes, error)
-     CALL check("h5pget_external_f",error,total_error)
-     if(file_offset .ne. 0 ) then
-         write (*,*) "got external file offset is not correct"
-         total_error = total_error + 1
-     end if
-     if(file_bytes .ne. file_size ) then
-         write (*,*) "got external file size is not correct"
-         total_error = total_error + 1
-     end if
-
-     CALL h5dclose_f(dataset_id, error)
-     CALL check("h5dclose_f", error, total_error)
-     CALL h5pclose_f(plist_id, error)
-     CALL check("h5pclose_f", error, total_error)
-     CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f", error, total_error)
-
-
-          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-              CALL check("h5_cleanup_f", error, total_error)
+  USE HDF5 ! This module contains all necessary modules
+  
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN)  :: cleanup
+  INTEGER, INTENT(OUT) :: total_error
+  
+  CHARACTER(LEN=8), PARAMETER :: filename = "external"
+  CHARACTER(LEN=80) :: fix_filename
+  INTEGER(HID_T) :: file_id
+  INTEGER(HID_T) :: plist_id
+  INTEGER(HID_T) :: space_id
+  INTEGER(HID_T) :: dataset_id
+  INTEGER(HSIZE_T), DIMENSION(1) :: cur_size !data space current size
+  INTEGER(HSIZE_T), DIMENSION(1) :: max_size !data space maximum size
+  CHARACTER(LEN=256) :: name !external file name
+  INTEGER(OFF_T) :: file_offset !external file offset
+  INTEGER(HSIZE_T) :: file_size   !sizeof external file segment
+  INTEGER :: error !error code
+  INTEGER(SIZE_T) :: int_size !size of integer
+  INTEGER(HSIZE_T) :: file_bytes !Number of bytes reserved
+                                 !in the file for the data
+  INTEGER :: RANK = 1 !dataset rank
+  INTEGER :: count !number of external files for the
+                   !specified dataset
+  INTEGER(SIZE_T) :: namesize
+  INTEGER(HSIZE_T) :: size, buf_size
+  INTEGER :: idx
+
+  buf_size = 4*1024*1024
+
+  !
+  !Create file "external.h5" using default properties.
+  !
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     STOP "Cannot modify filename"
+  ENDIF
+  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
+  CALL check("h5fcreate_f",error,total_error)
+  
+  CALL h5pcreate_f(H5P_DATASET_XFER_F, plist_id, error)
+  CALL check("h5pcreate_f", error, total_error)
+  CALL h5pset_buffer_f(plist_id, buf_size, error)
+  CALL check("h5pset_buffer_f", error, total_error)
+  CALL h5pget_buffer_f(plist_id, size, error)
+  CALL check("h5pget_buffer_f", error, total_error)
+  IF (size .NE.buf_size) THEN
+     total_error = total_error + 1
+     WRITE(*,*) "h5pget_buffer_f returned wrong size, error"
+  ENDIF
+  CALL h5pclose_f(plist_id, error)
+  CALL check("h5pclose_f", error, total_error)
+  
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, plist_id, error)
+  CALL check("h5pcreate_f",error,total_error)
+  cur_size(1) =100
+  max_size(1) = 100
+  CALL h5tget_size_f(H5T_NATIVE_INTEGER, int_size, error)
+  CALL check("h5tget_size_f",error,total_error)
+  file_size = int_size * max_size(1)
+  CALL h5pset_external_f(plist_id, "ext1.data", INT(0,off_t), file_size, error)
+  CALL check("h5pset_external_f",error,total_error)
+  CALL h5screate_simple_f(RANK, cur_size, space_id, error, max_size)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5dcreate_f(file_id, "dset1", H5T_NATIVE_INTEGER, space_id, &
+       dataset_id, error, plist_id)
+  CALL check("h5dcreate_f", error, total_error)
+  
+  CALL h5dclose_f(dataset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5pclose_f(plist_id, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5sclose_f(space_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5fclose_f(file_id, error)
+  
+  CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, file_id, error)
+  CALL h5dopen_f(file_id, "dset1", dataset_id, error)
+  CALL check("h5dopen_f",error,total_error)
+  
+  ! Read dataset creation information
+  CALL h5dget_create_plist_f(dataset_id, plist_id, error)
+  CALL check("h5dget_create_plist_f",error,total_error)
+  CALL h5pget_external_count_f(plist_id, count, error)
+  CALL check("h5pget_external_count_f",error,total_error)
+  IF(count .NE. 1 ) THEN
+     WRITE (*,*) "got external_count is not correct"
+     total_error = total_error + 1
+  END IF
+  namesize = 10
+  idx = 0
+  CALL h5pget_external_f(plist_id, idx, namesize, name, file_offset, &
+       file_bytes, error)
+  CALL check("h5pget_external_f",error,total_error)
+  IF(file_offset .NE. 0 ) THEN
+     WRITE (*,*) "got external file offset is not correct"
+     total_error = total_error + 1
+  END IF
+  IF(file_bytes .NE. file_size ) THEN
+     WRITE (*,*) "got external file size is not correct"
+     total_error = total_error + 1
+  END IF
+  
+  CALL h5dclose_f(dataset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5pclose_f(plist_id, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
+
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  RETURN
+END SUBROUTINE external_test
+
+SUBROUTINE multi_file_test(cleanup, total_error)
+  USE HDF5 ! This module contains all necessary modules
+  
+  IMPLICIT NONE
+  LOGICAL, INTENT(IN) :: cleanup
+  INTEGER, INTENT(OUT) :: total_error
+  
+  CHARACTER(LEN=9), PARAMETER :: filename = "multidset" ! File name
+  CHARACTER(LEN=80) :: fix_filename
+  CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
+  
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: dset_id       ! Dataset identifier
+  INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
+  INTEGER(HID_T) :: dtype_id      ! Datatype identifier
+  INTEGER(HID_T) :: fapl, fapl_1  ! File access property list identifier
+  INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_map, memb_map_out
+  INTEGER(HID_T), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_fapl, memb_fapl_out
+  CHARACTER(LEN=20), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_name, memb_name_out
+  REAL, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_addr, memb_addr_out
+  !INTEGER(HADDR_T), DIMENSION(0:H5FD_MEM_NTYPES_F) :: memb_addr
+  LOGICAL :: relax  = .TRUE.
+  LOGICAL :: relax_out = .TRUE.
+  
+  INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/4,6/) ! Dataset dimensions
+  INTEGER     ::   rank = 2                        ! Dataset rank
+  
+  INTEGER, DIMENSION(4,6) :: dset_data, data_out ! Data buffers
+  INTEGER     ::   error ! Error flag
+  INTEGER(HID_T) :: driver
+  INTEGER     :: i, j    !general purpose integers
+  INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
+  INTEGER :: mdc_nelmts
+  INTEGER(SIZE_T) :: rdcc_nelmts
+  INTEGER(SIZE_T) :: rdcc_nbytes
+  REAL :: rdcc_w0
+  memb_fapl = H5P_DEFAULT_F
+  memb_map = H5FD_MEM_SUPER_F
+  memb_addr = 0.
+  memb_map(H5FD_MEM_SUPER_F) = H5FD_MEM_SUPER_F
+  memb_addr(H5FD_MEM_SUPER_F) = 0.
+  memb_map(H5FD_MEM_BTREE_F) = H5FD_MEM_BTREE_F
+  memb_addr(H5FD_MEM_BTREE_F) = 0.1
+  memb_map(H5FD_MEM_DRAW_F)  = H5FD_MEM_DRAW_F
+  memb_addr(H5FD_MEM_DRAW_F) = 0.5
+  memb_map(H5FD_MEM_GHEAP_F) = H5FD_MEM_GHEAP_F
+  memb_addr(H5FD_MEM_GHEAP_F) = 0.2
+  memb_map(H5FD_MEM_LHEAP_F) = H5FD_MEM_LHEAP_F
+  memb_addr(H5FD_MEM_LHEAP_F) = 0.3
+  memb_map(H5FD_MEM_OHDR_F)  = H5FD_MEM_OHDR_F
+  memb_addr(H5FD_MEM_OHDR_F) = 0.4
+  
+  memb_name = ' '
+  memb_name(H5FD_MEM_SUPER_F) = '%s-s.h5'
+  memb_name(H5FD_MEM_BTREE_F) = '%s-b.h5'
+  memb_name(H5FD_MEM_DRAW_F)  = '%s-r.h5'
+  memb_name(H5FD_MEM_GHEAP_F) = '%s-g.h5'
+  memb_name(H5FD_MEM_LHEAP_F) = '%s-l.h5'
+  memb_name(H5FD_MEM_OHDR_F)  = '%s-o.h5'
+
+  !
+  ! Initialize the dset_data array.
+  !
+  DO i = 1, 4
+     DO j = 1, 6
+        dset_data(i,j) = (i-1)*6 + j
+     END DO
+  END DO
+  
+  !
+  ! Create a new file using default properties.
+  !
+  CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+  IF (error .NE. 0) THEN
+     WRITE(*,*) "Cannot modify filename"
+     STOP
+  ENDIF
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("h5pcreate_f", error, total_error)
+  CALL h5pset_fapl_multi_f(fapl, memb_map, memb_fapl, memb_name, memb_addr, relax, error)
+  CALL check("h5pset_fapl_multi_f", error, total_error)
+  CALL h5pget_fapl_multi_f(fapl, memb_map_out, memb_fapl_out, memb_name_out, &
+       memb_addr_out, relax_out, error)
+  CALL check("h5pget_fapl_multi_f", error, total_error)
+  CALL h5pget_driver_f(fapl, driver, error)
+  CALL check("h5pget_driver_f",error, total_error)
+  IF(driver .NE. H5FD_MULTI_F) THEN
+     WRITE(*,*) "Wrong value for driver"
+  ENDIF
+  !
+  ! Let's check h5pget(set)cache_f APIs here for now
+  !
+  CALL h5pget_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
+       rdcc_w0, error)
+  CALL check("h5pget_cache_f", error, total_error)  
+  
+  !
+  ! Set cache to some number
+  !
+  rdcc_nbytes = 1024*1024
+  CALL h5pset_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
+       rdcc_w0, error)
+  CALL check("h5pset_cache_f", error, total_error)
+  CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error, access_prp = fapl)
+  CALL check("h5fcreate_f", error, total_error)
+  IF(error .NE. 0) THEN
+     WRITE(*,*) "Cannot create file using multi-file driver... Exiting...."
+     total_error = 1
+     CALL h5pclose_f(fapl, error)
      RETURN
-     END SUBROUTINE external_test
-
-        SUBROUTINE multi_file_test(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules
-
-          IMPLICIT NONE
-          LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error
-
-          CHARACTER(LEN=9), PARAMETER :: filename = "multidset" ! File name
-          CHARACTER(LEN=80) :: fix_filename
-          CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
-
-          INTEGER(HID_T) :: file_id       ! File identifier
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier
-          INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-          INTEGER(HID_T) :: dtype_id      ! Datatype identifier
-          INTEGER(HID_T) :: fapl, fapl_1  ! File access property list identifier
-          INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_map, memb_map_out
-          INTEGER(HID_T), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_fapl, memb_fapl_out
-          CHARACTER(LEN=20), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_name, memb_name_out
-          REAL, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_addr, memb_addr_out
-          !INTEGER(HADDR_T), DIMENSION(0:H5FD_MEM_NTYPES_F) :: memb_addr
-          LOGICAL :: relax  = .TRUE.
-          LOGICAL :: relax_out = .TRUE.
-
-          INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/4,6/) ! Dataset dimensions
-          INTEGER     ::   rank = 2                        ! Dataset rank
-
-          INTEGER, DIMENSION(4,6) :: dset_data, data_out ! Data buffers
-          INTEGER     ::   error ! Error flag
-          INTEGER(HID_T) :: driver
-          INTEGER     :: i, j    !general purpose integers
-          INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-          INTEGER :: mdc_nelmts
-          INTEGER(SIZE_T) :: rdcc_nelmts
-          INTEGER(SIZE_T) :: rdcc_nbytes
-          REAL :: rdcc_w0
-          memb_fapl = H5P_DEFAULT_F
-          memb_map = H5FD_MEM_SUPER_F
-          memb_addr = 0.
-          memb_map(H5FD_MEM_SUPER_F) = H5FD_MEM_SUPER_F
-          memb_addr(H5FD_MEM_SUPER_F) = 0.
-          memb_map(H5FD_MEM_BTREE_F) = H5FD_MEM_BTREE_F
-          memb_addr(H5FD_MEM_BTREE_F) = 0.1
-          memb_map(H5FD_MEM_DRAW_F)  = H5FD_MEM_DRAW_F
-          memb_addr(H5FD_MEM_DRAW_F) = 0.5
-          memb_map(H5FD_MEM_GHEAP_F) = H5FD_MEM_GHEAP_F
-          memb_addr(H5FD_MEM_GHEAP_F) = 0.2
-          memb_map(H5FD_MEM_LHEAP_F) = H5FD_MEM_LHEAP_F
-          memb_addr(H5FD_MEM_LHEAP_F) = 0.3
-          memb_map(H5FD_MEM_OHDR_F)  = H5FD_MEM_OHDR_F
-          memb_addr(H5FD_MEM_OHDR_F) = 0.4
-
-          memb_name = ' '
-          memb_name(H5FD_MEM_SUPER_F) = '%s-s.h5'
-          memb_name(H5FD_MEM_BTREE_F) = '%s-b.h5'
-          memb_name(H5FD_MEM_DRAW_F)  = '%s-r.h5'
-          memb_name(H5FD_MEM_GHEAP_F) = '%s-g.h5'
-          memb_name(H5FD_MEM_LHEAP_F) = '%s-l.h5'
-          memb_name(H5FD_MEM_OHDR_F)  = '%s-o.h5'
-
-          !
-          ! Initialize the dset_data array.
-          !
-          do i = 1, 4
-             do j = 1, 6
-                dset_data(i,j) = (i-1)*6 + j;
-             end do
-          end do
-
-          !
-          ! Create a new file using default properties.
-          !
-          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
-          if (error .ne. 0) then
-              write(*,*) "Cannot modify filename"
-              stop
-          endif
-          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-              CALL check("h5pcreate_f", error, total_error)
-          CALL h5pset_fapl_multi_f(fapl, memb_map, memb_fapl, memb_name, memb_addr, relax, error)
-              CALL check("h5pset_fapl_multi_f", error, total_error)
-          CALL h5pget_fapl_multi_f(fapl, memb_map_out, memb_fapl_out, memb_name_out, &
-                                   memb_addr_out, relax_out, error)
-              CALL check("h5pget_fapl_multi_f", error, total_error)
-          CALL h5pget_driver_f(fapl, driver, error)
-              CALL check("h5pget_driver_f",error, total_error)
-          if(driver .ne. H5FD_MULTI_F) then
-             write(*,*) "Wrong value for driver"
-          endif
-          !
-          ! Let's check h5pget(set)cache_f APIs here for now
-          !
-          CALL h5pget_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
-                              rdcc_w0, error)
-               CALL check("h5pget_cache_f", error, total_error)  
-
-
-          ! Set cache to some number
-          !
-          rdcc_nbytes = 1024*1024
-          CALL h5pset_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
-                              rdcc_w0, error)
-               CALL check("h5pset_cache_f", error, total_error)
-          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error, access_prp = fapl)
-              CALL check("h5fcreate_f", error, total_error)
-          if(error .ne. 0) then
-             write(*,*) "Cannot create file using multi-file driver... Exiting...."
-             total_error = 1
-             call h5pclose_f(fapl, error)
-             return
-          endif
-
-          !
-          ! Create the dataspace.
-          !
-          CALL h5screate_simple_f(rank, dims, dspace_id, error)
-              CALL check("h5screate_simple_f", error, total_error)
-
-
-          !
-          ! Create the dataset with default properties.
-          !
-          CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
-                           dset_id, error)
-              CALL check("h5dcreate_f", error, total_error)
-
-          !
-          ! Write the dataset.
-          !
-          data_dims(1) = 4
-          data_dims(2) = 6
-          CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
-              CALL check("h5dwrite_f", error, total_error)
-
-
-          !
-          ! End access to the dataset and release resources used by it.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data space.
-          !
-          CALL h5sclose_f(dspace_id, error)
-              CALL check("h5sclose_f", error, total_error)
-
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-              CALL check("h5fclose_f", error, total_error)
-          CALL h5pclose_f(fapl, error)
-              CALL check("h5pclose_f", error, total_error)
-         !
-          ! Open the existing file.
-          !
-          CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
-              CALL check("h5pcreate_f", error, total_error)
-          CALL h5pset_fapl_multi_f(fapl, relax, error)
-              CALL check("h5pset_fapl_multi_f", error, total_error)
-          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error, access_prp = fapl)
-              CALL check("h5fopen_f", error, total_error)
-          !
-          CALL h5fget_access_plist_f(file_id, fapl_1, error)
-              CALL check("h5fget_access_plist_f", error, total_error)
-          !It doesn't work on Windows.
-          !CALL h5pget_fapl_multi_f(fapl_1, memb_map_out, memb_fapl_out, memb_name_out, &
-          !                         memb_addr_out, relax_out, error)
-          ! write(*,*)  memb_map_out
-          ! write(*,*)  memb_fapl_out
-          ! write(*,*)  memb_name_out
-          ! write(*,*)  memb_addr_out
-          !    CALL check("h5pget_fapl_multi_f", error, total_error)
-
-          !
-          ! Open the existing dataset.
-          !
-          CALL h5dopen_f(file_id, dsetname, dset_id, error)
-              CALL check("h5dopen_f", error, total_error)
-
-          !
-          ! Get the dataset type.
-          !
-          CALL h5dget_type_f(dset_id, dtype_id, error)
-              CALL check("h5dget_type_f", error, total_error)
-
-          !
-          ! Get the data space.
-          !
-          CALL h5dget_space_f(dset_id, dspace_id, error)
-              CALL check("h5dget_space_f", error, total_error)
-
-          !
-          ! Read the dataset.
-          !
-          CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
-              CALL check("h5dread_f", error, total_error)
-
-          !
-          !Compare the data.
-          !
-          do i = 1, 4
-              do j = 1, 6
-                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-                      write(*, *) "dataset test error occured"
-                      write(*,*) "data read is not the same as the data writen"
-                  END IF
-              end do
-          end do
-
-          !
-          ! End access to the dataset and release resources used by it.
-          !
-          CALL h5dclose_f(dset_id, error)
-              CALL check("h5dclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data space.
-          !
-          CALL h5sclose_f(dspace_id, error)
-              CALL check("h5sclose_f", error, total_error)
-
-          !
-          ! Terminate access to the data type.
-          !
-          CALL h5tclose_f(dtype_id, error)
-              CALL check("h5tclose_f", error, total_error)
-          !
-          ! Close the file.
-          !
-          CALL h5fclose_f(file_id, error)
-          CALL check("h5fclose_f", error, total_error)
-          CALL h5pclose_f(fapl, error)
-          CALL check("h5pclose_f", error, total_error)
-          CALL h5pclose_f(fapl_1, error)
-          CALL check("h5pclose_f", error, total_error)
-          IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
-          CALL check("h5_cleanup_f", error, total_error)
-          
-          IF(cleanup) CALL h5_cleanup_f(filename//'.h5-b', H5P_DEFAULT_F, error)
-          CALL check("h5_cleanup_f", error, total_error)
-          IF(cleanup) CALL h5_cleanup_f(filename//'.h5-g', H5P_DEFAULT_F, error)
-          CALL check("h5_cleanup_f", error, total_error)
-          IF(cleanup) CALL h5_cleanup_f(filename//'.h5-l', H5P_DEFAULT_F, error)
-          CALL check("h5_cleanup_f", error, total_error)
-          IF(cleanup) CALL h5_cleanup_f(filename//'.h5-o', H5P_DEFAULT_F, error)
-          CALL check("h5_cleanup_f", error, total_error)
-          IF(cleanup) CALL h5_cleanup_f(filename//'.h5-r', H5P_DEFAULT_F, error)
-          CALL check("h5_cleanup_f", error, total_error)
-          IF(cleanup) CALL h5_cleanup_f(filename//'.h5-s', H5P_DEFAULT_F, error)
-          CALL check("h5_cleanup_f", error, total_error)
-     
-          RETURN
-        END SUBROUTINE multi_file_test
+  ENDIF
+  !
+  ! Create the dataspace.
+  !
+  CALL h5screate_simple_f(rank, dims, dspace_id, error)
+  CALL check("h5screate_simple_f", error, total_error)
+  !
+  ! Create the dataset with default properties.
+  !
+  CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
+       dset_id, error)
+  CALL check("h5dcreate_f", error, total_error)
+  !
+  ! Write the dataset.
+  !
+  data_dims(1) = 4
+  data_dims(2) = 6
+  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
+  CALL check("h5dwrite_f", error, total_error)
+  !
+  ! End access to the dataset and release resources used by it.
+  !
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  
+  !
+  ! Terminate access to the data space.
+  !
+  CALL h5sclose_f(dspace_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  
+  !
+  ! Close the file.
+  !
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
+  CALL h5pclose_f(fapl, error)
+  CALL check("h5pclose_f", error, total_error)
+  !
+  ! Open the existing file.
+  !
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL check("h5pcreate_f", error, total_error)
+  CALL h5pset_fapl_multi_f(fapl, relax, error)
+  CALL check("h5pset_fapl_multi_f", error, total_error)
+  CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error, access_prp = fapl)
+  CALL check("h5fopen_f", error, total_error)
+  !
+  CALL h5fget_access_plist_f(file_id, fapl_1, error)
+  CALL check("h5fget_access_plist_f", error, total_error)
+  !It doesn't work on Windows.
+  !CALL h5pget_fapl_multi_f(fapl_1, memb_map_out, memb_fapl_out, memb_name_out, &
+  !                         memb_addr_out, relax_out, error)
+  ! write(*,*)  memb_map_out
+  ! write(*,*)  memb_fapl_out
+  ! write(*,*)  memb_name_out
+  ! write(*,*)  memb_addr_out
+  !    CALL check("h5pget_fapl_multi_f", error, total_error)
+  
+  !
+  ! Open the existing dataset.
+  !
+  CALL h5dopen_f(file_id, dsetname, dset_id, error)
+  CALL check("h5dopen_f", error, total_error)
+  
+  !
+  ! Get the dataset type.
+  !
+  CALL h5dget_type_f(dset_id, dtype_id, error)
+  CALL check("h5dget_type_f", error, total_error)
+  
+  !
+  ! Get the data space.
+  !
+  CALL h5dget_space_f(dset_id, dspace_id, error)
+  CALL check("h5dget_space_f", error, total_error)
+  
+  !
+  ! Read the dataset.
+  !
+  CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error)
+  CALL check("h5dread_f", error, total_error)
+  
+  !
+  !Compare the data.
+  !
+  DO i = 1, 4
+     DO j = 1, 6
+        IF (data_out(i,j) .NE. dset_data(i, j)) THEN
+           WRITE(*, *) "dataset test error occured"
+           WRITE(*,*) "data read is not the same as the data writen"
+        END IF
+     END DO
+  END DO
+  
+  !
+  ! End access to the dataset and release resources used by it.
+  !
+  CALL h5dclose_f(dset_id, error)
+  CALL check("h5dclose_f", error, total_error)
+  
+  !
+  ! Terminate access to the data space.
+  !
+  CALL h5sclose_f(dspace_id, error)
+  CALL check("h5sclose_f", error, total_error)
+  
+  !
+  ! Terminate access to the data type.
+  !
+  CALL h5tclose_f(dtype_id, error)
+  CALL check("h5tclose_f", error, total_error)
+  !
+  ! Close the file.
+  !
+  CALL h5fclose_f(file_id, error)
+  CALL check("h5fclose_f", error, total_error)
+  CALL h5pclose_f(fapl, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5pclose_f(fapl_1, error)
+  CALL check("h5pclose_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-b', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-g', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-l', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-o', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-r', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  IF(cleanup) CALL h5_cleanup_f(filename//'.h5-s', H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+  
+  RETURN
+END SUBROUTINE multi_file_test
 
 !-------------------------------------------------------------------------
 ! Function: test_chunk_cache
@@ -432,24 +423,24 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
   INTEGER, INTENT(OUT) :: total_error
-   
+  
   CHARACTER(LEN=14), PARAMETER :: filename="chunk_cache"
   CHARACTER(LEN=80) :: fix_filename
-  INTEGER(hid_t) :: fid = -1        ! /* File ID */
+  INTEGER(hid_t) :: fid = -1        ! File ID 
   INTEGER(hid_t) :: file
-  INTEGER(hid_t) :: fapl_local = -1 ! /* Local fapl */
-  INTEGER(hid_t) :: fapl_def = -1  ! /* Default fapl */
-  INTEGER(hid_t) :: dcpl = -1      !/* Dataset creation property list ID */
-  INTEGER(hid_t) :: dapl1 = -1     !/* Dataset access property list ID */
-  INTEGER(hid_t) :: dapl2 = -1     !/* Dataset access property list ID */
-  INTEGER(hid_t) :: sid = -1       !/* Dataspace ID */
-  INTEGER(hid_t) :: dsid = -1      !/* Dataset ID */
-  INTEGER(hsize_t), DIMENSION(1:1) :: chunk_dim, NDIM = (/100/) !/* Dataset and chunk dimensions */
-  INTEGER(size_t) :: nslots_1, nslots_2, nslots_3, nslots_4 !/* rdcc number of elements */
-  INTEGER(size_t) :: nbytes_1, nbytes_2, nbytes_3, nbytes_4 !/* rdcc number of bytes */
+  INTEGER(hid_t) :: fapl_local = -1 !  Local fapl 
+  INTEGER(hid_t) :: fapl_def = -1  !  Default fapl 
+  INTEGER(hid_t) :: dcpl = -1      ! Dataset creation property list ID 
+  INTEGER(hid_t) :: dapl1 = -1     ! Dataset access property list ID 
+  INTEGER(hid_t) :: dapl2 = -1     ! Dataset access property list ID 
+  INTEGER(hid_t) :: sid = -1       ! Dataspace ID 
+  INTEGER(hid_t) :: dsid = -1      ! Dataset ID 
+  INTEGER(hsize_t), DIMENSION(1:1) :: chunk_dim, NDIM = (/100/) ! Dataset and chunk dimensions 
+  INTEGER(size_t) :: nslots_1, nslots_2, nslots_3, nslots_4 ! rdcc number of elements 
+  INTEGER(size_t) :: nbytes_1, nbytes_2, nbytes_3, nbytes_4 ! rdcc number of bytes 
   INTEGER :: mdc_nelmts
-  INTEGER(size_t) ::nlinks         !/* Number of link traversals */
-  REAL :: w0_1, w0_2, w0_3, w0_4; !/* rdcc preemption policy */
+  INTEGER(size_t) ::nlinks         ! Number of link traversals 
+  REAL :: w0_1, w0_2, w0_3, w0_4 ! rdcc preemption policy 
   INTEGER :: error
   INTEGER(size_t) rdcc_nelmts
   INTEGER(size_t) rdcc_nbytes
@@ -462,7 +453,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
      STOP
   ENDIF
 
-  !/* Create a default fapl and dapl */
+  ! Create a default fapl and dapl 
   CALL H5Pcreate_f(H5P_FILE_ACCESS_F, fapl_def, error)
   CALL check("H5Pcreate_f", error, total_error)
   CALL H5Pcreate_f(H5P_DATASET_ACCESS_F, dapl1, error)
@@ -481,7 +472,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
      CALL VERIFYlogical("H5Pget_chunk_cache_f", .TRUE., .FALSE., total_error)
   ENDIF
 
-  ! /* Set a lapl property on dapl1 (to verify inheritance) */
+  !  Set a lapl property on dapl1 (to verify inheritance) 
   CALL H5Pset_nlinks_f(dapl1, 134_size_t , error)
   CALL check("H5Pset_nlinks_f", error, total_error)
   CALL H5Pget_nlinks_f(dapl1, nlinks, error)
@@ -494,7 +485,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   ! Turn off the chunk cache, so all the chunks are immediately written to disk
   CALL H5Pget_cache_f(fapl_local, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, error)
   CALL check("H5Pget_cache_f", error, total_error)
-  rdcc_nbytes = 0;
+  rdcc_nbytes = 0
   CALL H5Pset_cache_f(fapl_local, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, error)
   CALL check("H5Pset_cache_f", error, total_error)
 
@@ -506,29 +497,29 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL H5Pset_cache_f(fapl_local, 0, nslots_2, nbytes_2, w0_2, error)
   CALL check("H5Pset_cache_f", error, total_error)
 
-  !/* Create file */
+  ! Create file 
   CALL H5Fcreate_f(fix_filename, H5F_ACC_TRUNC_F, fid, error,  H5P_DEFAULT_F, fapl_local)
   CALL check("H5Fcreate_f", error, total_error)
 
-  !/* Create dataset creation property list */
+  ! Create dataset creation property list 
   CALL H5Pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
   CALL check("H5Pcreate_f", error, total_error)
 
-  !/* Set chunking */
-  chunk_dim(1) = 10;
+  ! Set chunking 
+  chunk_dim(1) = 10
   CALL H5Pset_chunk_f(dcpl, 1, chunk_dim, error)
   CALL check("H5Pset_chunk_f", error, total_error)
 
-  !/* Create 1-D dataspace */
+  ! Create 1-D dataspace 
   ndim(1) = 100
   CALL H5Screate_simple_f(1, ndim, sid, error)
   CALL check("H5Pcreate_f", error, total_error)
 
-  ! /* Create dataset with default dapl */
+  !  Create dataset with default dapl 
   CALL H5Dcreate_f(fid, "dset", H5T_NATIVE_INTEGER, sid, dsid, error,  dcpl, H5P_DEFAULT_F,  dapl1)
   CALL check("H5Pcreate_f", error, total_error)
  
-  ! /* Retrieve dapl from dataset, verify cache values are the same as on fapl_local */
+  !  Retrieve dapl from dataset, verify cache values are the same as on fapl_local 
   CALL H5Dget_access_plist_f(dsid, dapl2, error)
   CALL check("H5Dget_access_plist_f", error, total_error)
   CALL H5Pget_chunk_cache_f(dapl2, nslots_4, nbytes_4, w0_4, error)
@@ -538,7 +529,8 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   IF(w0_2.NE.w0_4)THEN
      CALL VERIFYlogical("H5Pget_chunk_cache_f", .TRUE., .FALSE., total_error)
   ENDIF
-  CALL H5Pclose_f(dapl2,error); CALL check("H5Pclose_f", error, total_error)
+  CALL H5Pclose_f(dapl2,error) 
+  CALL check("H5Pclose_f", error, total_error)
   
   ! Set new values on dapl1.  nbytes will be set to default, so the file
   ! property will override this setting
@@ -550,7 +542,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL H5Pset_chunk_cache_f(dapl1, nslots_3, nbytes_3, w0_3, error)
   CALL check("H5Pset_chunk_cache_f", error, total_error)
 
-  ! Close dataset, reopen with dapl1.  Note the use of a dapl with H5Oopen */
+  ! Close dataset, reopen with dapl1.  Note the use of a dapl with H5Oopen 
   CALL H5Dclose_f(dsid, error)
   CALL H5Oopen_f(fid, "dset", dsid, error, dapl1)
 
@@ -569,10 +561,12 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   IF(w0_3.NE.w0_4)THEN
      CALL VERIFYlogical("H5Pget_chunk_cache_f4", .TRUE., .FALSE., total_error)
   ENDIF
-  CALL H5Pclose_f(dapl2,error); CALL check("H5Pclose_f", error, total_error)
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error)
 
   ! Close dataset, reopen with H5P_DEFAULT as dapl
-  CALL H5Dclose_f(dsid, error); CALL check("H5Dclose_f", error, total_error)
+  CALL H5Dclose_f(dsid, error)
+  CALL check("H5Dclose_f", error, total_error)
   CALL H5Oopen_f(fid, "dset", dsid, error)
   CALL check("H5Oopen_f", error, total_error)
 
@@ -587,10 +581,12 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   IF(w0_2.NE.w0_4)THEN
      CALL VERIFYlogical("H5Pget_chunk_cache_f", .TRUE., .FALSE., total_error)
   ENDIF
-  CALL H5Pclose_f(dapl2,error); CALL check("H5Pclose_f", error, total_error)
+  CALL H5Pclose_f(dapl2,error) 
+  CALL check("H5Pclose_f", error, total_error)
 
   ! Similary, test use of H5Dcreate2 with H5P_DEFAULT
-  CALL H5Dclose_f(dsid, error); CALL check("H5Dclose_f", error, total_error)
+  CALL H5Dclose_f(dsid, error) 
+  CALL check("H5Dclose_f", error, total_error)
 
   CALL H5Dcreate_f(fid, "dset2", H5T_NATIVE_INTEGER, sid, dsid, error,  dcpl, H5P_DEFAULT_F,  H5P_DEFAULT_F)
   CALL check("H5Pcreate_f", error, total_error)
@@ -615,8 +611,10 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
 
   !  Close and reopen file with new fapl_local
   
-  CALL H5Dclose_f(dsid, error); CALL check("H5Dclose_f", error, total_error)
-  CALL H5Fclose_f(fid,error); CALL check("h5fclose_f", error, total_error)
+  CALL H5Dclose_f(dsid, error)
+  CALL check("H5Dclose_f", error, total_error)
+  CALL H5Fclose_f(fid,error)
+  CALL check("h5fclose_f", error, total_error)
 
   CALL H5Fopen_f (fix_filename, H5F_ACC_RDWR_F, fid, error, fapl_local)
   CALL check("h5fopen_f", error, total_error)
@@ -628,7 +626,8 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL h5dopen_f (fid, "dset", dsid, error, dapl2)
   CALL check("h5dopen_f", error, total_error)
   
-  CALL H5Pclose_f(dapl2,error); CALL check("H5Pclose_f", error, total_error) ! Close dapl2, to avoid id leak
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error) ! Close dapl2, to avoid id leak
   
   CALL H5Dget_access_plist_f(dsid, dapl2, error)
   CALL check("H5Dget_access_plist_f", error, total_error)
@@ -647,11 +646,13 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL H5Pset_chunk_cache_f(dapl2, nslots_2, nbytes_2, w0_2, error)
   CALL check("H5Pset_chunk_cache_f", error, total_error)
 
-  CALL H5Dclose_f(dsid, error); CALL check("H5Dclose_f", error, total_error)
+  CALL H5Dclose_f(dsid, error)
+  CALL check("H5Dclose_f", error, total_error)
   CALL h5dopen_f (fid, "dset", dsid, error, dapl2)
   CALL check("h5dopen_f", error, total_error)
 
-  CALL H5Pclose_f(dapl2,error); CALL check("H5Pclose_f", error, total_error)
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error)
 
   CALL H5Dget_access_plist_f(dsid, dapl2, error)
   CALL check("H5Dget_access_plist_f", error, total_error)
@@ -665,17 +666,24 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
 
 ! Close
 
-  CALL H5Dclose_f(dsid, error); CALL check("H5Dclose_f", error, total_error)
-  CALL H5Sclose_f(sid,error); CALL check("H5Sclose_f", error, total_error)
-  CALL H5Pclose_f(fapl_local,error); CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Pclose_f(fapl_def,error); CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Pclose_f(dapl1,error); CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Pclose_f(dapl2,error); CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Pclose_f(dcpl,error); CALL check("H5Pclose_f", error, total_error) 
-  CALL H5Fclose_f(fid,error); CALL check("H5Fclose_f", error, total_error)
+  CALL H5Dclose_f(dsid, error)
+  CALL check("H5Dclose_f", error, total_error)
+  CALL H5Sclose_f(sid,error)
+  CALL check("H5Sclose_f", error, total_error)
+  CALL H5Pclose_f(fapl_local,error)
+  CALL check("H5Pclose_f", error, total_error) 
+  CALL H5Pclose_f(fapl_def,error)
+  CALL check("H5Pclose_f", error, total_error) 
+  CALL H5Pclose_f(dapl1,error)
+  CALL check("H5Pclose_f", error, total_error) 
+  CALL H5Pclose_f(dapl2,error)
+  CALL check("H5Pclose_f", error, total_error) 
+  CALL H5Pclose_f(dcpl,error)
+  CALL check("H5Pclose_f", error, total_error) 
+  CALL H5Fclose_f(fid,error)
+  CALL check("H5Fclose_f", error, total_error)
 
   IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
   CALL check("h5_cleanup_f", error, total_error)
 
 END SUBROUTINE test_chunk_cache
-
diff --git a/fortran/test/tH5P_F03.f90 b/fortran/test/tH5P_F03.f90
index aec8a26..02ca9dc 100644
--- a/fortran/test/tH5P_F03.f90
+++ b/fortran/test/tH5P_F03.f90
@@ -362,3 +362,144 @@ SUBROUTINE test_genprop_class_callback(total_error)
   CALL check("h5pclose_class_f", error, total_error)
 
 END SUBROUTINE test_genprop_class_callback
+
+!-------------------------------------------------------------------------
+! Function: external_test_offset
+!
+! Purpose: Tests APIs:
+!      h5pset_external_f (with offsets not equal to zero), h5pget_external_f
+!
+! Return:      Success: 0
+!              Failure: -1
+!
+! FORTRAN Programmer: M. Scot Breitenfeld
+!                     January 10, 2012
+!-------------------------------------------------------------------------
+!
+SUBROUTINE external_test_offset(cleanup,total_error)
+
+  USE ISO_C_BINDING
+  USE HDF5 ! This module contains all necessary modules
+
+  IMPLICIT NONE
+  INTEGER, INTENT(OUT) :: total_error
+  LOGICAL, INTENT(IN)  :: cleanup
+
+  INTEGER(hid_t) :: fapl=-1   ! file access property list
+  INTEGER(hid_t) :: file=-1   ! file to write to		
+  INTEGER(hid_t) :: dcpl=-1   ! dataset creation properties	
+  INTEGER(hid_t) :: space=-1  ! data space			
+  INTEGER(hid_t) :: dset=-1   ! dataset			
+  INTEGER(hid_t) :: grp=-1    ! group to emit diagnostics
+  INTEGER(size_t) :: i, j     ! miscellaneous counters	
+  CHARACTER(LEN=180) :: filename   ! file names			
+  INTEGER, DIMENSION(1:25) :: part ! raw data buffers
+  INTEGER, DIMENSION(1:100), TARGET :: whole ! raw data buffers		
+  INTEGER(hsize_t), DIMENSION(1:1) :: cur_size ! current data space size	
+  INTEGER(hid_t) :: hs_space  ! hyperslab data space		
+  INTEGER(hsize_t), DIMENSION(1:1) :: hs_start = (/30/) ! hyperslab starting offset	
+  INTEGER(hsize_t), DIMENSION(1:1) :: hs_count = (/25/) ! hyperslab size
+  CHARACTER(LEN=1) :: ichr1 ! character conversion holder
+  INTEGER :: error ! error status
+  TYPE(C_PTR) :: f_ptr ! fortran pointer
+
+  CHARACTER(LEN=1,KIND=C_CHAR), DIMENSION(1:30) :: temparray
+
+  temparray(1:30)(1:1) = '0' ! 1 byte character
+
+  ! Write the data to external files directly
+  DO i = 1, 4
+     DO j = 1, 25
+        part(j) = (i-1)*25+(j-1)
+     ENDDO
+     WRITE(ichr1,'(I1.1)') i
+     filename = "extern_"//ichr1//"a.raw"
+     OPEN(10, FILE=filename, ACCESS='STREAM', form='UNFORMATTED')
+     
+     WRITE(10) temparray(1:(i-1)*10)
+     WRITE(10) part
+     CLOSE(10)
+  ENDDO
+  !
+  ! Create the file and an initial group. 
+  CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
+  CALL h5fcreate_f('extren_raw.h5', H5F_ACC_TRUNC_F, file, error, access_prp=fapl)
+  CALL check("h5fcreate_f",error,total_error)
+  
+  CALL h5gcreate_f(file, "emit-diagnostics", grp, error)
+  CALL check("h5gcreate_f",error, total_error)
+  
+  ! Create the dataset
+  CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
+  CALL check("h5pcreate_f", error, total_error)
+  CALL h5pset_external_f(dcpl, "extern_1a.raw", INT(0,off_t), INT(SIZEOF(part), hsize_t), error)
+  CALL check("h5pset_external_f",error,total_error)
+  CALL h5pset_external_f(dcpl, "extern_2a.raw", INT(10,off_t), INT(SIZEOF(part), hsize_t), error)
+  CALL check("h5pset_external_f",error,total_error)
+  CALL h5pset_external_f(dcpl, "extern_3a.raw", INT(20,off_t), INT(SIZEOF(part), hsize_t), error)
+  CALL check("h5pset_external_f",error,total_error)
+  CALL h5pset_external_f(dcpl, "extern_4a.raw", INT(30,off_t), INT(SIZEOF(part), hsize_t), error)
+  CALL check("h5pset_external_f",error,total_error)
+  
+  cur_size(1) = 100
+  CALL h5screate_simple_f(1, cur_size, space, error)
+  CALL check("h5screate_simple_f", error, total_error)
+  CALL h5dcreate_f(file, "dset1", H5T_NATIVE_INTEGER, space, dset,error,dcpl_id=dcpl)
+  CALL check("h5dcreate_f", error, total_error)
+
+  !
+  ! Read the entire dataset and compare with the original
+  whole(:) = 0
+  f_ptr = C_LOC(whole(1))
+  CALL h5dread_f(dset, H5T_NATIVE_INTEGER, f_ptr, error, mem_space_id=space, file_space_id=space)
+  CALL check("h5dread_f", error, total_error)
+
+  DO i = 1, 100
+     IF(whole(i) .NE. i-1)THEN
+        WRITE(*,*) "Incorrect value(s) read."
+        total_error =  total_error + 1
+        EXIT
+     ENDIF
+  ENDDO
+  !
+  ! Read the middle of the dataset
+  CALL h5scopy_f(space, hs_space, error)
+  CALL check("h5scopy_f", error, total_error)
+  CALL h5sselect_hyperslab_f(hs_space, H5S_SELECT_SET_F, hs_start, hs_count, error)
+  CALL check("h5sselect_hyperslab_f", error, total_error)
+
+  whole(:) = 0
+  f_ptr = C_LOC(whole(1))
+  CALL h5dread_f(dset, H5T_NATIVE_INTEGER, f_ptr, error, mem_space_id=hs_space, file_space_id=hs_space)
+  CALL check("h5dread_f", error, total_error)
+
+  CALL h5sclose_f(hs_space, error)
+  CALL check("h5sclose_f", error, total_error)
+  DO i = hs_start(1)+1, hs_start(1)+hs_count(1)
+     IF(whole(i) .NE. i-1)THEN
+        WRITE(*,*) "Incorrect value(s) read."
+        total_error =  total_error + 1
+        EXIT
+     ENDIF
+  ENDDO
+  
+  CALL h5dclose_f(dset, error)
+  CALL check("h5dclose_f", error, total_error)
+  CALL h5pclose_f(dcpl, error)
+  CALL check("h5pclose_f", error, total_error)
+  CALL h5sclose_f(space, error)
+  CALL check("h5sclose_f", error, total_error)
+  CALL h5fclose_f(file, error)
+  CALL check("h5fclose_f", error, total_error)
+
+  ! cleanup
+  DO i = 1, 4
+     WRITE(ichr1,'(I1.1)') i
+     filename = "extern_"//ichr1//"a.raw"
+     CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+     CALL check("h5_cleanup_f", error, total_error)
+  ENDDO
+  IF(cleanup) CALL h5_cleanup_f("extren_raw.h5", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
+END SUBROUTINE external_test_offset