[svn-r29066] - fixing some of the internal usage of dxpls.

- merge from trunk.

30 files changed, 1278 insertions, 72 deletions

diff --git a/MANIFEST b/MANIFEST
index 7b0501d..8fffaad 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -216,6 +216,7 @@
 ./fortran/src/H5f90global.F90
 ./fortran/src/H5f90i.h
 ./fortran/src/H5f90kit.c
+./fortran/src/H5fortkit.F90
 ./fortran/src/H5f90proto.h
 ./fortran/src/H5match_types.c
 ./fortran/src/HDF5.F90
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index dc884d5..5854f75 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -161,6 +161,7 @@ set (f90_F_BASE_SRCS
 
     # normal distribution
     ${HDF5_F90_SRC_SOURCE_DIR}/H5f90global.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5fortkit.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5_ff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Aff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Dff.F90
diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90
index e44d90e..b372dc1 100644
--- a/fortran/src/H5Dff.F90
+++ b/fortran/src/H5Dff.F90
@@ -4,7 +4,7 @@
 !  MODULE H5D
 !
 ! FILE
-!  fortran/src/H5Dff.f90
+!  fortran/src/H5Dff.F90
 !
 ! PURPOSE
 !  This file contains Fortran interfaces for H5D functions.
diff --git a/fortran/src/H5Eff.F90 b/fortran/src/H5Eff.F90
index a2efe61..7a0b15b 100644
--- a/fortran/src/H5Eff.F90
+++ b/fortran/src/H5Eff.F90
@@ -4,7 +4,7 @@
 !  MODULE H5E
 !
 ! FILE
-!  fortran/src/H5Eff.f90
+!  fortran/src/H5Eff.F90
 !
 ! PURPOSE
 !  This Module contains Fortran interfaces for H5E functions.
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90
index c69ad82..165fba0 100644
--- a/fortran/src/H5Fff.F90
+++ b/fortran/src/H5Fff.F90
@@ -4,7 +4,7 @@
 !  MODULE H5F
 !
 ! FILE
-!  H5Fff.f90
+!  H5Fff.F90
 !
 ! PURPOSE
 !  This file contains Fortran interfaces for H5F functions.
diff --git a/fortran/src/H5Gff.F90 b/fortran/src/H5Gff.F90
index 2e002b5..30076a4 100644
--- a/fortran/src/H5Gff.F90
+++ b/fortran/src/H5Gff.F90
@@ -4,7 +4,7 @@
 !  MODULE H5G
 !
 ! FILE
-!  fortran/src/H5Gff.f90
+!  fortran/src/H5Gff.F90
 !
 ! PURPOSE
 !  This file contains Fortran interfaces for H5G functions.
diff --git a/fortran/src/H5Off.F90 b/fortran/src/H5Off.F90
index da940df..8d4fb16 100644
--- a/fortran/src/H5Off.F90
+++ b/fortran/src/H5Off.F90
@@ -4,7 +4,7 @@
 !  MODULE H5O
 !
 ! FILE
-!  fortran/src/H5Off.f90
+!  fortran/src/H5Off.F90
 !
 ! PURPOSE
 !  This file contains Fortran interfaces for H5O functions.
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index 97f907b..6c6abe4 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -42,7 +42,8 @@ MODULE H5P
 
   USE, INTRINSIC :: ISO_C_BINDING
   USE H5GLOBAL
-  
+  USE H5fortkit
+
   INTERFACE h5pset_fapl_multi_f
      MODULE PROCEDURE h5pset_fapl_multi_l
      MODULE PROCEDURE h5pset_fapl_multi_s
@@ -7321,6 +7322,520 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
   END SUBROUTINE h5pget_mpio_actual_io_mode_f
 #endif
 
+!
+! V I R T U A L  D A T S E T S
+!
+
+!****s* 
+! NAME
+!  h5pset_virtual_view_f
+!
+! PURPOSE
+!  Sets the view of the virtual dataset (VDS) to include or exclude missing mapped elements.
+!
+! INPUTS
+!   dapl_id - Identifier of the virtual dataset access property list.
+!   view    - Flag specifying the extent of the data to be included in the view.
+!             Valid values are:
+!                H5D_VDS_FIRST_MISSING_F
+!                H5D_VDS_LAST_AVAILABLE_F
+! 
+! OUTPUTS
+!  
+!  hdferr   - Returns 0 if successful and -1 if fails.
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!  Nov 2, 2015
+!
+!
+! SOURCE
+  SUBROUTINE h5pset_virtual_view_f(dapl_id, view, hdferr)
+    IMPLICIT NONE
+
+    INTEGER(HID_T), INTENT(IN)  :: dapl_id
+    INTEGER       , INTENT(IN)  :: view
+    INTEGER       , INTENT(OUT) :: hdferr
+    
+!*****
+    INTERFACE
+       INTEGER FUNCTION h5pset_virtual_view(dapl_id, view) BIND(C,NAME='H5Pset_virtual_view')
+         IMPORT :: HID_T, ENUM_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dapl_id
+         INTEGER(ENUM_T), INTENT(IN), VALUE :: view
+       END FUNCTION h5pset_virtual_view
+    END INTERFACE
+
+    hdferr = INT( h5pset_virtual_view(dapl_id, INT(view,ENUM_T)) )
+    
+  END SUBROUTINE h5pset_virtual_view_f
+
+!****s* 
+! NAME
+!  h5pget_virtual_view_f
+!
+! PURPOSE
+!  Retrieves the view of a virtual dataset accessed with dapl_id. 
+!
+! INPUTS
+!  dapl_id - Dataset access property list identifier for the virtual dataset
+!
+! OUTPUTS
+!  view - The flag specifying the view of the virtual dataset.
+!         Valid values are:
+!             H5D_VDS_FIRST_MISSING_F
+!             H5D_VDS_LAST_AVAILABLE_F
+!  hdferr - Returns 0 if successful and -1 if fails.
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!  Nov 2, 2015
+!
+! SOURCE
+  SUBROUTINE h5pget_virtual_view_f(dapl_id, view, hdferr)
+    IMPLICIT NONE
+
+    INTEGER(HID_T), INTENT(IN)  :: dapl_id
+    INTEGER       , INTENT(INOUT) :: view
+    INTEGER       , INTENT(OUT) :: hdferr
+!*****
+    INTEGER(ENUM_T) :: view_enum
+    INTERFACE
+       INTEGER FUNCTION h5pget_virtual_view(dapl_id, view) BIND(C,NAME='H5Pget_virtual_view')
+         IMPORT :: HID_T, ENUM_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dapl_id
+         INTEGER(ENUM_T), INTENT(OUT) :: view
+       END FUNCTION h5pget_virtual_view
+    END INTERFACE
+
+    hdferr = INT( h5pget_virtual_view(dapl_id, view_enum) )
+    view = INT(view_enum)
+    
+  END SUBROUTINE h5pget_virtual_view_f
+
+!****s* 
+! NAME
+!  h5pset_virtual_printf_gap_f
+!
+! PURPOSE
+!  Sets the maximum number of missing source files and/or datasets with the printf-style names 
+!  when getting the extent of an unlimited virtual dataset.  
+!
+! INPUTS
+!  dapl_id  - Dataset access property list identifier for the virtual dataset.
+!  gap_size - Maximum number of files and/or datasets allowed to be missing for determining 
+!             the extent of an unlimited virtual dataset with printf-style mappings.
+!
+! OUTPUTS       
+!  hdferr   - Returns 0 if successful and -1 if fails.
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!  Nov 2, 2015
+!
+! HISTORY
+!
+! SOURCE 
+  SUBROUTINE h5pset_virtual_printf_gap_f(dapl_id, gap_size, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T)  , INTENT(IN)  :: dapl_id
+    INTEGER(HSIZE_T), INTENT(IN)  :: gap_size
+    INTEGER         , INTENT(OUT) :: hdferr
+!*****
+    INTERFACE
+       INTEGER FUNCTION h5pset_virtual_printf_gap(dapl_id, gap_size) BIND(C,NAME='H5Pset_virtual_printf_gap')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dapl_id
+         INTEGER(HSIZE_T), INTENT(IN), VALUE :: gap_size
+       END FUNCTION h5pset_virtual_printf_gap
+    END INTERFACE
+
+    hdferr = INT( h5pset_virtual_printf_gap(dapl_id, gap_size) )
+    
+  END SUBROUTINE h5pset_virtual_printf_gap_f
+
+!****s* 
+! NAME
+!  h5pget_virtual_printf_gap_f
+!
+! PURPOSE
+!  Returns the maximum number of missing source files and/or datasets with the 
+!  printf-style names when getting the extent for an unlimited virtual dataset.
+!
+! INPUTS
+!  dapl_id    - Dataset access property list identifier for the virtual dataset
+!
+! OUTPUTS
+!    gap_size - Maximum number of the files and/or datasets allowed to be missing for 
+!               determining the extent of an unlimited virtual dataset with printf-style mappings. 
+!    hdferr   - Returns 0 if successful and -1 if fails
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!  Nov 2, 2015
+!
+! HISTORY
+!
+! SOURCE
+  SUBROUTINE h5pget_virtual_printf_gap_f(dapl_id, gap_size, hdferr)
+    IMPLICIT NONE
+    
+    INTEGER(HID_T)  , INTENT(IN)  :: dapl_id
+    INTEGER(HSIZE_T), INTENT(OUT) :: gap_size
+    INTEGER         , INTENT(OUT) :: hdferr
+!*****
+    INTERFACE
+       INTEGER FUNCTION h5pget_virtual_printf_gap(dapl_id, gap_size) BIND(C,NAME='H5Pget_virtual_printf_gap')
+         IMPORT :: HID_T, HSIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dapl_id
+         INTEGER(HSIZE_T), INTENT(OUT) :: gap_size
+       END FUNCTION h5pget_virtual_printf_gap
+    END INTERFACE
+
+    hdferr = INT( h5pget_virtual_printf_gap(dapl_id, gap_size) )
+    
+  END SUBROUTINE h5pget_virtual_printf_gap_f
+
+!****s* 
+! NAME
+!  h5pset_virtual_f
+!
+! PURPOSE
+!  Sets the mapping between virtual and source datasets.
+!
+! INPUTS
+!  dcpl_id      - The identifier of the dataset creation property list that will be 
+!                 used when creating the virtual dataset.
+!  vspace_id    - The dataspace identifier with the selection within the virtual 
+!                 dataset applied, possibly an unlimited selection.
+! src_file_name - The name of the HDF5 file where the source dataset is located.
+! src_dset_name - The path to the HDF5 dataset in the file specified by src_file_name.
+! src_space_id 	- The source dataset’s dataspace identifier with a selection applied, possibly an unlimited selection
+!
+! OUTPUTS
+!  hdferr  - Returns 0 if successful and -1 if fails
+
+! AUTHOR
+!  M. Scot Breitenfeld
+!  Nov 2, 2015
+!
+! HISTORY
+!
+! SOURCE
+  SUBROUTINE h5pset_virtual_f(dcpl_id, vspace_id, src_file_name, src_dset_name, src_space_id, hdferr)
+    IMPLICIT NONE
+    
+    INTEGER(HID_T), INTENT(IN)   :: dcpl_id
+    INTEGER(HID_T), INTENT(IN)   :: vspace_id
+    CHARACTER(LEN=*), INTENT(IN) :: src_file_name
+    CHARACTER(LEN=*), INTENT(IN) :: src_dset_name
+    INTEGER(HID_T), INTENT(IN)   :: src_space_id
+    INTEGER, INTENT(OUT)         :: hdferr
+!*****
+    CHARACTER(LEN=LEN_TRIM(src_file_name)+1,KIND=C_CHAR) :: c_src_file_name
+    CHARACTER(LEN=LEN_TRIM(src_dset_name)+1,KIND=C_CHAR) :: c_src_dset_name
+
+    INTERFACE
+       INTEGER FUNCTION h5pset_virtual(dcpl_id, vspace_id, c_src_file_name, c_src_dset_name, src_space_id) &
+            BIND(C,NAME='H5Pset_virtual')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: dcpl_id
+         INTEGER(HID_T), INTENT(IN), VALUE :: vspace_id
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: c_src_file_name
+         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: c_src_dset_name
+         INTEGER(HID_T), INTENT(IN), VALUE :: src_space_id
+       END FUNCTION h5pset_virtual
+    END INTERFACE
+
+    c_src_file_name = TRIM(src_file_name)//C_NULL_CHAR
+    c_src_dset_name = TRIM(src_dset_name)//C_NULL_CHAR
+
+    hdferr = h5pset_virtual(dcpl_id, vspace_id, c_src_file_name, c_src_dset_name, src_space_id)
+
+  END SUBROUTINE h5pset_virtual_f
+
+!****s* 
+! NAME
+!  h5pget_virtual_count_f
+!
+! PURPOSE
+!  Gets the number of mappings for the virtual dataset.
+!
+! INPUTS
+!  dcpl_id - The identifier of the virtual dataset creation property list. 
+!
+! OUTPUTS
+!   count   - The number of mappings.
+!   hdferr  - Returns 0 if successful and -1 if fails
+! AUTHOR
+!  M. Scot Breitenfeld
+!  Nov 2, 2015
+!
+! HISTORY
+!
+! SOURCE
+  SUBROUTINE h5pget_virtual_count_f(dcpl_id, count, hdferr)
+
+    IMPLICIT NONE
+    
+    INTEGER(HID_T), INTENT(IN)   :: dcpl_id
+    INTEGER(SIZE_T), INTENT(OUT) :: count
+    INTEGER, INTENT(OUT)         :: hdferr
+!*****
+    INTERFACE
+       INTEGER(HID_T) FUNCTION h5pget_virtual_count(dcpl_id, count) BIND(C,NAME='H5Pget_virtual_count')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+         INTEGER(SIZE_T), INTENT(OUT) :: count
+       END FUNCTION h5pget_virtual_count
+    END INTERFACE
+    
+    hdferr = INT( h5pget_virtual_count(dcpl_id, count))
+
+  END SUBROUTINE h5pget_virtual_count_f
+
+!****s* 
+! NAME
+!  h5pget_virtual_vspace_f
+!
+! PURPOSE
+!  Gets a dataspace identifier for the selection within the virtual dataset used in the mapping.
+!
+! INPUTS
+!  dcpl_id - The identifier of the virtual dataset creation property list.
+!    index - Mapping index.
+!            The value of index is 0 (zero) or greater and less than count (0 ≤ index < count), 
+!            where count is the number of mappings returned by h5pget_virtual_count.
+!
+! OUTPUTS 
+!   hdferr - Returns 0 if successful and -1 if fails.
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!  Nov 2, 2015
+!
+! HISTORY
+!
+! SOURCE
+  SUBROUTINE h5pget_virtual_vspace_f(dcpl_id, index, ds_id, hdferr)
+    IMPLICIT NONE
+
+    INTEGER(HID_T) , INTENT(IN)  :: dcpl_id
+    INTEGER(SIZE_T), INTENT(IN)  :: index
+    INTEGER(HID_T) , INTENT(OUT) :: ds_id
+    INTEGER, INTENT(OUT)         :: hdferr
+
+!*****
+    INTERFACE
+       INTEGER(HID_T) FUNCTION h5pget_virtual_vspace(dcpl_id, index) BIND(C,NAME='H5Pget_virtual_vspace')
+         IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+         INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+         INTEGER(SIZE_T), INTENT(IN), VALUE :: index
+       END FUNCTION h5pget_virtual_vspace
+    END INTERFACE
+    
+    ds_id = h5pget_virtual_vspace(dcpl_id, index)
+    
+    hdferr = 0
+    IF(ds_id.LT.0) hdferr = -1
+
+END SUBROUTINE h5pget_virtual_vspace_f
+
+!****s* 
+! NAME
+!  h5pget_virtual_srcspace_f
+!
+! PURPOSE
+!  Gets a dataspace identifier for the selection within the source dataset used in the mapping.
+!
+! INPUTS
+!   dcpl_id - The identifier of the virtual dataset creation property list.
+!   index   - Mapping index.
+!             The value of index is 0 (zero) or greater and less than count (0 ≤ index < count), 
+!             where count is the number of mappings returned by h5pget_virtual_count.
+!
+!
+! OUTPUTS
+!   ds_id  - dataspace identifier
+!   hdferr - Returns 0 if successful and -1 if fails.
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!  Nov 2, 2015
+!
+! HISTORY
+!
+! SOURCE
+SUBROUTINE h5pget_virtual_srcspace_f(dcpl_id, index, ds_id, hdferr)
+  IMPLICIT NONE
+
+  INTEGER(HID_T) , INTENT(IN)  :: dcpl_id
+  INTEGER(SIZE_T), INTENT(IN)  :: index
+  INTEGER(HID_T) , INTENT(OUT) :: ds_id
+  INTEGER, INTENT(OUT)         :: hdferr
+
+!*****
+  INTERFACE
+     INTEGER(HID_T) FUNCTION h5pget_virtual_srcspace(dcpl_id, index) BIND(C,NAME='H5Pget_virtual_srcspace')
+       IMPORT :: HID_T, SIZE_T
+         IMPLICIT NONE
+       INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: index
+     END FUNCTION h5pget_virtual_srcspace
+  END INTERFACE
+  
+  ds_id = h5pget_virtual_srcspace(dcpl_id, index)
+
+  hdferr = 0
+  IF(ds_id.LT.0) hdferr = -1
+
+END SUBROUTINE h5pget_virtual_srcspace_f
+
+!****s* 
+! NAME
+!  h5pget_virtual_filename_f
+!
+! PURPOSE
+!  Gets the filename of a source dataset used in the mapping.
+!
+! INPUTS
+!  dcpl_id - The identifier of the virtual dataset creation property list.
+!  index   - Mapping index.
+!            The value of index is 0 (zero) or greater and less than count (0 ≤ index < count), 
+!            where count is the number of mappings returned by h5pget_virtual_count.
+!  
+! OUTPUTS
+!   name   - A buffer containing the name of the file containing the source dataset.
+!   hdferr - Returns 0 if successful and -1 if fails.
+!
+! Optional parameters:
+!  name_len - The size of name needed to hold the filename. (OUT)
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!  Nov 2, 2015
+!
+! HISTORY
+!
+! SOURCE
+SUBROUTINE h5pget_virtual_filename_f(dcpl_id, index, name, hdferr, name_len)
+
+  IMPLICIT NONE
+  INTEGER(HID_T)  , INTENT(IN)  :: dcpl_id
+  INTEGER(SIZE_T) , INTENT(IN)  :: index
+  CHARACTER(LEN=*), INTENT(OUT) :: name
+  INTEGER, INTENT(OUT)          :: hdferr
+  INTEGER(SIZE_T), OPTIONAL     :: name_len
+!*****
+
+  CHARACTER(LEN=1,KIND=C_CHAR), DIMENSION(1:LEN(name)+1), TARGET :: c_name
+  TYPE(C_PTR) :: f_ptr
+  
+  INTERFACE
+     INTEGER(SIZE_T) FUNCTION h5pget_virtual_filename(dcpl_id, index, name, size) BIND(C, NAME='H5Pget_virtual_filename')
+       IMPORT :: HID_T, SIZE_T, C_PTR, C_CHAR
+         IMPLICIT NONE
+       INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: index
+       TYPE(C_PTR), VALUE :: name
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: size
+     END FUNCTION h5pget_virtual_filename
+  END INTERFACE
+
+  hdferr = 0
+  IF(PRESENT(name_len))THEN
+     name_len = INT(h5pget_virtual_filename(dcpl_id, index, C_NULL_PTR, 0_SIZE_T), SIZE_T)
+     IF(name_len.LT.0) hdferr = -1
+  ELSE
+     f_ptr = C_LOC(c_name(1)(1:1))
+
+     IF(INT(h5pget_virtual_filename(dcpl_id, index, f_ptr, INT(LEN(name)+1,SIZE_T)), SIZE_T).LT.0)THEN
+        hdferr = -1
+     ELSE
+        CALL HD5c2fstring(name,c_name,LEN(name))
+     ENDIF
+
+  ENDIF
+
+
+END SUBROUTINE h5pget_virtual_filename_f
+
+!****s*
+! NAME
+!  h5pget_virtual_dsetname_f
+!
+! PURPOSE
+!  Gets the name of a source dataset used in the mapping.
+!
+! INPUTS
+!  dcpl_id - The identifier of the virtual dataset creation property list.
+!  index   - Mapping index.
+!            The value of index is 0 (zero) or greater and less than count (0 ≤ index < count), 
+!            where count is the number of mappings returned by h5pget_virtual_count.
+!  
+! OUTPUTS
+!   name   - A buffer containing the name of the source dataset.
+!   hdferr - Returns 0 if successful and -1 if fails.
+!
+! Optional parameters:
+!  name_len - The size of name needed to hold the source dataset name. (OUT)
+!
+! AUTHOR
+!   M. Scot Breitenfeld
+!   January 28, 2016
+!
+! HISTORY
+!
+! SOURCE
+SUBROUTINE h5pget_virtual_dsetname_f(dcpl_id, index, name, hdferr, name_len)
+
+  IMPLICIT NONE
+  INTEGER(HID_T)  , INTENT(IN)  :: dcpl_id
+  INTEGER(SIZE_T) , INTENT(IN)  :: index
+  CHARACTER(LEN=*), INTENT(OUT) :: name
+  INTEGER, INTENT(OUT)          :: hdferr
+  INTEGER(SIZE_T), OPTIONAL     :: name_len
+!*****
+
+  CHARACTER(LEN=1,KIND=C_CHAR), DIMENSION(1:LEN(name)+1), TARGET :: c_name
+  TYPE(C_PTR) :: f_ptr
+  
+  INTERFACE
+     INTEGER(SIZE_T) FUNCTION h5pget_virtual_dsetname(dcpl_id, index, name, size) BIND(C, NAME='H5Pget_virtual_dsetname')
+       IMPORT :: HID_T, SIZE_T, C_PTR, C_CHAR
+         IMPLICIT NONE
+       INTEGER(HID_T) , INTENT(IN), VALUE :: dcpl_id
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: index
+       TYPE(C_PTR), VALUE :: name
+       INTEGER(SIZE_T), INTENT(IN), VALUE :: size
+     END FUNCTION h5pget_virtual_dsetname
+  END INTERFACE
+
+  hdferr = 0
+  IF(PRESENT(name_len))THEN
+     name_len = INT(h5pget_virtual_dsetname(dcpl_id, index, C_NULL_PTR, 0_SIZE_T), SIZE_T)
+     IF(name_len.LT.0) hdferr = -1
+  ELSE
+     f_ptr = C_LOC(c_name(1)(1:1))
+
+     IF(INT(h5pget_virtual_dsetname(dcpl_id, index, f_ptr, INT(LEN(name)+1,SIZE_T)), SIZE_T).LT.0)THEN
+        hdferr = -1
+     ELSE
+        CALL HD5c2fstring(name,c_name,LEN(name))
+     ENDIF
+
+  ENDIF
+
+END SUBROUTINE h5pget_virtual_dsetname_f
+
 END MODULE H5P
 
 
diff --git a/fortran/src/H5Rff.F90 b/fortran/src/H5Rff.F90
index a90bd9a..7ba91c4 100644
--- a/fortran/src/H5Rff.F90
+++ b/fortran/src/H5Rff.F90
@@ -4,7 +4,7 @@
 !  MODULE H5R
 !
 ! FILE
-!  fortran/src/H5Rff.f90
+!  fortran/src/H5Rff.F90
 !
 ! PURPOSE
 !  This file contains Fortran interfaces for H5R functions.
diff --git a/fortran/src/H5Sff.F90 b/fortran/src/H5Sff.F90
index fd4226c..e9b9b73 100644
--- a/fortran/src/H5Sff.F90
+++ b/fortran/src/H5Sff.F90
@@ -4,7 +4,7 @@
 !  MODULE H5S
 !
 ! FILE
-!  fortran/src/H5Sff.f90
+!  fortran/src/H5Sff.F90
 !
 ! PURPOSE
 !  This file contains Fortran interfaces for H5S functions.
@@ -41,7 +41,7 @@
 !*****
 
 MODULE H5S
-  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_INT
   USE H5GLOBAL
 
 CONTAINS
@@ -1751,4 +1751,118 @@ CONTAINS
 
   END SUBROUTINE h5sextent_equal_f
 
+!
+!****s* H5S/h5sget_regular_hyperslab_f
+!
+! NAME
+!  h5sget_regular_hyperslab_f
+!
+! PURPOSE
+!  Retrieves a regular hyperslab selection.
+!
+! INPUTS
+!  space_id - The identifier of the dataspace.
+! OUTPUTS
+!  start    - Offset of the start of the regular hyperslab.
+!  stride   - Stride of the regular hyperslab.
+!  count    - Number of blocks in the regular hyperslab.
+!  block    - Size of a block in the regular hyperslab.
+!  hdferr   - Returns 0 if successful and -1 if fails.
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!  January, 28 2016
+! SOURCE
+  SUBROUTINE h5sget_regular_hyperslab_f(space_id, start, stride, count, block, hdferr)
+    
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) ::  space_id
+    INTEGER(HSIZE_T), INTENT(OUT), DIMENSION(*), TARGET ::  start
+    INTEGER(HSIZE_T), INTENT(OUT), DIMENSION(*), TARGET ::  stride
+    INTEGER(HSIZE_T), INTENT(OUT), DIMENSION(*), TARGET ::  count
+    INTEGER(HSIZE_T), INTENT(OUT), DIMENSION(*), TARGET ::  block
+    INTEGER, INTENT(OUT) :: hdferr
+!*****
+    TYPE(C_PTR) :: start_c, stride_c, count_c, block_c
+    INTEGER(C_INT) :: n
+    
+    INTERFACE
+       INTEGER FUNCTION h5sget_regular_hyperslab(space_id, start, stride, count, block) BIND(C,NAME='H5Sget_regular_hyperslab')
+         IMPORT :: HID_T, C_PTR
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: space_id
+         TYPE(C_PTR), VALUE :: start, stride, count, block
+       END FUNCTION h5sget_regular_hyperslab
+    END INTERFACE
+
+    hdferr = 0
+
+    start_c = C_LOC(start(1))
+    stride_c = C_LOC(stride(1))
+    count_c = C_LOC(count(1))
+    block_c = C_LOC(block(1))
+
+    IF(INT(h5sget_regular_hyperslab(space_id, start_c, stride_c, count_c, block_c)).LT.0) hdferr = -1
+
+    ! Reverse the C arrays description values of the hyperslab because 
+    ! the hyperslab was for a C stored hyperslab
+
+    CALL H5Sget_simple_extent_ndims_f(space_id,n,hdferr)
+    IF(hdferr.LT.0.OR.n.EQ.0)THEN
+       hdferr=-1
+    ELSE
+       start(1:n)  = start(n:1:-1)
+       stride(1:n) = stride(n:1:-1)
+       count(1:n)  = count(n:1:-1)
+       block(1:n)  = block(n:1:-1)
+    ENDIF
+
+  END SUBROUTINE h5sget_regular_hyperslab_f
+
+!****s* H5S/h5sis_regular_hyperslab_f
+!
+! NAME
+!  h5sis_regular_hyperslab_f
+!
+! PURPOSE
+!  Retrieves a regular hyperslab selection.
+!
+! INPUTS
+!  space_id  - The identifier of the dataspace.
+! OUTPUTS
+!  IsRegular - TRUE or FALSE for hyperslab selection if successful.
+!  hdferr    - Returns 0 if successful and -1 if fails.
+!
+! AUTHOR
+!  M. Scot Breitenfeld
+!  January, 28 2016
+! SOURCE
+  SUBROUTINE h5sis_regular_hyperslab_f(space_id, IsRegular, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) ::  space_id
+    LOGICAL :: IsRegular
+    INTEGER, INTENT(OUT) :: hdferr
+!*****
+    INTEGER(C_INT) :: status 
+    
+    INTERFACE
+       INTEGER(C_INT) FUNCTION H5Sis_regular_hyperslab(space_id) BIND(C,NAME='H5Sis_regular_hyperslab')
+         IMPORT :: HID_T, C_INT
+         IMPLICIT NONE
+         INTEGER(HID_T), INTENT(IN), VALUE :: space_id
+       END FUNCTION H5Sis_regular_hyperslab
+    END INTERFACE
+
+    status = H5Sis_regular_hyperslab(space_id)
+
+    hdferr = 0
+    IsRegular = .FALSE.
+    IF(status.GT.0)THEN
+       IsRegular = .TRUE.
+    ELSE IF(status.LT.0)THEN
+       hdferr = -1
+    ENDIF
+
+  END SUBROUTINE H5Sis_regular_hyperslab_f
+
 END MODULE H5S
diff --git a/fortran/src/H5_buildiface.F90 b/fortran/src/H5_buildiface.F90
index 9a42cbf..471052f 100644
--- a/fortran/src/H5_buildiface.F90
+++ b/fortran/src/H5_buildiface.F90
@@ -4,7 +4,7 @@
 !  Executable: H5_buildiface
 !
 ! FILE
-!  fortran/src/H5_buildiface.f90
+!  fortran/src/H5_buildiface.F90
 !
 ! PURPOSE
 !  This stand alone program is used at build time to generate the module
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index f3bc42f..d7b952d 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -476,6 +476,10 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
     h5d_flags[22] = (int_f)H5D_MPIO_CHUNK_COLLECTIVE;
     h5d_flags[23] = (int_f)H5D_MPIO_CHUNK_MIXED;
     h5d_flags[24] = (int_f)H5D_MPIO_CONTIGUOUS_COLLECTIVE;
+    h5d_flags[25] = (int_f)H5D_VDS_ERROR;
+    h5d_flags[26] = (int_f)H5D_VDS_FIRST_MISSING;
+    h5d_flags[27] = (int_f)H5D_VDS_LAST_AVAILABLE;
+    h5d_flags[28] = (int_f)H5D_VIRTUAL;
 
 /*
  *  H5E flags
diff --git a/fortran/src/H5f90.h b/fortran/src/H5f90.h
index c45cfcb..7082d1d 100644
--- a/fortran/src/H5f90.h
+++ b/fortran/src/H5f90.h
@@ -22,7 +22,7 @@
 #include "H5f90i.h"
 #include "H5f90proto.h"
 
-/* Constants used in H5Rff.f90 and H5Rf.c files */
+/* Constants used in H5Rff.F90 and H5Rf.c files */
 #define REF_REG_BUF_LEN_F    3
 
 /* Constants used in H5Gf.c files */
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 947eff4..ac59251 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -4,7 +4,7 @@
 !  MODULE H5GLOBAL
 !
 ! FILE
-!  src/fortran/H5f90global.f90
+!  src/fortran/H5f90global.F90
 !
 ! PURPOSE
 !  This module is used to pass C stubs for H5 Fortran APIs. The C stubs are
@@ -46,12 +46,19 @@ MODULE H5GLOBAL
 
   IMPLICIT NONE
 
+  ! Enumerate data type that is interoperable with C.
+  ENUM, BIND(C)
+    ENUMERATOR :: enum_dtype
+  END ENUM
+  INTEGER, PARAMETER :: ENUM_T = KIND(enum_dtype)
+  
+
   ! Definitions for reference datatypes.
   ! If you change the value of these parameters, do not forget to change corresponding
   ! values in the H5f90.h file.
   INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
 
-  ! Parameters used in the function 'h5kind_to_type' located in H5_ff.f90.
+  ! Parameters used in the function 'h5kind_to_type' located in H5_ff.F90.
   ! The flag is used to tell the function whether the kind input variable
   ! is for a REAL or INTEGER data type.
 
@@ -366,11 +373,11 @@ MODULE H5GLOBAL
   EQUIVALENCE(H5G_flags(10), H5G_STORAGE_TYPE_SYMBOL_TABLE_F)
   EQUIVALENCE(H5G_flags(11), H5G_STORAGE_TYPE_COMPACT_F)
   EQUIVALENCE(H5G_flags(12), H5G_STORAGE_TYPE_DENSE_F)
+
   !
   ! H5D flags declaration
   !
-
-  INTEGER, PARAMETER :: H5D_FLAGS_LEN = 25
+  INTEGER, PARAMETER :: H5D_FLAGS_LEN = 29
   INTEGER :: H5D_flags(H5D_FLAGS_LEN)
   INTEGER, PARAMETER :: H5D_SIZE_FLAGS_LEN = 2
   INTEGER(SIZE_T) :: H5D_size_flags(H5D_SIZE_FLAGS_LEN)
@@ -418,6 +425,10 @@ MODULE H5GLOBAL
   INTEGER :: H5D_MPIO_CHUNK_COLLECTIVE_F
   INTEGER :: H5D_MPIO_CHUNK_MIXED_F
   INTEGER :: H5D_MPIO_CONTIG_COLLECTIVE_F
+  INTEGER :: H5D_VDS_ERROR_F
+  INTEGER :: H5D_VDS_FIRST_MISSING_F
+  INTEGER :: H5D_VDS_LAST_AVAILABLE_F
+  INTEGER :: H5D_VIRTUAL_F
 
   EQUIVALENCE(H5D_flags(1), H5D_COMPACT_F)
   EQUIVALENCE(H5D_flags(2), H5D_CONTIGUOUS_F)
@@ -449,6 +460,10 @@ MODULE H5GLOBAL
   EQUIVALENCE(H5D_flags(23), H5D_MPIO_CHUNK_COLLECTIVE_F)
   EQUIVALENCE(H5D_flags(24), H5D_MPIO_CHUNK_MIXED_F)
   EQUIVALENCE(H5D_flags(25), H5D_MPIO_CONTIG_COLLECTIVE_F)
+  EQUIVALENCE(H5D_flags(26), H5D_VDS_ERROR_F)
+  EQUIVALENCE(H5D_flags(27), H5D_VDS_FIRST_MISSING_F)
+  EQUIVALENCE(H5D_flags(28), H5D_VDS_LAST_AVAILABLE_F)
+  EQUIVALENCE(H5D_flags(29), H5D_VIRTUAL_F)
 
   EQUIVALENCE(H5D_size_flags(1), H5D_CHUNK_CACHE_NSLOTS_DFLT_F)
   EQUIVALENCE(H5D_size_flags(2), H5D_CHUNK_CACHE_NBYTES_DFLT_F)
diff --git a/fortran/src/H5fortkit.F90 b/fortran/src/H5fortkit.F90
new file mode 100644
index 0000000..9afd890
--- /dev/null
+++ b/fortran/src/H5fortkit.F90
@@ -0,0 +1,58 @@
+!****h* H5fortkit/H5fortkit
+! PURPOSE
+!  Routines to deal with C-FORTRAN issues.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!   Copyright by The HDF Group.                                               *
+!   Copyright by the Board of Trustees of the University of Illinois.         *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
+!   of the source code distribution tree; Copyright.html can be found at the  *
+!   root level of an installed copy of the electronic HDF5 document set and   *
+!   is linked from the top-level documents page.  It can also be found at     *
+!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+!   access to either file, you may request a copy from help@hdfgroup.org.     *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
+MODULE H5fortkit
+
+CONTAINS
+
+!****if* H5fortkit/HD5c2fstring
+! NAME
+!  HD5c2fstring
+! INPUTS
+!  cstring  -  C string stored as a string array of size 'len' of string size LEN=1
+!  len      -  length of Fortran string
+! OUTPUT
+!   fstring -  Fortran string array of LEN=1
+! PURPOSE
+!   Copies a Fortran array of strings having a length of one to a fortran string and removes the C Null
+!   terminator. The Null terminator is returned from C when calling the C APIs directly.
+!
+!   The fortran standard does not allow C_LOC to be used on a character string of
+!   length greater than one, which is why we use the array of characters instead.
+!
+! SOURCE
+  SUBROUTINE HD5c2fstring(fstring,cstring,len)
+!*****
+    IMPLICIT NONE
+
+    INTEGER :: i
+    INTEGER :: len
+    CHARACTER(LEN=len) :: fstring
+    CHARACTER(LEN=1), DIMENSION(1:len) :: cstring 
+    
+    fstring = ''
+    DO i = 1, len
+       IF (cstring(i)(1:1)==CHAR(0)) EXIT
+       fstring(i:i) = cstring(i)(1:1)
+    END DO
+
+  END SUBROUTINE HD5c2fstring
+
+END MODULE H5fortkit
diff --git a/fortran/src/HDF5.F90 b/fortran/src/HDF5.F90
index 64f5be6..cbe4c83 100644
--- a/fortran/src/HDF5.F90
+++ b/fortran/src/HDF5.F90
@@ -4,7 +4,7 @@
 !  MODULE HDF5
 !
 ! FILE
-!  src/fortran/src/HDF5.f90
+!  src/fortran/src/HDF5.F90
 !
 ! PURPOSE
 !  This is the main module used for linking to the Fortran HDF library.
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index eb45f60..f4d192b 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -46,9 +46,9 @@ endif
 libhdf5_fortran_la_SOURCES=H5f90global.F90 \
           H5fortran_types.F90 H5_ff.F90 H5Aff.F90 H5Dff.F90 H5Eff.F90    \
           H5Fff.F90 H5Gff.F90 H5Iff.F90 H5Lff.F90 H5Off.F90 H5Pff.F90 H5Rff.F90 H5Sff.F90    \
-          H5Tff.F90 H5Zff.F90 H5_gen.f90 \
+          H5Tff.F90 H5Zff.F90 H5_gen.F90 H5fortkit.F90 \
           H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c           \
-          H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.f90
+          H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.F90
 
 # HDF5 Fortran library depends on HDF5 Library. 
 libhdf5_fortran_la_LIBADD=$(LIBHDF5)
@@ -153,7 +153,7 @@ H5Gff.lo:            $(srcdir)/H5Gff.F90 H5f90global.lo
 H5Iff.lo:            $(srcdir)/H5Iff.F90 H5f90global.lo
 H5Lff.lo:            $(srcdir)/H5Lff.F90 H5f90global.lo
 H5Off.lo:            $(srcdir)/H5Off.F90 H5f90global.lo
-H5Pff.lo:            $(srcdir)/H5Pff.F90 H5f90global.lo
+H5Pff.lo:            $(srcdir)/H5Pff.F90 H5f90global.lo H5fortkit.lo
 H5Rff.lo:            $(srcdir)/H5Rff.F90 H5f90global.lo
 H5Sff.lo:            $(srcdir)/H5Sff.F90 H5f90global.lo
 H5Tff.lo:            $(srcdir)/H5Tff.F90 H5f90global.lo
diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in
index 1333262..42b5642 100644
--- a/fortran/src/hdf5_fortrandll.def.in
+++ b/fortran/src/hdf5_fortrandll.def.in
@@ -318,6 +318,16 @@ H5P_mp_H5PREGISTER_PTR
 H5P_mp_H5PINSERT_PTR
 H5P_mp_H5PGET_FILE_IMAGE_F
 H5P_mp_H5PSET_FILE_IMAGE_F
+H5P_mp_H5PSET_VIRTUAL_VIEW_F
+H5P_mp_H5PGET_VIRTUAL_VIEW_F
+H5P_mp_H5PSET_VIRTUAL_PRINTF_GAP_F
+H5P_mp_H5PGET_VIRTUAL_PRINTF_GAP_F
+H5P_mp_H5PSET_VIRTUAL_F
+H5P_mp_H5PGET_VIRTUAL_COUNT_F
+H5P_mp_H5PGET_VIRTUAL_VSPACE_F
+H5P_mp_H5PGET_VIRTUAL_SRCSPACE_F
+H5P_mp_H5PGET_VIRTUAL_FILENAME_F
+H5P_mp_H5PGET_VIRTUAL_DSETNAME_F
 ; Parallel
 @H5_NOPAREXP@H5P_mp_H5PSET_FAPL_MPIO_F
 @H5_NOPAREXP@H5P_mp_H5PGET_FAPL_MPIO_F
@@ -367,6 +377,8 @@ H5S_mp_H5SGET_SELECT_TYPE_F
 H5S_mp_H5SDECODE_F
 H5S_mp_H5SENCODE_F
 H5S_mp_H5SEXTENT_EQUAL_F
+H5S_mp_H5SGET_REGULAR_HYPERSLAB_F
+H5S_mp_H5SIS_REGULAR_HYPERSLAB_F
 ; H5T
 H5T_mp_H5TOPEN_F
 H5T_mp_H5TCOMMIT_F
diff --git a/fortran/test/fortranlib_test_F03.F90 b/fortran/test/fortranlib_test_F03.F90
index 5b386b9..070cd73 100644
--- a/fortran/test/fortranlib_test_F03.F90
+++ b/fortran/test/fortranlib_test_F03.F90
@@ -174,6 +174,14 @@ PROGRAM fortranlibtest_F03
   CALL test_get_file_image(ret_total_error)
   CALL write_test_status(ret_total_error, ' Testing get file image ', total_error)
 
+!     write(*,*)
+!     write(*,*) '========================================='
+!     write(*,*) 'Testing VDS                              '
+!     write(*,*) '========================================='
+
+  ret_total_error = 0
+  CALL test_vds(ret_total_error)
+  CALL write_test_status(ret_total_error, ' Testing vds ', total_error)
 
   WRITE(*,*)
 
diff --git a/fortran/test/tH5P_F03.F90 b/fortran/test/tH5P_F03.F90
index 8982fc2..3cafdcb 100644
--- a/fortran/test/tH5P_F03.F90
+++ b/fortran/test/tH5P_F03.F90
@@ -617,4 +617,476 @@ SUBROUTINE external_test_offset(cleanup,total_error)
   CALL check("h5_cleanup_f", error, total_error)
 
 END SUBROUTINE external_test_offset
+
+!****h* root/fortran/test/tH5P_F03.f90
+!
+! NAME
+!  test_vds
+!
+! FUNCTION
+!  Tests VDS API wrappers
+!
+! RETURNS:
+!   Success:	0
+!   Failure:	number of errors
+!
+! FORTRAN Programmer:  M. Scot Breitenfeld
+!                      February 1, 2016
+!
+!-------------------------------------------------------------------------
+!
+SUBROUTINE test_vds(total_error)
+
+  USE ISO_C_BINDING
+  IMPLICIT NONE
+
+  INTEGER, INTENT(INOUT) :: total_error
+
+  INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(9)   !should map to INTEGER*4 on most modern processors
+  INTEGER, PARAMETER :: int_kind_16 = SELECTED_INT_KIND(18) !should map to INTEGER*8 on most modern processors
+
+  CHARACTER(LEN=6), PARAMETER ::  VFILENAME="vds.h5"
+  CHARACTER(LEN=3), PARAMETER :: DATASET="VDS"
+  INTEGER :: VDSDIM0
+  INTEGER, PARAMETER :: VDSDIM1 = 10
+  INTEGER, PARAMETER :: VDSDIM2 = 15 
+
+  INTEGER :: DIM0
+  INTEGER, PARAMETER :: DIM0_1= 4  ! Initial size of the source datasets
+  INTEGER, PARAMETER :: DIM1 = 10 
+  INTEGER, PARAMETER :: DIM2 = 15 
+  INTEGER, PARAMETER :: RANK =  3
+  INTEGER(hsize_t), PARAMETER :: PLANE_STRIDE = 4
+
+  CHARACTER(LEN=4), DIMENSION(1:PLANE_STRIDE) :: SRC_FILE = (/"a.h5","b.h5","c.h5","d.h5"/)
+  CHARACTER(LEN=3), DIMENSION(1:PLANE_STRIDE) :: SRC_DATASET = (/"AAA","BBB","CCC","DDD"/)
+
+
+  INTEGER(hid_t) :: vfile, file, src_space, mem_space, vspace, vdset, dset !Handles
+  INTEGER(hid_t) :: dcpl, dapl
+  INTEGER ::       status, error
+  INTEGER(hsize_t), DIMENSION(1:3) :: vdsdims = (/4*DIM0_1, VDSDIM1, VDSDIM2/), &
+                 vdsdims_max, &
+                 dims = (/DIM0_1, DIM1, DIM2/), &
+                 memdims = (/DIM0_1, DIM1, DIM2/), &
+                 extdims = (/0, DIM1, DIM2/), & ! Dimensions of the extended source datasets
+                 chunk_dims = (/DIM0_1, DIM1, DIM2/), &
+                 dims_max, &
+                 vdsdims_out, vdsdims_max_out, &
+                 start, &                   ! Hyperslab parameters
+                 stride, &
+                 count, &
+                 src_count, block
+  INTEGER(hsize_t), DIMENSION(1:2,1:3) :: vdsdims_out_correct
+
+  INTEGER(hsize_t), DIMENSION(1:3) :: start_out, &  !Hyperslab PARAMETER out 
+                 stride_out, count_out, count_correct, block_out
+  INTEGER(hsize_t), DIMENSION(1:3,1:PLANE_STRIDE) :: start_correct
+
+  INTEGER :: i, j
+  INTEGER :: layout                     ! Storage layout
+  INTEGER(size_t) :: num_map            ! Number of mappings 
+  INTEGER(size_t) :: len                ! Length of the string also a RETURN value 
+  CHARACTER(LEN=180) :: filename
+  ! Different sized character buffers
+  CHARACTER(len=LEN(SRC_FILE(1))-3)  :: SRC_FILE_LEN_TINY
+  CHARACTER(len=LEN(SRC_FILE(1))-1)  :: SRC_FILE_LEN_SMALL
+  CHARACTER(len=LEN(SRC_FILE(1)))    :: SRC_FILE_LEN_EXACT
+  CHARACTER(len=LEN(SRC_FILE(1))+1)  :: SRC_FILE_LEN_LARGE
+  CHARACTER(len=LEN(SRC_FILE(1))+10) :: SRC_FILE_LEN_HUGE
+  CHARACTER(len=LEN(SRC_DATASET(1))) :: SRC_DATASET_LEN_EXACT
+
+  INTEGER(HID_T) :: space_out 
+
+  INTEGER :: s_type, virtual_view
+  INTEGER :: type1, type2
+
+  CHARACTER(LEN=180) :: dsetname
+  INTEGER, DIMENSION(DIM0_1*DIM1*DIM2), TARGET :: wdata
+  TYPE(C_PTR) :: f_ptr
+  INTEGER(SIZE_T) :: nsize
+  LOGICAL :: IsRegular
+  INTEGER(HSIZE_T) :: gap_size 
+
+  ! For testing against
+  vdsdims_out_correct(1,1) = DIM0_1*5
+  vdsdims_out_correct(2,1) = DIM0_1*8
+  vdsdims_out_correct(1:2,2) = VDSDIM1 
+  vdsdims_out_correct(1:2,3) = VDSDIM2 
+
+  VDSDIM0 = H5S_UNLIMITED_F
+  DIM0 = H5S_UNLIMITED_F
+  vdsdims_max = (/VDSDIM0, VDSDIM1, VDSDIM2/)
+  dims_max = (/DIM0, DIM1, DIM2/)
+
+  !
+  ! Create source files and datasets. 
+  !
+  DO i = 1, PLANE_STRIDE
+     !
+     ! Initialize data for i-th source dataset.
+     DO j = 1, DIM0_1*DIM1*DIM2
+        wdata(j) = i
+     ENDDO
+     !
+     ! Create the source files and  datasets. Write data to each dataset and 
+     ! close all resources.
+     CALL h5fcreate_f(SRC_FILE(i), H5F_ACC_TRUNC_F, file, status)
+     CALL check("h5fcreate_f", error, total_error)
+
+     CALL h5screate_simple_f(RANK, dims,  src_space, error, dims_max)
+     CALL check("h5screate_simple_f", error, total_error)
+     CALL h5pcreate_f(H5P_DATASET_CREATE_F, dcpl, error)
+     CALL check("h5pcreate_f", error, total_error)
+     CALL h5pset_chunk_f(dcpl, RANK, chunk_dims, error)
+     CALL check("h5pset_chunk_f",error, total_error)
+     
+     CALL h5dcreate_f(file, SRC_DATASET(i), H5T_NATIVE_INTEGER, src_space, dset, error, dcpl, H5P_DEFAULT_F, H5P_DEFAULT_F)
+     CALL check("h5dcreate_f",error, total_error)
+     f_ptr = C_LOC(wdata(1))
+     CALL H5Dwrite_f(dset, H5T_NATIVE_INTEGER, f_ptr, error)
+     CALL check("H5Dwrite_f",error, total_error)
+     CALL H5Sclose_f(src_space, error)
+     CALL check("H5Sclose_f",error, total_error)
+     CALL H5Pclose_f(dcpl, error)
+     CALL check("H5Pclose_f",error, total_error)
+     CALL H5Dclose_f(dset, error)
+     CALL check("H5Dclose_f",error, total_error)
+     CALL H5Fclose_f(file, error)
+     CALL check("H5Fclose_f",error, total_error)
+  ENDDO
+
+  CALL h5fcreate_f(VFILENAME, H5F_ACC_TRUNC_F, vfile, error)
+  CALL check("h5fcreate_f", error, total_error)
+
+  ! Create VDS dataspace.
+  CALL H5Screate_simple_f(RANK, vdsdims, vspace, error, vdsdims_max)
+  CALL check("H5Screate_simple_f", error, total_error)
+
+  ! Create dataspaces for the source dataset.
+  CALL H5Screate_simple_f(RANK, dims, src_space, error, dims_max)
+  CALL check("H5Screate_simple_f", error, total_error)
+  
+  ! Create VDS creation property
+  CALL H5Pcreate_f (H5P_DATASET_CREATE_F, dcpl, error)
+  CALL check("H5Pcreate_f", error, total_error)
+     
+  ! Initialize hyperslab values 
+  start(1:3) = 0
+  stride(1:3) = (/PLANE_STRIDE,1_hsize_t,1_hsize_t/) ! we will select every fifth plane in VDS 
+  count(1:3) = (/H5S_UNLIMITED_F,1_hsize_t,1_hsize_t/)
+  src_count(1:3) = (/H5S_UNLIMITED_F,1_hsize_t,1_hsize_t/)
+  block(1:3) = (/1, DIM1, DIM2/)
+  
+  ! 
+  ! Build the mappings 
+  !
+  start_correct = 0
+  CALL H5Sselect_hyperslab_f(src_space, H5S_SELECT_SET_F, start, src_count, error, block=block)
+  CALL check("H5Sselect_hyperslab_f", error, total_error)
+  DO i = 1, PLANE_STRIDE
+     start_correct(1,i) = start(1)
+     CALL H5Sselect_hyperslab_f(vspace, H5S_SELECT_SET_F, start, count, error, stride=stride, block=block)
+     CALL check("H5Sselect_hyperslab_f", error, total_error)
+
+     IF(i.eq.1)THEN ! check src_file and src_dataset with trailing blanks
+        CALL H5Pset_virtual_f (dcpl, vspace, SRC_FILE(i)//"   ", SRC_DATASET(i)//"   ", src_space, error)
+     ELSE
+        CALL H5Pset_virtual_f (dcpl, vspace, SRC_FILE(i), SRC_DATASET(i), src_space, error)
+     ENDIF
+     CALL check("H5Pset_virtual_f", error, total_error)
+     start(1) = start(1) + 1
+  ENDDO
+
+  CALL H5Sselect_none_f(vspace, error) 
+  CALL check("H5Sselect_none_f", error, total_error)
+
+  ! Create a virtual dataset 
+  CALL H5Dcreate_f(vfile, DATASET, H5T_NATIVE_INTEGER, vspace, vdset, error, dcpl, H5P_DEFAULT_F, H5P_DEFAULT_F)
+  CALL check("H5Dcreate_f", error, total_error)
+  CALL H5Sclose_f(vspace, error)
+  CALL check("H5Sclose_f", error, total_error)
+  CALL H5Sclose_f(src_space, error)
+  CALL check("H5Sclose_f", error, total_error)
+  CALL H5Pclose_f(dcpl, error)
+  CALL check("H5Pclose_f", error, total_error)
+
+  ! Let's add data to the source datasets and check new dimensions for VDS 
+  ! We will add only one plane to the first source dataset, two planes to the
+  ! second one, three to the third, and four to the forth.                 
+
+  DO i = 1, PLANE_STRIDE
+     !
+     ! Initialize data for i-th source dataset.
+     DO j = 1, i*DIM1*DIM2
+        wdata(j) = 10*i
+     ENDDO
+
+     !
+     ! Open the source files and datasets. Append data to each dataset and 
+     ! close all resources.
+     CALL H5Fopen_f (SRC_FILE(i), H5F_ACC_RDWR_F, file, error)
+     CALL check("H5Fopen_f", error, total_error)
+     CALL H5Dopen_f (file, SRC_DATASET(i), dset, error)
+     CALL check("H5Dopen_f", error, total_error)
+     extdims(1) = DIM0_1+i
+     CALL H5Dset_extent_f(dset, extdims, error)  
+     CALL check("H5Dset_extent_f", error, total_error)     
+     CALL H5Dget_space_f(dset, src_space, error)
+     CALL check("H5Dget_space_f", error, total_error)
+
+     start(1:3) = (/DIM0_1,0,0/)
+     count(1:3) = 1
+     block(1:3) = (/i, DIM1, DIM2/)
+
+     memdims(1) = i
+
+     CALL H5Screate_simple_f(RANK, memdims, mem_space, error) 
+     CALL check("H5Screate_simple_f", error, total_error)
+
+     CALL H5Sselect_hyperslab_f(src_space, H5S_SELECT_SET_F, start,count, error,block=block) 
+     CALL check("H5Sselect_hyperslab_f", error, total_error)
+     f_ptr = C_LOC(wdata(1))
+     CALL H5Dwrite_f(dset, H5T_NATIVE_INTEGER, f_ptr, error, mem_space, src_space, H5P_DEFAULT_F) 
+     CALL check("H5Dwrite_f", error, total_error)
+     CALL H5Sclose_f(src_space, error)
+     CALL check("H5Sclose_f", error, total_error)
+     call H5Dclose_f(dset, error)
+     CALL check("H5Dclose_f", error, total_error)
+     call H5Fclose_f(file, error)
+     CALL check("H5Fclose_f", error, total_error)
+  ENDDO
+
+  call H5Dclose_f(vdset, error)
+  CALL check("H5Dclose_f", error, total_error)
+  call H5Fclose_f(vfile, error) 
+  CALL check("H5Fclose_f", error, total_error)
+   
+  !
+  ! begin the read section
+  !
+  ! Open file and dataset using the default properties.
+  CALL H5Fopen_f(VFILENAME, H5F_ACC_RDONLY_F, vfile, error)
+  CALL check("H5Fopen_f", error, total_error) 
+    
+  ! 
+  ! Open VDS using different access properties to use max or
+  ! min extents depending on the sizes of the underlying datasets
+  CALL H5Pcreate_f(H5P_DATASET_ACCESS_F, dapl, error)
+  CALL check("H5Pcreate_f", error, total_error) 
+
+  DO i = 1, 2
+
+     IF(i.NE.1)THEN
+        CALL H5Pset_virtual_view_f(dapl, H5D_VDS_LAST_AVAILABLE_F, error)
+        CALL check("H5Pset_virtual_view_f", error, total_error) 
+     ELSE
+        CALL H5Pset_virtual_view_f(dapl, H5D_VDS_FIRST_MISSING_F, error)
+        CALL check("H5Pset_virtual_view_f", error, total_error) 
+     ENDIF
+     
+     CALL H5Dopen_f(vfile, DATASET, vdset, error, dapl)
+     CALL check("H5Dopen_f", error, total_error) 
+
+     ! Let's get space of the VDS and its dimension we should get 32(or 20)x10x10
+     CALL H5Dget_space_f(vdset, vspace, error)
+     CALL check("H5Dget_space_f", error, total_error) 
+     CALL H5Sget_simple_extent_dims_f(vspace, vdsdims_out, vdsdims_max_out, error)
+     CALL check("H5Sget_simple_extent_dims_f", error, total_error)
+
+     ! check VDS dimensions
+     DO j = 1, RANK
+        IF(vdsdims_out(j).NE.vdsdims_out_correct(i,j))THEN
+           total_error = total_error + 1
+           EXIT 
+        ENDIF
+     ENDDO
+
+     CALL H5Pget_virtual_view_f(dapl, virtual_view, error)
+     CALL check("h5pget_virtual_view_f", error, total_error) 
+
+     IF(i.EQ.1)THEN
+        IF(virtual_view .NE. H5D_VDS_FIRST_MISSING_F)THEN
+           total_error = total_error + 1
+        ENDIF
+     ELSE
+        IF(virtual_view .NE. H5D_VDS_LAST_AVAILABLE_F)THEN
+           total_error = total_error + 1
+        ENDIF
+        
+     ENDIF
+
+     ! Close 
+     CALL H5Dclose_f(vdset, error)
+     CALL check("H5Dclose_f", error, total_error)
+     CALL H5Sclose_f(vspace, error)
+     CALL check("H5Sclose_f", error, total_error)
+  ENDDO
+
+  CALL H5Dopen_f(vfile, DATASET, vdset, error)
+  CALL check("H5Dopen_f", error, total_error)
+
+  !
+  ! Get creation property list and mapping properties.
+  !   
+  CALL H5Dget_create_plist_f (vdset, dcpl, error)
+  CALL check("H5Dget_create_plist_f", error, total_error)
+
+  !
+  ! Get storage layout.
+  CALL H5Pget_layout_f(dcpl, layout, error)
+  CALL check("H5Pget_layout_f", error, total_error)
+
+  IF (H5D_VIRTUAL_F .NE. layout) THEN
+     PRINT*,"Wrong layout found"
+     total_error = total_error + 1
+  ENDIF
+
+  !
+  ! Find number of mappings.
+      
+  CALL H5Pget_virtual_count_f(dcpl, num_map, error)
+  CALL check("H5Pget_virtual_count_f", error, total_error)
+
+  IF(num_map.NE.4_size_t)THEN
+     PRINT*,"Number of mappings is incorrect"
+     total_error = total_error + 1
+  ENDIF
+  ! 
+  ! Get mapping parameters for each mapping.
+  !
+  DO i = 1, num_map
+     CALL H5Pget_virtual_vspace_f(dcpl, INT(i-1,size_t), vspace, error)
+     CALL check("H5Pget_virtual_vspace_f", error, total_error)
+
+     CALL h5sget_select_type_f(vspace, s_type, error)
+     CALL check("h5sget_select_type_f", error, total_error)
+     IF(s_type.EQ.H5S_SEL_HYPERSLABS_F)THEN
+        CALL H5Sis_regular_hyperslab_f(vspace, IsRegular, error)
+        CALL check("H5Sis_regular_hyperslab_f", error, total_error)
+
+        IF(IsRegular)THEN
+           CALL H5Sget_regular_hyperslab_f(vspace, start_out, stride_out, count_out, block_out, error)
+           CALL check("H5Sget_regular_hyperslab_f", error, total_error)
+           DO j = 1, 3
+              IF(start_out(j).NE.start_correct(j,i) .OR. &
+                   stride_out(j).NE.stride(j).OR. &
+                   count_out(j).NE.src_count(j))THEN
+                 total_error = total_error + 1
+                 EXIT
+              ENDIF
+           ENDDO
+        ENDIF
+     END IF
+
+     ! Get source file name
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_EXACT, error, nsize)
+     CALL check("H5Pget_virtual_count_f", error, total_error)
+
+     IF(nsize.NE.LEN(SRC_FILE_LEN_EXACT))THEN
+        PRINT*,"virtual filenname size is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that is very small
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_TINY, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_TINY.NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_TINY)))THEN
+        PRINT*,"virtual filenname returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that small by one
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_SMALL, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_SMALL.NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_SMALL)))THEN
+        PRINT*,"virtual filenname returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that is exact
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_EXACT, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_EXACT.NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_EXACT)))THEN
+        PRINT*,"virtual filenname returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that bigger by one
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_LARGE, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_LARGE(1:LEN(SRC_FILE_LEN_EXACT)).NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_EXACT)).AND. &
+         SRC_FILE_LEN_LARGE(LEN(SRC_FILE_LEN_EXACT):).NE.'')THEN
+        PRINT*,"virtual filenname returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! check passing a buffer that is very big
+     CALL H5Pget_virtual_filename_f(dcpl, INT(i-1, size_t), SRC_FILE_LEN_HUGE, error)
+     CALL check("H5Pget_virtual_filename_f", error, total_error)
+     IF(SRC_FILE_LEN_HUGE(1:LEN(SRC_FILE_LEN_EXACT)).NE.SRC_FILE(i)(1:LEN(SRC_FILE_LEN_EXACT)).AND. &
+         SRC_FILE_LEN_HUGE(LEN(SRC_FILE_LEN_EXACT):).NE.'')THEN
+        PRINT*,"virtual filenname returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+     ! Get source dataset name
+     CALL H5Pget_virtual_dsetname_f(dcpl, INT(i-1, size_t), SRC_DATASET_LEN_EXACT, error, nsize)
+     CALL check("H5Pget_virtual_dsetname_f", error, total_error)
+
+     CALL H5Pget_virtual_dsetname_f(dcpl, INT(i-1, size_t), SRC_DATASET_LEN_EXACT, error)
+     CALL check("H5Pget_virtual_dsetname_f", error, total_error)
+     IF(SRC_DATASET_LEN_EXACT(1:LEN(SRC_DATASET_LEN_EXACT)).NE.SRC_DATASET(i)(1:LEN(SRC_DATASET_LEN_EXACT)).AND. &
+         SRC_DATASET_LEN_EXACT(LEN(SRC_DATASET_LEN_EXACT):).NE.'')THEN
+        PRINT*,"virtual dataset returned is incorrect"
+        total_error = total_error + 1
+     ENDIF
+
+     CALL h5pget_virtual_srcspace_f(dcpl, INT(i-1,size_t), space_out, error)
+     CALL check("H5Pget_virtual_srcspace_f", error, total_error)
+
+     CALL h5sget_select_type_f(space_out, type1, error)
+     CALL check("H5Sget_select_type_f", error, total_error)
+     CALL h5sget_select_type_f(vspace, type2, error)
+     CALL check("H5Sget_select_type_f", error, total_error)
+
+     IF(type1.NE.type2)THEN
+        total_error = total_error + 1
+     ENDIF
+
+  ENDDO
+  !
+  ! Close and release resources.
+
+  ! Clear virtual layout in DCPL
+  CALL h5pset_layout_f(dcpl, H5D_VIRTUAL_F,error)
+  CALL check("H5Pset_layout_f", error, total_error)
+
+  CALL H5Pclose_f(dcpl, error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Dclose_f(vdset, error)
+  CALL check("H5Dclose_f", error, total_error)
+
+  ! Reopen VDS with printf gap set to 1
+
+  CALL H5Pset_virtual_printf_gap_f(dapl, 1_hsize_t, error)
+  CALL check("H5Pset_virtual_printf_gap_f", error, total_error)
+
+  CALL H5Dopen_f(vfile, DATASET, vdset, error, dapl)
+  CALL check("H5Dopen_f", error, total_error)
+
+  CALL H5Pget_virtual_printf_gap_f(dapl, gap_size, error)
+  CALL check("H5Pget_virtual_printf_gap_f", error, total_error)
+
+  IF(gap_size.NE.1_hsize_t)THEN
+     PRINT*,"gapsize is incorrect"
+     total_error = total_error + 1
+  ENDIF
+     
+  CALL H5Dclose_f(vdset, error)
+  CALL check("H5Dclose_f", error, total_error)
+  CALL H5Sclose_f(vspace, error)
+  CALL check("H5Sclose_f", error, total_error)
+  CALL H5Pclose_f(dapl, error)
+  CALL check("H5Pclose_f", error, total_error)
+  CALL H5Fclose_f(vfile, error)
+  CALL check("H5Fclose_f", error, total_error)
+ 
+END SUBROUTINE test_vds
+
+
 END MODULE TH5P_F03
diff --git a/src/H5D.c b/src/H5D.c
index 4dccd0d..bcc2888 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -910,7 +910,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t size[])
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified")
 
     /* Private function */
-    if(H5D__set_extent(dset, size, H5AC_coll_read_dxpl_id) < 0)
+    if(H5D__set_extent(dset, size, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set extend dataset")
 
 done:
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index f0f4472..1753917 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -180,8 +180,6 @@ H5Dopen1(hid_t loc_id, const char *name)
 {
     H5D_t       *dset = NULL;
     H5G_loc_t   loc;                    /* Object location of group */
-    hid_t       dapl_id = H5P_DATASET_ACCESS_DEFAULT; /* dapl to use to open dataset */
-    hid_t       dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datset */
     hid_t       ret_value;
 
     FUNC_ENTER_API(FAIL)
@@ -194,7 +192,7 @@ H5Dopen1(hid_t loc_id, const char *name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Open the dataset */
-    if(NULL == (dset = H5D__open_name(&loc, name, dapl_id, dxpl_id)))
+    if(NULL == (dset = H5D__open_name(&loc, name, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open dataset")
 
     /* Register an atom for the dataset */
diff --git a/src/H5F.c b/src/H5F.c
index 0cbd212..6c34e40 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -472,7 +472,6 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
         if(TRUE != H5P_isa_class(fcpl_id, H5P_FILE_CREATE))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not file create property list")
 
-
     /* Verify access property list and get correct dxpl */
     if(H5P_verify_apl_and_dxpl(&fapl_id, H5P_CLS_FACC, &dxpl_id, H5I_INVALID_HID, TRUE) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "can't set access and transfer property lists")
diff --git a/src/H5L.c b/src/H5L.c
index efe16aa..dd04990 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -717,7 +717,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name,
     udata.idx_type = idx_type;
     udata.order = order;
     udata.n = n;
-    udata.dxpl_id = H5AC_dxpl_id;
+    udata.dxpl_id = dxpl_id;
 
     /* Traverse the group hierarchy to remove the link */
     if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK|H5G_TARGET_MOUNT, 
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index 732eb7b..5d4cb21 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -222,6 +222,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
     char        *actual_file_name = NULL; /* Parent file's actual name */
     H5P_genplist_t  *fa_plist;          /* File access property list pointer */
     H5F_close_degree_t 	fc_degree = H5F_CLOSE_WEAK;  /* File close degree for target file */
+    hid_t       dxpl_id = H5AC_dxpl_id; /* dxpl used by library */
     hid_t ret_value = H5I_INVALID_HID;  /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -245,6 +246,10 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
     if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
+    /* Verify access property list and get correct dxpl */
+    if(H5P_verify_apl_and_dxpl(&lapl_id, H5P_CLS_LACC, &dxpl_id, cur_group, FALSE) < 0)
+        HGOTO_ERROR(H5E_LINK, H5E_CANTSET, FAIL, "can't set access and transfer property lists")
+
     /* Get the fapl_id set for lapl_id if any */
     if(H5P_get(plist, H5L_ACS_ELINK_FAPL_NAME, &fapl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fapl for links")
@@ -282,7 +287,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
         parent_file_name = H5F_OPEN_NAME(loc.oloc->file);
 
         /* Query length of parent group name */
-        if((group_name_len = H5G_get_name(&loc, NULL, (size_t) 0, NULL, lapl_id, H5AC_dxpl_id)) < 0)
+        if((group_name_len = H5G_get_name(&loc, NULL, (size_t) 0, NULL, lapl_id, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to retrieve length of group name")
 
         /* Account for null terminator */
@@ -297,7 +302,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
             parent_group_name = local_group_name;
 
         /* Get parent group name */
-        if(H5G_get_name(&loc, parent_group_name, (size_t) group_name_len, NULL, lapl_id, H5AC_dxpl_id) < 0)
+        if(H5G_get_name(&loc, parent_group_name, (size_t) group_name_len, NULL, lapl_id, dxpl_id) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to retrieve group name")
 
         /* Make callback */
@@ -328,7 +333,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
     /* target file_name is an absolute pathname: see RM for detailed description */
     if(H5_CHECK_ABSOLUTE(file_name) || H5_CHECK_ABS_PATH(file_name)) {
         /* Try opening file */
-        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id))) {
+        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id))) {
             char *ptr;
 
             H5E_clear_stack(NULL);
@@ -347,7 +352,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
     } /* end if */
     else if(H5_CHECK_ABS_DRIVE(file_name)) {
         /* Try opening file */
-        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id))) {
+        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id))) {
 
             H5E_clear_stack(NULL);
 
@@ -377,7 +382,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
                         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
 		    } /* end if */
 
-                    ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id);
+                    ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id);
                     full_name = (char *)H5MM_xfree(full_name);
                     if(ext_file != NULL)
                         break;
@@ -395,7 +400,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
         if(my_prefix) {
             if(H5L_build_name(my_prefix, temp_file_name, &full_name/*out*/) < 0)
                 HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
-            if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
+            if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id)))
                 H5E_clear_stack(NULL);
             full_name = (char *)H5MM_xfree(full_name);
         } /* end if */
@@ -408,7 +413,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
         if(NULL != (extpath = H5F_EXTPATH(loc.oloc->file))) {
             if(H5L_build_name(extpath, temp_file_name, &full_name/*out*/) < 0)
                 HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
-            if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
+            if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id)))
                 H5E_clear_stack(NULL);
             full_name = (char *)H5MM_xfree(full_name);
         } /* end if */
@@ -416,7 +421,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
 
     /* try the relative file_name stored in temp_file_name */
     if(ext_file == NULL) {
-        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, temp_file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
+        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, temp_file_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id)))
             H5E_clear_stack(NULL);
     } /* end if */
 
@@ -443,7 +448,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
 
         /* Try opening with the resolved name */
-        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
+        if(NULL == (ext_file = H5F_efc_open(loc.oloc->file, full_name, intent, H5P_FILE_CREATE_DEFAULT, fapl_id, dxpl_id)))
             HGOTO_ERROR(H5E_LINK, H5E_CANTOPENFILE, FAIL, "unable to open external file, external link file name = '%s', temp_file_name = '%s'", file_name, temp_file_name)
         full_name = (char *)H5MM_xfree(full_name);
     } /* end if */
@@ -454,7 +459,7 @@ H5L_extern_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unable to create location for file")
 
     /* Open the object referenced in the external file */
-    if((ext_obj = H5O_open_name(&root_loc, obj_name, lapl_id, FALSE)) < 0)
+    if((ext_obj = H5O_open_name(&root_loc, obj_name, lapl_id, dxpl_id, FALSE)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
     /* Set return value */
diff --git a/src/H5O.c b/src/H5O.c
index b22528a..dfcfee9 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -231,6 +231,7 @@ hid_t
 H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id)
 {
     H5G_loc_t	loc;
+    hid_t       dxpl_id = H5AC_dxpl_id; /* dxpl used by library */
     hid_t       ret_value = FAIL;
 
     FUNC_ENTER_API(FAIL)
@@ -242,8 +243,12 @@ H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id)
     if(!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
+    /* Verify access property list and get correct dxpl */
+    if(H5P_verify_apl_and_dxpl(&lapl_id, H5P_CLS_LACC, &dxpl_id, loc_id, FALSE) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set access and transfer property lists")
+
     /* Open the object */
-    if((ret_value = H5O_open_name(&loc, name, lapl_id, TRUE)) < 0)
+    if((ret_value = H5O_open_name(&loc, name, lapl_id, dxpl_id, TRUE)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
@@ -724,7 +729,7 @@ H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     loc_found = TRUE;
 
     /* Retrieve the object's information */
-    if(H5O_get_info(obj_loc.oloc, H5AC_dxpl_id, TRUE, oinfo) < 0)
+    if(H5O_get_info(obj_loc.oloc, dxpl_id, TRUE, oinfo) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object info")
 
 done:
@@ -1345,13 +1350,12 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id, hbool_t app_ref)
+H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref)
 {
     H5G_loc_t   obj_loc;                /* Location used to open group */
     H5G_name_t  obj_path;            	/* Opened object group hier. path */
     H5O_loc_t   obj_oloc;            	/* Opened object object location */
     hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    hid_t       dxpl_id = H5AC_dxpl_id; /* dxpl used by library */
     hid_t       ret_value = FAIL;
 
     FUNC_ENTER_NOAPI(FAIL)
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 2bb7a36..0abe69d 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -216,6 +216,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     htri_t      dst_exists;             /* Does destination name exist already? */
     hbool_t     loc_found = FALSE;      /* Location at 'name' found */
     hbool_t     obj_open = FALSE;       /* Entry at 'name' found */
+    hid_t       dxpl_id = H5AC_dxpl_id; /* dxpl used by library */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(FAIL)
@@ -233,7 +234,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination name specified")
 
     /* check if destination name already exists */
-    if((dst_exists = H5L_exists_tolerant(&dst_loc, dst_name, H5P_DEFAULT, H5AC_dxpl_id)) < 0)
+    if((dst_exists = H5L_exists_tolerant(&dst_loc, dst_name, H5P_DEFAULT, dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to check if destination name exists")
     if(TRUE == dst_exists)
         HGOTO_ERROR(H5E_OHDR, H5E_EXISTS, FAIL, "destination object already exists")
@@ -244,7 +245,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     H5G_loc_reset(&src_loc);
 
     /* Find the source object to copy */
-    if(H5G_loc_find(&loc, src_name, &src_loc/*out*/, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+    if(H5G_loc_find(&loc, src_name, &src_loc/*out*/, H5P_DEFAULT, dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "source object not found")
     loc_found = TRUE;
 
@@ -270,7 +271,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not object copy property list")
 
     /* Do the actual copying of the object */
-    if(H5O_copy_obj(&src_loc, &dst_loc, dst_name, ocpypl_id, lcpl_id, H5AC_dxpl_id) < 0)
+    if(H5O_copy_obj(&src_loc, &dst_loc, dst_name, ocpypl_id, lcpl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
 
 done:
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 9235d6c..4ce8e59 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -763,7 +763,7 @@ H5_DLL herr_t H5O_get_info(const H5O_loc_t *oloc, hid_t dxpl_id, hbool_t want_ih
     H5O_info_t *oinfo);
 H5_DLL herr_t H5O_obj_type(const H5O_loc_t *loc, H5O_type_t *obj_type, hid_t dxpl_id);
 H5_DLL herr_t H5O_get_create_plist(const H5O_loc_t *loc, hid_t dxpl_id, struct H5P_genplist_t *oc_plist);
-H5_DLL hid_t H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id, hbool_t app_ref);
+H5_DLL hid_t H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id, hbool_t app_ref);
 H5_DLL herr_t H5O_get_nlinks(const H5O_loc_t *loc, hid_t dxpl_id, hsize_t *nlinks);
 H5_DLL void *H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id);
 H5_DLL haddr_t H5O_get_oh_addr(const H5O_t *oh);
diff --git a/src/H5Pint.c b/src/H5Pint.c
index 12582bb..3c145c5 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -5463,12 +5463,31 @@ H5P_verify_apl_and_dxpl(hid_t *acspl_id, const H5P_libclass_t *libclass, hid_t *
     HDassert(libclass);
     HDassert(dxpl_id);
 
+#ifdef H5_HAVE_PARALLEL
+    /* If parallel is enabled and the file driver used in the MPI-IO
+    VFD, issue an MPI barrier for easier debugging if the API function
+    calling this is supposed to be called collectively. Note that this
+    happens only when the environment variable H5_COLL_BARRIER is set
+    to non 0. */
+    if(is_collective && H5_coll_api_sanity_check_g) {
+        MPI_Comm mpi_comm; /* file communicator */
+
+        /* retrieve the MPI communicator from the loc_id or the fapl_id */
+        if(H5F_mpi_retrieve_comm(loc_id, *acspl_id, &mpi_comm) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get MPI communicator")
+
+        /* issue the barrier */
+        if(mpi_comm != MPI_COMM_NULL)
+            MPI_Barrier(mpi_comm);
+    }
+#endif /* H5_HAVE_PARALLEL */
+
     /* Set access plist to the default property list of the appropriate class if it's the generic default */
     if(H5P_DEFAULT == *acspl_id)
         *acspl_id = *libclass->def_plist_id;
     else {
 #ifdef H5_HAVE_PARALLEL
-        H5P_coll_md_read_flag_t is_collective;      /* Collective metadata read flag */
+        H5P_coll_md_read_flag_t md_coll_read;      /* Collective metadata read flag */
         H5P_genplist_t *plist;          /* Property list pointer */
 #endif /* H5_HAVE_PARALLEL */
 
@@ -5484,34 +5503,15 @@ H5P_verify_apl_and_dxpl(hid_t *acspl_id, const H5P_libclass_t *libclass, hid_t *
             HGOTO_ERROR(H5E_PLIST, H5E_BADATOM, FAIL, "can't find object for ID")
 
         /* Get the collective metadata read flag */
-        if(H5P_peek(plist, H5_COLL_MD_READ_FLAG_NAME, &is_collective) < 0)
+        if(H5P_peek(plist, H5_COLL_MD_READ_FLAG_NAME, &md_coll_read) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get core collective metadata read flag")
 
         /* If collective metadata read requested and using internal DXPL, switch to internal collective DXPL */
-        if(H5P_USER_TRUE == is_collective)
+        if(H5P_USER_TRUE == md_coll_read)
             *dxpl_id = H5AC_coll_read_dxpl_id;
 #endif /* H5_HAVE_PARALLEL */
     } /* end else */
 
-#ifdef H5_HAVE_PARALLEL
-    /* If parallel is enabled and the file driver used in the MPI-IO
-    VFD, issue an MPI barrier for easier debugging if the API function
-    calling this is supposed to be called collectively. Note that this
-    happens only when the environment variable H5_COLL_BARRIER is set
-    to non 0. */
-    if(is_collective && H5_coll_api_sanity_check_g) {
-        MPI_Comm mpi_comm; /* file communicator */
-
-        /* retrieve the MPI communicator from the loc_id or the fapl_id */
-        if(H5F_mpi_retrieve_comm(loc_id, *acspl_id, &mpi_comm) < 0)
-            HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get MPI communicator")
-
-        /* issue the barrier */
-        if(mpi_comm != MPI_COMM_NULL)
-            MPI_Barrier(mpi_comm);
-    }
-#endif /* H5_HAVE_PARALLEL */
-
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P_verify_apl_and_dxpl() */
diff --git a/src/H5R.c b/src/H5R.c
index 04d61cd..f0aafc3 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -541,12 +541,6 @@ H5R_dereference(H5F_t *file, hid_t oapl_id, hid_t dxpl_id, H5R_type_t ref_type,
             {
                 H5D_t *dset;                /* Pointer to dataset to open */
 
-                /* Get correct property list */
-                if(H5P_DEFAULT == oapl_id)
-                    oapl_id = H5P_DATASET_ACCESS_DEFAULT;
-                else if(TRUE != H5P_isa_class(oapl_id, H5P_DATASET_ACCESS))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
-
                 /* Open the dataset */
                 if(NULL == (dset = H5D_open(&loc, oapl_id, dxpl_id)))
                     HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found")
@@ -602,6 +596,7 @@ H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *_r
 {
     H5G_loc_t loc;      /* Group location */
     H5F_t *file = NULL; /* File object */
+    hid_t dxpl_id = H5AC_dxpl_id; /* dxpl used by library */
     hid_t ret_value;
 
     FUNC_ENTER_API(FAIL)
@@ -616,12 +611,16 @@ H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *_r
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type")
     if(_ref == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer")
+   
+    /* Verify access property list and get correct dxpl */
+    if(H5P_verify_apl_and_dxpl(&oapl_id, H5P_CLS_DACC, &dxpl_id, obj_id, FALSE) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set access and transfer property lists")
 
     /* Get the file pointer from the entry */
     file = loc.oloc->file;
 
     /* Create reference */
-    if((ret_value = H5R_dereference(file, oapl_id, H5AC_dxpl_id, ref_type, _ref, TRUE)) < 0)
+    if((ret_value = H5R_dereference(file, oapl_id, dxpl_id, ref_type, _ref, TRUE)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to dereference object")
 
 done: