[svn-r26866] Removed the default REAL and DOUBLE PRECESION dependency.

19 files changed, 1353 insertions, 4561 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4135f4..97b4463 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -886,16 +886,6 @@ if (EXISTS "${HDF5_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/tools
 endif (EXISTS "${HDF5_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/tools")
 
 #-----------------------------------------------------------------------------
-# Check if Fortran's default real is double precision. If it is and HL is 
-# being built then configure should fail due to bug HDFFV-889.
-#-----------------------------------------------------------------------------
- if (HDF5_BUILD_FORTRAN AND HDF5_BUILD_HL_LIB )
-   if (NOT FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
-     message (FATAL_ERROR " **** Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use HDF5_BUILD_HL_LIB:BOOL=OFF **** ")
-   endif (NOT FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
- endif (HDF5_BUILD_FORTRAN AND HDF5_BUILD_HL_LIB )
-
-#-----------------------------------------------------------------------------
 # Generate the H5pubconf.h file containing user settings needed by compilation
 #-----------------------------------------------------------------------------
 configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY)
diff --git a/MANIFEST b/MANIFEST
index b495598..d772b6a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -272,8 +272,6 @@
 
 ./fortran/src/H5_f.c
 ./fortran/src/H5_ff.F90
-./fortran/src/H5_DBLE_InterfaceInclude.F90
-./fortran/src/H5_DBLE_InterfaceExclude.F90
 ./fortran/src/H5Af.c
 ./fortran/src/H5Aff.F90
 ./fortran/src/H5Df.c
diff --git a/configure b/configure
index 2bc0848..136c200 100755
--- a/configure
+++ b/configure
@@ -722,8 +722,6 @@ am__fastdepCXX_TRUE
 CXXDEPMODE
 ac_ct_CXX
 CXXFLAGS
-FORTRAN_DEFAULT_REALisDBLE_F_FALSE
-FORTRAN_DEFAULT_REALisDBLE_F_TRUE
 FORTRAN_2003_CONDITIONAL_F_FALSE
 FORTRAN_2003_CONDITIONAL_F_TRUE
 FCLIBS
@@ -6556,48 +6554,6 @@ $as_echo "#define FORTRAN_HAVE_SIZEOF 1" >>confdefs.h
 
   fi
 
-  ## Check to see if -r8 was specified to determine if we need to
-  ## compile the DOUBLE PRECISION interfaces.
-
-  FORTRAN_DEFAULT_REALisDBLE="no"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Fortran default REAL is DOUBLE PRECISION" >&5
-$as_echo_n "checking if Fortran default REAL is DOUBLE PRECISION... " >&6; }
-
-  cat > conftest.$ac_ext <<_ACEOF
-
-     MODULE type_mod
-       INTERFACE h5t
-         MODULE PROCEDURE h5t_real
-         MODULE PROCEDURE h5t_dble
-       END INTERFACE
-     CONTAINS
-       SUBROUTINE h5t_real(r)
-         REAL :: r
-       END SUBROUTINE h5t_real
-       SUBROUTINE h5t_dble(d)
-         DOUBLE PRECISION :: d
-       END SUBROUTINE h5t_dble
-     END MODULE type_mod
-     PROGRAM main
-       USE type_mod
-       REAL :: r
-       DOUBLE PRECISION :: d
-       CALL h5t(r)
-       CALL h5t(d)
-     END PROGRAM main
-
-_ACEOF
-if ac_fn_fc_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            FORTRAN_DEFAULT_REALisDBLE="yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
   if test "X$HDF_FORTRAN2003" = "Xyes"; then
 
     ## Checking if the compiler supports the required Fortran 2003 features and
@@ -6660,14 +6616,6 @@ else
   FORTRAN_2003_CONDITIONAL_F_FALSE=
 fi
 
- if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
-  FORTRAN_DEFAULT_REALisDBLE_F_TRUE=
-  FORTRAN_DEFAULT_REALisDBLE_F_FALSE='#'
-else
-  FORTRAN_DEFAULT_REALisDBLE_F_TRUE='#'
-  FORTRAN_DEFAULT_REALisDBLE_F_FALSE=
-fi
-
 
 ## ----------------------------------------------------------------------
 ## Check if they would like the C++ interface compiled
@@ -7422,12 +7370,6 @@ if test "X$HDF5_HL" = "Xyes"; then
 
 $as_echo "#define INCLUDE_HL 1" >>confdefs.h
 
-
-  ## If Fortran's default real is double precision and HL is being built then configure
-  ## should fail due to bug HDFFV-889.
-  if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
-    as_fn_error $? "Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use configure option --disable-hl." "$LINENO" 5
-  fi
 else
  echo "no"
 fi
@@ -30220,10 +30162,6 @@ if test -z "${FORTRAN_2003_CONDITIONAL_F_TRUE}" && test -z "${FORTRAN_2003_CONDI
   as_fn_error $? "conditional \"FORTRAN_2003_CONDITIONAL_F\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${FORTRAN_DEFAULT_REALisDBLE_F_TRUE}" && test -z "${FORTRAN_DEFAULT_REALisDBLE_F_FALSE}"; then
-  as_fn_error $? "conditional \"FORTRAN_DEFAULT_REALisDBLE_F\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 053f2e3..14b4335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,10 +462,6 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
     AC_DEFINE([FORTRAN_HAVE_SIZEOF], [1], [Define if we have Fortran intrinsic SIZEOF])
   fi
 
-  ## Check to see if -r8 was specified to determine if we need to
-  ## compile the DOUBLE PRECISION interfaces.
-  PAC_PROG_FC_DEFAULT_REALisDBLE	
-
   if test "X$HDF_FORTRAN2003" = "Xyes"; then
 
     ## Checking if the compiler supports the required Fortran 2003 features and
@@ -486,7 +482,6 @@ fi
 AC_LANG_POP(Fortran)
 
 AM_CONDITIONAL([FORTRAN_2003_CONDITIONAL_F], [test "X$HAVE_FORTRAN_2003" = "Xyes"])
-AM_CONDITIONAL([FORTRAN_DEFAULT_REALisDBLE_F], [test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"])
 
 ## ----------------------------------------------------------------------
 ## Check if they would like the C++ interface compiled
@@ -551,12 +546,6 @@ if test "X$HDF5_HL" = "Xyes"; then
  HL="hl"
  AC_DEFINE([INCLUDE_HL], [1],
            [Define if HDF5's high-level library headers should be included in hdf5.h])
-
-  ## If Fortran's default real is double precision and HL is being built then configure
-  ## should fail due to bug HDFFV-889.
-  if test "X$FORTRAN_DEFAULT_REALisDBLE" = "Xyes"; then
-    AC_MSG_ERROR([Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use configure option --disable-hl.])
-  fi
 else
  echo "no"
 fi
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index e38460d..c0c2569 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -145,17 +145,6 @@ set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES
 )
 
 #-----------------------------------------------------------------------------
-# Fortran Real Size
-#-----------------------------------------------------------------------------
-if (FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
-  # default real is 4 bytes, so include double signatures
-  set (F_DBLE "Include")
-else (FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
-  # default real is 8 bytes, so exclude double signatures
-  set (F_DBLE "Exclude")
-endif (FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
-
-#-----------------------------------------------------------------------------
 # Fortran Modules
 #-----------------------------------------------------------------------------
 set (f90_F_SRCS
@@ -178,7 +167,6 @@ set (f90_F_SRCS
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Sff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Tff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Zff.F90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5_DBLE_Interface${F_DBLE}.F90
 )
 
 set (f90_F_SRCS
@@ -262,17 +250,6 @@ set (mod_files
     ${MOD_BUILD_DIR}/h5s.mod
     ${MOD_BUILD_DIR}/h5t.mod
     ${MOD_BUILD_DIR}/h5z.mod
-    ${MOD_BUILD_DIR}/h5a_provisional.mod
-    ${MOD_BUILD_DIR}/h5d_provisional.mod
-    ${MOD_BUILD_DIR}/h5e_provisional.mod
-    ${MOD_BUILD_DIR}/h5f_provisional.mod
-    ${MOD_BUILD_DIR}/h5l_provisional.mod
-    ${MOD_BUILD_DIR}/h5lib_provisional.mod
-    ${MOD_BUILD_DIR}/h5o_provisional.mod
-    ${MOD_BUILD_DIR}/h5p_provisional.mod
-    ${MOD_BUILD_DIR}/h5r_provisional.mod
-    ${MOD_BUILD_DIR}/h5t_provisional.mod
-    ${MOD_BUILD_DIR}/h5_dble_interface.mod
 )
 install (
     FILES
diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c
index e71887d..d0821f6 100644
--- a/fortran/src/H5Af.c
+++ b/fortran/src/H5Af.c
@@ -118,383 +118,6 @@ done:
     return ret_value;
 }
 
-/****if* H5Af/h5awritec_c
- * NAME
- *        h5awritec_c
- * PURPOSE
- *     Call h5awrite_c to write a character  attribute
- * INPUTS
- *      attr_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              buf      - character data buffer
- *              dims     - array to store dimensions sizes of buf; used only
- *                         by Fortran routine.
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday , August 12, 1999
- * HISTORY
- * dims paramete added.
- *                April 4, 2001
- * SOURCE
-*/
-int_f
-h5awritec_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-int_f
-h5awritec_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5awritec_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5awritec_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5awritec_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5awritec_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5awritec_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5awritec_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5awritec_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-
-
-/****if* H5Af/h5awrite_c
- * NAME
- *        h5awrite_c
- * PURPOSE
- *     Call H5Awrite to write a attribute
- * INPUTS
- *      attr_id - attribute identifier
- *              mem_type_id - memory datatype identifier
- *              buf      - data buffer
- *              dims     - array to store dimensions sizes of buf; used only
- *                         by Fortran routine.
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- * dims parameter added
- *                                           April 4, 2001
- *                Added h5awrite_integer(real,double)_s,1-7 functions to eliminate
- *                complains about wrong parameters types in h5awrite_c function
- *                called by Fortran routines.
- *                                           October 9, 2006 EIP
- * SOURCE
-*/
-int_f
-h5awrite_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5awrite_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
-/******/
-{
-     /*
-      * Call h5awrite_c  function.
-      */
-     return h5awrite_c(attr_id, mem_type_id, buf, dims);
-}
-
 int_f
 h5awrite_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED *dims)
 /******/
@@ -512,404 +135,6 @@ done:
 }
 
 
-/****if* H5Af/h5areadc_c
- * NAME
- *        h5areadc_c
- * PURPOSE
- *     Call h5aread_c to read character  attribute
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              dims     - array to store dimensions sizes of buf; used only
- *                         by Fortran routine.
- * OUTPUTS
- *     buf      - character data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- * dims parameter added.
- *                April 4, 2001
- *                Added h5areadc_s,1-7 functions to eliminate
- *                complains about wrong parameters types in h5awrite_c function
- *                called by Fortran routines.
- *                                           October 9, 2006 EIP
- * SOURCE
-*/
-int_f
-h5areadc_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-int_f
-h5areadc_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5areadc_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5areadc_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5areadc_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5areadc_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5areadc_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-int_f
-h5areadc_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-int_f
-h5areadc_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
-}
-
-
-
-/****if* H5Af/h5aread_c
- * NAME
- *        h5aread_c
- * PURPOSE
- *     Call H5Aread to read an attribute
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              dims     - array to store dimensions sizes of buf; used only
- *                         by Fortran routine.
- * OUTPUTS
- *     buf      - data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Thursday, August 12, 1999
- * HISTORY
- * dims paramete added.
- *                April 4, 2001
- *                Added h5aread_integer(real,double)_s,1-7 functions to eliminate
- *                complains about wrong parameters types in h5awrite_c function
- *                called by Fortran routines.
- *                                           October 9, 2006 EIP
- * SOURCE
-*/
-int_f
-h5aread_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-    int_f ret_value=0;          /* Return value */
-
-     /*
-      * Call H5Aread function.
-      */
-     if (H5Aread((hid_t)*attr_id, (hid_t)*mem_type_id, buf) < 0)
-         HGOTO_DONE(FAIL);
-
-done:
-     return ret_value;
-}
-
-int_f
-h5aread_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
-int_f
-h5aread_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void UNUSED * dims)
-/******/
-{
-     /*
-      * Call h5aread_c  function.
-      */
-     return h5aread_c(attr_id, mem_type_id, buf, dims);
-}
-
 
 /****if* H5Af/h5aclose_c
  * NAME
diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90
index 6518f10..0c209fa 100644
--- a/fortran/src/H5Aff.F90
+++ b/fortran/src/H5Aff.F90
@@ -66,7 +66,7 @@
 
 MODULE H5A
 
-  USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_char, c_int, C_NULL_CHAR
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_char, c_int, C_NULL_CHAR, C_LOC, C_FLOAT, C_DOUBLE
   USE H5GLOBAL
 
   INTERFACE h5awrite_f
@@ -86,14 +86,22 @@ MODULE H5A
      MODULE PROCEDURE h5awrite_char_5
      MODULE PROCEDURE h5awrite_char_6
      MODULE PROCEDURE h5awrite_char_7
-     MODULE PROCEDURE h5awrite_real_scalar
-     MODULE PROCEDURE h5awrite_real_1
-     MODULE PROCEDURE h5awrite_real_2
-     MODULE PROCEDURE h5awrite_real_3
-     MODULE PROCEDURE h5awrite_real_4
-     MODULE PROCEDURE h5awrite_real_5
-     MODULE PROCEDURE h5awrite_real_6
-     MODULE PROCEDURE h5awrite_real_7
+     MODULE PROCEDURE h5awrite_c_float_scalar
+     MODULE PROCEDURE h5awrite_c_float_1
+     MODULE PROCEDURE h5awrite_c_float_2
+     MODULE PROCEDURE h5awrite_c_float_3
+     MODULE PROCEDURE h5awrite_c_float_4
+     MODULE PROCEDURE h5awrite_c_float_5
+     MODULE PROCEDURE h5awrite_c_float_6
+     MODULE PROCEDURE h5awrite_c_float_7
+     MODULE PROCEDURE h5awrite_c_double_scalar
+     MODULE PROCEDURE h5awrite_c_double_1
+     MODULE PROCEDURE h5awrite_c_double_2
+     MODULE PROCEDURE h5awrite_c_double_3
+     MODULE PROCEDURE h5awrite_c_double_4
+     MODULE PROCEDURE h5awrite_c_double_5
+     MODULE PROCEDURE h5awrite_c_double_6
+     MODULE PROCEDURE h5awrite_c_double_7
      ! This is the preferred way to call h5awrite
      ! by passing an address
      MODULE PROCEDURE h5awrite_ptr
@@ -116,14 +124,22 @@ MODULE H5A
      MODULE PROCEDURE h5aread_char_5
      MODULE PROCEDURE h5aread_char_6
      MODULE PROCEDURE h5aread_char_7
-     MODULE PROCEDURE h5aread_real_scalar
-     MODULE PROCEDURE h5aread_real_1
-     MODULE PROCEDURE h5aread_real_2
-     MODULE PROCEDURE h5aread_real_3
-     MODULE PROCEDURE h5aread_real_4
-     MODULE PROCEDURE h5aread_real_5
-     MODULE PROCEDURE h5aread_real_6
-     MODULE PROCEDURE h5aread_real_7
+     MODULE PROCEDURE h5aread_c_float_scalar
+     MODULE PROCEDURE h5aread_c_float_1
+     MODULE PROCEDURE h5aread_c_float_2
+     MODULE PROCEDURE h5aread_c_float_3
+     MODULE PROCEDURE h5aread_c_float_4
+     MODULE PROCEDURE h5aread_c_float_5
+     MODULE PROCEDURE h5aread_c_float_6
+     MODULE PROCEDURE h5aread_c_float_7
+     MODULE PROCEDURE h5aread_c_double_scalar
+     MODULE PROCEDURE h5aread_c_double_1
+     MODULE PROCEDURE h5aread_c_double_2
+     MODULE PROCEDURE h5aread_c_double_3
+     MODULE PROCEDURE h5aread_c_double_4
+     MODULE PROCEDURE h5aread_c_double_5
+     MODULE PROCEDURE h5aread_c_double_6
+     MODULE PROCEDURE h5aread_c_double_7
      ! This is the preferred way to call h5aread
      ! by passing an address
      MODULE PROCEDURE h5aread_ptr
@@ -133,8 +149,9 @@ MODULE H5A
 !  to the C H5Awrite routine
   INTERFACE
      INTEGER FUNCTION h5awrite_f_c(attr_id, mem_type_id, buf) BIND(C, NAME='h5awrite_f_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       USE H5GLOBAL
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
        INTEGER(HID_T), INTENT(IN) :: attr_id
        INTEGER(HID_T), INTENT(IN) :: mem_type_id
        TYPE(C_PTR), VALUE :: buf
@@ -145,8 +162,9 @@ MODULE H5A
 !  to the C H5Aread routine
   INTERFACE
      INTEGER FUNCTION h5aread_f_c(attr_id, mem_type_id, buf) BIND(C, NAME='h5aread_f_c')
-       USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr
-       USE H5GLOBAL
+       IMPORT :: c_ptr
+       IMPORT :: HID_T
+       IMPLICIT NONE
        INTEGER(HID_T), INTENT(IN) :: attr_id
        INTEGER(HID_T), INTENT(IN) :: mem_type_id
        TYPE(C_PTR), VALUE :: buf
@@ -371,8 +389,8 @@ CONTAINS
 !*****
     INTERFACE
        INTEGER(HID_T) FUNCTION H5Aget_space(attr_id) BIND(C,NAME='H5Aget_space')
-         USE ISO_C_BINDING
-         USE H5GLOBAL
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN), VALUE :: attr_id
        END FUNCTION H5Aget_space
     END INTERFACE
@@ -416,8 +434,8 @@ CONTAINS
 !*****
     INTERFACE
        INTEGER(HID_T) FUNCTION H5Aget_type(attr_id) BIND(C,NAME='H5Aget_type')
-         USE ISO_C_BINDING
-         USE H5GLOBAL
+         IMPORT :: HID_T
+         IMPLICIT NONE
          INTEGER(HID_T), INTENT(IN), VALUE :: attr_id
        END FUNCTION H5Aget_type
     END INTERFACE
@@ -455,32 +473,55 @@ CONTAINS
 !
 !
 ! SOURCE
-  SUBROUTINE H5Aget_name_f(attr_id, size, buf, hdferr)
+  SUBROUTINE h5aget_name_f(attr_id, size, buf, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id
-    INTEGER(SIZE_T), INTENT(IN) :: size
-    CHARACTER(LEN=*), INTENT(INOUT) :: buf
-    INTEGER, INTENT(OUT) :: hdferr
-    
-    CHARACTER(KIND=C_CHAR, LEN=LEN(buf)+1) :: c_buf
-    
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
+    INTEGER(SIZE_T), INTENT(IN) :: size    ! Buffer size
+    CHARACTER(LEN=*), INTENT(INOUT) :: buf ! Buffer to hold attribute name
+    INTEGER, INTENT(OUT) :: hdferr ! Error code:
+                                   ! name length is successful, -1 if fail
 !*****
     INTERFACE
-       INTEGER FUNCTION H5Aget_name(attr_id, size, buf) BIND(C, NAME='H5Aget_name')
-         USE ISO_C_BINDING
-         USE H5GLOBAL
-         INTEGER(HID_T), INTENT(IN), VALUE :: attr_id
-         INTEGER(SIZE_T), INTENT(IN), VALUE :: size
+       INTEGER FUNCTION h5aget_name_c(attr_id, size, buf) &
+            BIND(C,NAME='h5aget_name_c')
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
+         INTEGER(HID_T), INTENT(IN) :: attr_id
+         INTEGER(SIZE_T), INTENT(IN) :: size
          CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
-       END FUNCTION H5Aget_name
+       END FUNCTION h5aget_name_c
     END INTERFACE
 
-    ! add 1 for the null char
-    hdferr = H5Aget_name(attr_id, size+1, c_buf)
-
-    CALL H5_Fortran_string_c2f(c_buf, buf)
+    hdferr = h5aget_name_c(attr_id, size, buf)
+  END SUBROUTINE h5aget_name_f
 
-  END SUBROUTINE H5Aget_name_f
+!!$  SUBROUTINE H5Aget_name_f(attr_id, size, buf, hdferr)
+!!$    IMPLICIT NONE
+!!$    INTEGER(HID_T), INTENT(IN) :: attr_id
+!!$    INTEGER(SIZE_T), INTENT(IN) :: size
+!!$    CHARACTER(LEN=*), INTENT(INOUT) :: buf
+!!$    INTEGER, INTENT(OUT) :: hdferr
+!!$!*****
+!!$    CHARACTER(KIND=C_CHAR, LEN=LEN(buf)+1) :: c_buf
+!!$    
+!!$    INTERFACE
+!!$       INTEGER FUNCTION H5Aget_name(attr_id, size, buf) BIND(C, NAME='H5Aget_name')
+!!$         IMPORT :: C_CHAR
+!!$         IMPORT :: HID_T, SIZE_T
+!!$         INTEGER(HID_T), INTENT(IN), VALUE :: attr_id
+!!$         INTEGER(SIZE_T), INTENT(IN), VALUE :: size
+!!$         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(OUT) :: buf
+!!$       END FUNCTION H5Aget_name
+!!$    END INTERFACE
+!!$
+!!$    ! add 1 for the null char
+!!$    PRINT*,H5Aget_name(attr_id, size + 1_SIZE_T, c_buf)
+!!$    hdferr = INT(H5Aget_name(attr_id, size + 1_SIZE_T, c_buf))
+!!$
+!!$    CALL H5_Fortran_string_c2f(c_buf, buf)
+!!$
+!!$
+!!$  END SUBROUTINE H5Aget_name_f
 
 !
 !****s* H5A/H5Aget_name_by_idx_f
@@ -685,7 +726,7 @@ CONTAINS
 
     INTERFACE
        INTEGER FUNCTION h5aget_num_attrs_c(obj_id, attr_num) BIND(C,name='h5aget_num_attrs_c')
-         USE H5GLOBAL
+         IMPORT :: HID_T
          INTEGER(HID_T), INTENT(IN) :: obj_id
          INTEGER, INTENT(OUT) :: attr_num
        END FUNCTION h5aget_num_attrs_c
@@ -730,8 +771,8 @@ CONTAINS
 
     INTERFACE
        INTEGER FUNCTION H5Adelete_c(obj_id, name, namelen) BIND(C,NAME='h5adelete_c')
-         USE ISO_C_BINDING
-         USE H5GLOBAL
+         IMPORT :: C_CHAR
+         IMPORT :: HID_T, SIZE_T
          INTEGER(HID_T), INTENT(IN) :: obj_id
          CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
          INTEGER(SIZE_T) :: namelen
@@ -859,6 +900,9 @@ CONTAINS
 
     creation_prop_id = H5Aget_create_plist(attr_id)
 
+    hdferr = 0
+    IF(creation_prop_id.LT.0) hdferr = -1
+
   END SUBROUTINE H5Aget_create_plist_f
 
 !
@@ -1844,7 +1888,7 @@ CONTAINS
 !
 ! NOTES
 !  This function is overloaded to write INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
+!  REAL, REAL(KIND=C_DOUBLE) and CHARACTER buffers
 !  up to 7 dimensions.
 !
 ! Fortran90 Interface:
@@ -1858,7 +1902,6 @@ CONTAINS
 
 
   SUBROUTINE H5Awrite_integer_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -1875,7 +1918,6 @@ CONTAINS
   END SUBROUTINE H5Awrite_integer_scalar
 
   SUBROUTINE H5Awrite_integer_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -1893,7 +1935,6 @@ CONTAINS
 
 
   SUBROUTINE H5Awrite_integer_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -1912,7 +1953,6 @@ CONTAINS
   END SUBROUTINE H5Awrite_integer_2
 
   SUBROUTINE H5Awrite_integer_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -1930,7 +1970,6 @@ CONTAINS
 
 
   SUBROUTINE H5Awrite_integer_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -1949,7 +1988,6 @@ CONTAINS
 
 
   SUBROUTINE H5Awrite_integer_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -1968,7 +2006,6 @@ CONTAINS
 
 
   SUBROUTINE H5Awrite_integer_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -1986,7 +2023,6 @@ CONTAINS
 
 
   SUBROUTINE H5Awrite_integer_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2004,30 +2040,28 @@ CONTAINS
   END SUBROUTINE H5Awrite_integer_7
 
 
-  SUBROUTINE H5Awrite_real_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Awrite_c_float_scalar(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), TARGET :: buf          ! Attribute data
+    REAL(KIND=C_FLOAT), INTENT(IN), TARGET :: buf          ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
     TYPE(C_PTR) :: f_ptr
 
     f_ptr = C_LOC(buf)
 
     hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Awrite_real_scalar
+  END SUBROUTINE H5Awrite_c_float_scalar
 
-  SUBROUTINE H5Awrite_real_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Awrite_c_float_1(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1)), TARGET :: buf  ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
     TYPE(C_PTR) :: f_ptr
@@ -2036,17 +2070,16 @@ CONTAINS
 
     hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
 
-  END SUBROUTINE H5Awrite_real_1
+  END SUBROUTINE H5Awrite_c_float_1
 
 
-  SUBROUTINE H5Awrite_real_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Awrite_c_float_2(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2)), TARGET :: buf
     ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
@@ -2056,17 +2089,16 @@ CONTAINS
 
     hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
 
-  END SUBROUTINE H5Awrite_real_2
+  END SUBROUTINE H5Awrite_c_float_2
 
 
-  SUBROUTINE H5Awrite_real_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Awrite_c_float_3(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
     ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2075,17 +2107,16 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1,1))
 
     hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Awrite_real_3
+  END SUBROUTINE H5Awrite_c_float_3
 
 
-  SUBROUTINE H5Awrite_real_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Awrite_c_float_4(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
     ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2094,17 +2125,16 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1,1,1))
 
     hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Awrite_real_4
+  END SUBROUTINE H5Awrite_c_float_4
 
 
-  SUBROUTINE H5Awrite_real_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Awrite_c_float_5(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
     ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2113,17 +2143,16 @@ CONTAINS
     f_ptr = C_LOC(buf)
 
     hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Awrite_real_5
+  END SUBROUTINE H5Awrite_c_float_5
 
 
-  SUBROUTINE H5Awrite_real_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Awrite_c_float_6(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
     ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2132,17 +2161,16 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1,1,1,1,1))
 
     hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Awrite_real_6
+  END SUBROUTINE H5Awrite_c_float_6
 
 
-  SUBROUTINE H5Awrite_real_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Awrite_c_float_7(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
     TYPE(C_PTR) :: f_ptr
@@ -2150,10 +2178,150 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
 
     hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Awrite_real_7
+  END SUBROUTINE H5Awrite_c_float_7
+
+  SUBROUTINE h5awrite_c_double_scalar(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(IN), TARGET :: buf     ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf)
+
+    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5awrite_c_double_scalar
+
+  SUBROUTINE h5awrite_c_double_1(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1)), TARGET :: buf ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+    
+    f_ptr = C_LOC(buf(1))
+
+    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5awrite_c_double_1
+
+
+  SUBROUTINE h5awrite_c_double_2(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1))
+
+    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
+
+  END SUBROUTINE h5awrite_c_double_2
+
+
+  SUBROUTINE h5awrite_c_double_3(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3)) :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1))
+
+    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5awrite_c_double_3
+
+
+  SUBROUTINE h5awrite_c_double_4(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1))
+
+    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5awrite_c_double_4
+
+
+  SUBROUTINE h5awrite_c_double_5(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1))
+
+    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5awrite_c_double_5
+
+
+  SUBROUTINE h5awrite_c_double_6(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1))
+
+    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5awrite_c_double_6
+
+
+  SUBROUTINE h5awrite_c_double_7(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
+
+    hdferr = H5Awrite_f_c(attr_id, memtype_id, f_ptr)
+
+  END SUBROUTINE h5awrite_c_double_7
 
   SUBROUTINE H5Awrite_char_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id               ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id            ! Attribute datatype
@@ -2167,7 +2335,6 @@ CONTAINS
   END SUBROUTINE H5Awrite_char_scalar
 
   SUBROUTINE H5Awrite_char_scalar_fix(attr_id, memtype_id, buf, buf_len, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id               ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id            ! Attribute datatype
@@ -2185,7 +2352,6 @@ CONTAINS
   END SUBROUTINE H5Awrite_char_scalar_fix
 
   SUBROUTINE H5Awrite_char_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2202,7 +2368,6 @@ CONTAINS
   END SUBROUTINE H5Awrite_char_1
 
   SUBROUTINE H5Awrite_char_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2219,7 +2384,6 @@ CONTAINS
   END SUBROUTINE H5Awrite_char_2
 
   SUBROUTINE H5Awrite_char_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2237,7 +2401,6 @@ CONTAINS
   END SUBROUTINE H5Awrite_char_3
 
   SUBROUTINE H5Awrite_char_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2255,7 +2418,6 @@ CONTAINS
   END SUBROUTINE H5Awrite_char_4
 
   SUBROUTINE H5Awrite_char_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2274,7 +2436,6 @@ CONTAINS
 
 
   SUBROUTINE H5Awrite_char_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2292,7 +2453,6 @@ CONTAINS
   END SUBROUTINE H5Awrite_char_6
 
   SUBROUTINE H5Awrite_char_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2335,7 +2495,7 @@ CONTAINS
 !
 ! NOTES
 !  This function is overloaded to write INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
+!  REAL, REAL(KIND=C_DOUBLE) and CHARACTER buffers
 !  up to 7 dimensions.
 !
 ! Fortran2003 Interface:
@@ -2347,7 +2507,6 @@ CONTAINS
 !*****
 
   SUBROUTINE H5Awrite_ptr(attr_id, mem_type_id, buf, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id     ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
@@ -2396,7 +2555,7 @@ CONTAINS
 !
 ! NOTES
 !  This function is overloaded to write INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
+!  REAL, REAL(KIND=C_DOUBLE) and CHARACTER buffers
 !  up to 7 dimensions.
 ! Fortran90 Interface:
 !!  SUBROUTINE H5Aread_f(attr_id, memtype_id, buf, dims, hdferr) 
@@ -2407,7 +2566,6 @@ CONTAINS
 !!    INTEGER         , INTENT(OUT)              :: hdferr
 !*****
   SUBROUTINE H5Aread_integer_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2423,7 +2581,6 @@ CONTAINS
   END SUBROUTINE H5Aread_integer_scalar
 
   SUBROUTINE H5Aread_integer_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2440,7 +2597,6 @@ CONTAINS
 
 
   SUBROUTINE H5Aread_integer_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2457,7 +2613,6 @@ CONTAINS
 
 
   SUBROUTINE H5Aread_integer_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2475,7 +2630,6 @@ CONTAINS
 
 
   SUBROUTINE H5Aread_integer_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2493,7 +2647,6 @@ CONTAINS
 
 
   SUBROUTINE H5Aread_integer_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2511,7 +2664,6 @@ CONTAINS
 
 
   SUBROUTINE H5Aread_integer_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2529,7 +2681,6 @@ CONTAINS
 
 
   SUBROUTINE H5Aread_integer_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2546,30 +2697,28 @@ CONTAINS
   END SUBROUTINE H5Aread_integer_7
 
 
-  SUBROUTINE H5Aread_real_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Aread_c_float_scalar(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), TARGET :: buf                 ! Attribute data
+    REAL(KIND=C_FLOAT), INTENT(INOUT), TARGET :: buf                 ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
     TYPE(C_PTR) :: f_ptr
 
     f_ptr = C_LOC(buf)
 
     hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Aread_real_scalar
+  END SUBROUTINE H5Aread_c_float_scalar
 
-  SUBROUTINE H5Aread_real_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Aread_c_float_1(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1)), TARGET :: buf  ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
     TYPE(C_PTR) :: f_ptr
@@ -2577,17 +2726,15 @@ CONTAINS
     f_ptr = C_LOC(buf(1))
 
     hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Aread_real_1
-
+  END SUBROUTINE H5Aread_c_float_1
 
-  SUBROUTINE H5Aread_real_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Aread_c_float_2(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2)), TARGET :: buf ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
     TYPE(C_PTR) :: f_ptr
@@ -2595,17 +2742,16 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1))
 
     hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Aread_real_2
+  END SUBROUTINE H5Aread_c_float_2
 
 
-  SUBROUTINE H5Aread_real_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Aread_c_float_3(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
                                             ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -2614,17 +2760,16 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1,1))
 
     hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Aread_real_3
+  END SUBROUTINE H5Aread_c_float_3
 
 
-  SUBROUTINE H5Aread_real_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Aread_c_float_4(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
     TYPE(C_PTR) :: f_ptr
@@ -2632,17 +2777,16 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1,1,1))
 
     hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Aread_real_4
+  END SUBROUTINE H5Aread_c_float_4
 
 
-  SUBROUTINE H5Aread_real_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Aread_c_float_5(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
     TYPE(C_PTR) :: f_ptr
@@ -2650,17 +2794,16 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1,1,1,1))
 
     hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Aread_real_5
+  END SUBROUTINE H5Aread_c_float_5
 
 
-  SUBROUTINE H5Aread_real_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Aread_c_float_6(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
     TYPE(C_PTR) :: f_ptr
@@ -2668,17 +2811,16 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1,1,1,1,1))
 
     hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Aread_real_6
+  END SUBROUTINE H5Aread_c_float_6
 
 
-  SUBROUTINE H5Aread_real_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
+  SUBROUTINE H5Aread_c_float_7(attr_id, memtype_id, buf, dims, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                              ! identifier  (in memory)
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims ! Array to story buf dimension sizes
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
     TYPE(C_PTR) :: f_ptr
@@ -2686,10 +2828,148 @@ CONTAINS
     f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
 
     hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
-  END SUBROUTINE H5Aread_real_7
+  END SUBROUTINE H5Aread_c_float_7
+
+  SUBROUTINE h5aread_c_double_scalar(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), TARGET :: buf    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf)
+
+    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5aread_c_double_scalar
+
+  SUBROUTINE h5aread_c_double_1(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1))
+
+    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5aread_c_double_1
+
+
+  SUBROUTINE h5aread_c_double_2(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1))
+
+    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5aread_c_double_2
+
+  SUBROUTINE h5aread_c_double_3(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
+                                            ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1))
+
+    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5aread_c_double_3
+
+  SUBROUTINE h5aread_c_double_4(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1))
+
+    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5aread_c_double_4
+
+
+  SUBROUTINE h5aread_c_double_5(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1))
+
+    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
+
+  END SUBROUTINE h5aread_c_double_5
+
+
+  SUBROUTINE h5aread_c_double_6(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1))
+
+    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5aread_c_double_6
+
+
+  SUBROUTINE h5aread_c_double_7(attr_id, memtype_id,  buf, dims, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
+                                                ! identifier  (in memory)
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
+    ! Attribute data
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    TYPE(C_PTR) :: f_ptr
+
+    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
+
+    hdferr = H5Aread_f_c(attr_id, memtype_id, f_ptr)
+  END SUBROUTINE h5aread_c_double_7
 
   SUBROUTINE H5Aread_char_scalar(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2703,7 +2983,6 @@ CONTAINS
   END SUBROUTINE H5Aread_char_scalar
 
   SUBROUTINE H5Aread_char_scalar_fix(attr_id, memtype_id, buf, buf_len, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2720,7 +2999,6 @@ CONTAINS
   END SUBROUTINE H5Aread_char_scalar_fix
 
   SUBROUTINE H5Aread_char_1(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2736,9 +3014,7 @@ CONTAINS
 
   END SUBROUTINE H5Aread_char_1
 
-
   SUBROUTINE H5Aread_char_2(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2754,9 +3030,7 @@ CONTAINS
 
   END SUBROUTINE H5Aread_char_2
 
-
   SUBROUTINE H5Aread_char_3(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2773,7 +3047,6 @@ CONTAINS
   END SUBROUTINE H5Aread_char_3
 
   SUBROUTINE H5Aread_char_4(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2791,7 +3064,6 @@ CONTAINS
   END SUBROUTINE H5Aread_char_4
 
   SUBROUTINE H5Aread_char_5(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2809,7 +3081,6 @@ CONTAINS
 
 
   SUBROUTINE H5Aread_char_6(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2827,7 +3098,6 @@ CONTAINS
 
 
   SUBROUTINE H5Aread_char_7(attr_id, memtype_id, buf, dims, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
@@ -2879,7 +3149,7 @@ CONTAINS
 !
 ! NOTES
 !  This function is overloaded to write INTEGER,
-!  REAL, DOUBLE PRECISION and CHARACTER buffers
+!  REAL, REAL(KIND=C_DOUBLE) and CHARACTER buffers
 !  up to 7 dimensions.
 ! Fortran2003 Interface:
 !!  SUBROUTINE H5Aread_f(attr_id, memtype_id, buf, hdferr) 
@@ -2890,7 +3160,6 @@ CONTAINS
 !*****
 
   SUBROUTINE H5Aread_ptr(attr_id, mem_type_id, buf, hdferr)
-    USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id     ! Attribute identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index 2bffe02..5845cf8 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -129,463 +129,6 @@ DONE:
 }
 
 
-/****if* H5Df/h5dwritec_c
- * NAME
- *  h5dwritec_c
- * PURPOSE
- *  Call h5dwrite_c to write a dataset of characters
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- *              buf      - character data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Tuesday, May 14, 2002
- * HISTORY
- * This function is added to accomodate oveloaded h5dwrite_f
- *                with the dims argument being of INTEGER(HSIZE_T) type
-
- * SOURCE
-*/
-int_f
-h5dwritec_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-/******/
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dwritec_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dwritec_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dwritec_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dwritec_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dwritec_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dwritec_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dwritec_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dwritec_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dwrite_c  function.
-      */
-     ret_value = h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-/****if* H5Df/h5dwrite_c
- * NAME
- *  h5dwrite_c
- * PURPOSE
- *  Call H5Dwrite to write a dataset
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- *              buf      - data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Tuesday, May 14, 2002
- * HISTORY
- * This function is added to accomodate oveloaded h5dwrite_f
- *                with the dims argument being of INTEGER(HSIZE_T) type
- *
- *                Added h5dwrite_integer(real,double)_s,1-7_c functions to eliminate
- *                complains about wrong parameter types in h5dwrite_c function
- *                called by Fortran rouitnes
- *                                           October 10, 2006 EIP
- *
- * SOURCE
-*/
-int_f
-h5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f UNUSED *dims)
-/******/
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_dset_id;
-     hid_t c_mem_type_id;
-     hid_t c_mem_space_id;
-     hid_t c_file_space_id;
-     hid_t c_xfer_prp;
-
-     /*
-      * Define transfer property
-      */
-     c_xfer_prp = (hid_t)*xfer_prp;
-
-     /*
-      * Call H5Dwrite function.
-      */
-     c_dset_id = (hid_t)*dset_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_mem_space_id = (hid_t)*mem_space_id;
-     c_file_space_id = (hid_t)*file_space_id;
-     ret = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-int_f
-h5dwrite_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-h5dwrite_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-h5dwrite_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-h5dwrite_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-h5dwrite_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-h5dwrite_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-h5dwrite_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-h5dwrite_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
-int_f
-h5dwrite_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dwrite_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dwrite_c  function.
-      */
-     return h5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-
 /****if* H5Df/h5dwrite_ref_obj_c
  * NAME
  *  h5dwrite_ref_obj_c
@@ -724,456 +267,6 @@ h5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i
 }
 
 
-
-/****if* H5Df/h5dreadc_c
- * NAME
- *  h5dreadc_c
- * PURPOSE
- *  Call h5dread_c to read a dataset of characters
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- * OUTPUTS
- *     buf      - character data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Wednesday, May 15, 2002
- * HISTORY
- * This function was added to accomodate h5dread_f subroutine
- *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
- * SOURCE
-*/
-int_f
-h5dreadc_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-/******/
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dreadc_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dreadc_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dreadc_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dreadc_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dreadc_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dreadc_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dreadc_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-int_f
-h5dreadc_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
-
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dread_c  function.
-      */
-     ret_value = h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
-
-     return ret_value;
-}
-
-/****if* H5Df/h5dread_c
- * NAME
- *  h5dread_c
- * PURPOSE
- *  Call H5Draed to read a dataset
- * INPUTS
- *      dset_id - dataset identifier
- *              mem_type_id - memory datatype identifier
- *              mem_space_id - memory dataspace identifier
- *              file_space_id - memory dataspace identifier
- *              xfer_pr  - identifier of transfer property list
- * OUTPUTS
- *     buf      - data buffer
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              Wednesday, May 15, 2002
- * HISTORY
- * This function was added to accomodate h5dread_f subroutine
- *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
- *
- *                Added h5dread_integer(real,double)_s,1-7_c functions to eliminate
- *                complains about wrong parameter types in h5dwrite_c function
- *                called by Fortran rouitnes
- *                                           October 10, 2006 EIP
- *
- * SOURCE
-*/
-int_f
-h5dread_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f UNUSED *dims)
-/******/
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_dset_id;
-     hid_t c_mem_type_id;
-     hid_t c_mem_space_id;
-     hid_t c_file_space_id;
-     hid_t c_xfer_prp;
-
-     /*
-      * Define transfer property
-      */
-     c_xfer_prp = (hid_t)*xfer_prp;
-
-     /*
-      * Call H5Dread function.
-      */
-     c_dset_id = (hid_t)*dset_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_mem_space_id = (hid_t)*mem_space_id;
-     c_file_space_id = (hid_t)*file_space_id;
-     ret = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-int_f
-h5dread_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
-int_f
-h5dread_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
-
-{
-     /*
-      * Call h5dread_c  function.
-      */
-     return h5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
-}
-
 /****if* H5Df/h5dread_ref_obj_c
  * NAME
  *  h5dread_ref_obj_c
@@ -2058,39 +1151,6 @@ DONE:
   return ret_value;
 }
 
-/****if* H5Df/h5dfillc_c
- * NAME
- *  h5dfillc_c
- * PURPOSE
- *  Call h5fill_c to fill memory buffer with a fill value
- * INPUTS
- *  fill_value   - fill value
- *  fill_type_id - fill value datatype identifier
- *  space_id     - memory space selection identifier
- *  buf          - memory buffer to fill
- *  mem_type_id  - memory buffer dtatype identifier
- * RETURNS
- *  0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  Wednesday, March 12, 2003
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-h5dfillc_c (_fcd fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, _fcd buf, hid_t_f *mem_type_id)
-/******/
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5dfill_c  function.
-      */
-     ret_value = h5dfill_c(_fcdtocp(fill_value), fill_type_id, space_id, _fcdtocp(buf), mem_type_id);
-
-     return ret_value;
-}
 /****if* H5Df/h5dfill_c
  * NAME
  *  h5dfill_c
@@ -2135,78 +1195,6 @@ h5dfill_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * b
      return ret_value;
 }
 
-int_f
-h5dfill_integer_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
-
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_fill_type_id;
-     hid_t c_mem_type_id;
-     hid_t c_space_id;
-
-     c_fill_type_id = (hid_t)*fill_type_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_space_id = (hid_t)*space_id;
-
-     /*
-      * Call H5Dfill function.
-      */
-     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-int_f
-h5dfill_real_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
-
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_fill_type_id;
-     hid_t c_mem_type_id;
-     hid_t c_space_id;
-
-     c_fill_type_id = (hid_t)*fill_type_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_space_id = (hid_t)*space_id;
-
-     /*
-      * Call H5Dfill function.
-      */
-     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
-int_f
-h5dfill_double_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
-
-{
-     int ret_value = -1;
-     herr_t ret;
-     hid_t c_fill_type_id;
-     hid_t c_mem_type_id;
-     hid_t c_space_id;
-
-     c_fill_type_id = (hid_t)*fill_type_id;
-     c_mem_type_id = (hid_t)*mem_type_id;
-     c_space_id = (hid_t)*space_id;
-
-     /*
-      * Call H5Dfill function.
-      */
-     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
-
-     if (ret < 0) return ret_value;
-     ret_value = 0;
-     return ret_value;
-}
-
 /****if* H5Df/h5dget_space_status_c
  * NAME
  *  h5dget_space_status_c
diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90
index 411a3bf..a7120f6 100644
--- a/fortran/src/H5Dff.F90
+++ b/fortran/src/H5Dff.F90
@@ -81,7 +81,7 @@
 
 MODULE H5D
   
-  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR
+  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_CHAR, C_FLOAT, C_DOUBLE, C_LOC
   USE H5GLOBAL
 
   INTERFACE h5dextend_f
@@ -120,14 +120,22 @@ MODULE H5D
      MODULE PROCEDURE h5dwrite_char_5
      MODULE PROCEDURE h5dwrite_char_6
      MODULE PROCEDURE h5dwrite_char_7
-     MODULE PROCEDURE h5dwrite_real_scalar
-     MODULE PROCEDURE h5dwrite_real_1
-     MODULE PROCEDURE h5dwrite_real_2
-     MODULE PROCEDURE h5dwrite_real_3
-     MODULE PROCEDURE h5dwrite_real_4
-     MODULE PROCEDURE h5dwrite_real_5
-     MODULE PROCEDURE h5dwrite_real_6
-     MODULE PROCEDURE h5dwrite_real_7
+     MODULE PROCEDURE h5dwrite_c_float_scalar
+     MODULE PROCEDURE h5dwrite_c_float_1
+     MODULE PROCEDURE h5dwrite_c_float_2
+     MODULE PROCEDURE h5dwrite_c_float_3
+     MODULE PROCEDURE h5dwrite_c_float_4
+     MODULE PROCEDURE h5dwrite_c_float_5
+     MODULE PROCEDURE h5dwrite_c_float_6
+     MODULE PROCEDURE h5dwrite_c_float_7
+     MODULE PROCEDURE h5dwrite_c_double_scalar
+     MODULE PROCEDURE h5dwrite_c_double_1
+     MODULE PROCEDURE h5dwrite_c_double_2
+     MODULE PROCEDURE h5dwrite_c_double_3
+     MODULE PROCEDURE h5dwrite_c_double_4
+     MODULE PROCEDURE h5dwrite_c_double_5
+     MODULE PROCEDURE h5dwrite_c_double_6
+     MODULE PROCEDURE h5dwrite_c_double_7
 
      ! This is the preferred way to call h5dwrite
      ! by passing an address
@@ -155,14 +163,22 @@ MODULE H5D
      MODULE PROCEDURE h5dread_char_5
      MODULE PROCEDURE h5dread_char_6
      MODULE PROCEDURE h5dread_char_7
-     MODULE PROCEDURE h5dread_real_scalar
-     MODULE PROCEDURE h5dread_real_1
-     MODULE PROCEDURE h5dread_real_2
-     MODULE PROCEDURE h5dread_real_3
-     MODULE PROCEDURE h5dread_real_4
-     MODULE PROCEDURE h5dread_real_5
-     MODULE PROCEDURE h5dread_real_6
-     MODULE PROCEDURE h5dread_real_7
+     MODULE PROCEDURE h5dread_c_float_scalar
+     MODULE PROCEDURE h5dread_c_float_1
+     MODULE PROCEDURE h5dread_c_float_2
+     MODULE PROCEDURE h5dread_c_float_3
+     MODULE PROCEDURE h5dread_c_float_4
+     MODULE PROCEDURE h5dread_c_float_5
+     MODULE PROCEDURE h5dread_c_float_6
+     MODULE PROCEDURE h5dread_c_float_7
+     MODULE PROCEDURE h5dread_c_double_scalar
+     MODULE PROCEDURE h5dread_c_double_1
+     MODULE PROCEDURE h5dread_c_double_2
+     MODULE PROCEDURE h5dread_c_double_3
+     MODULE PROCEDURE h5dread_c_double_4
+     MODULE PROCEDURE h5dread_c_double_5
+     MODULE PROCEDURE h5dread_c_double_6
+     MODULE PROCEDURE h5dread_c_double_7
 
      ! This is the preferred way to call h5dread
      ! by passing an address
@@ -170,6 +186,7 @@ MODULE H5D
 
   END INTERFACE
 
+
 !  Interface for the function used to pass the C pointer of the buffer
 !  to the C H5Dwrite routine
 
@@ -212,7 +229,8 @@ MODULE H5D
 
   INTERFACE h5dfill_f
      MODULE PROCEDURE h5dfill_integer
-     MODULE PROCEDURE h5dfill_real
+     MODULE PROCEDURE h5dfill_c_float
+     MODULE PROCEDURE h5dfill_c_double
      MODULE PROCEDURE h5dfill_char
   END INTERFACE
 
@@ -1862,14 +1880,14 @@ CONTAINS
   END SUBROUTINE h5dwrite_char_7
 
 
-  SUBROUTINE h5dwrite_real_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dwrite_c_float_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), TARGET :: buf ! Data buffer
+    REAL(KIND=C_FLOAT), INTENT(IN), TARGET :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
@@ -1890,17 +1908,17 @@ CONTAINS
     hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dwrite_real_scalar
+  END SUBROUTINE h5dwrite_c_float_scalar
 
 
-  SUBROUTINE h5dwrite_real_1(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dwrite_c_float_1(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1)), TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -1923,16 +1941,16 @@ CONTAINS
     hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dwrite_real_1
+  END SUBROUTINE h5dwrite_c_float_1
 
-  SUBROUTINE h5dwrite_real_2(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dwrite_c_float_2(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2)), TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -1956,16 +1974,16 @@ CONTAINS
     hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dwrite_real_2
+  END SUBROUTINE h5dwrite_c_float_2
 
-  SUBROUTINE h5dwrite_real_3(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dwrite_c_float_3(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -1988,16 +2006,16 @@ CONTAINS
     hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dwrite_real_3
+  END SUBROUTINE h5dwrite_c_float_3
 
-  SUBROUTINE h5dwrite_real_4(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dwrite_c_float_4(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -2020,16 +2038,16 @@ CONTAINS
     hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dwrite_real_4
+  END SUBROUTINE h5dwrite_c_float_4
 
-  SUBROUTINE h5dwrite_real_5(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dwrite_c_float_5(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -2052,16 +2070,16 @@ CONTAINS
     hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dwrite_real_5
+  END SUBROUTINE h5dwrite_c_float_5
 
-  SUBROUTINE h5dwrite_real_6(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dwrite_c_float_6(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -2084,16 +2102,16 @@ CONTAINS
     hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dwrite_real_6
+  END SUBROUTINE h5dwrite_c_float_6
 
-  SUBROUTINE h5dwrite_real_7(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dwrite_c_float_7(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(IN), &
+    REAL(KIND=C_FLOAT), INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -2116,7 +2134,7 @@ CONTAINS
     hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dwrite_real_7
+  END SUBROUTINE h5dwrite_c_float_7
 
 !
 ! NAME		
@@ -2807,7 +2825,7 @@ CONTAINS
 
   END SUBROUTINE h5dread_char_7
 
-  SUBROUTINE h5dread_real_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dread_c_float_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
 
     USE, INTRINSIC :: ISO_C_BINDING
@@ -2815,7 +2833,7 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT) , TARGET :: buf ! Data buffer
+    REAL(KIND=C_FLOAT), INTENT(INOUT), TARGET :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id ! File dataspace identfier
@@ -2837,16 +2855,16 @@ CONTAINS
     hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dread_real_scalar
+  END SUBROUTINE h5dread_c_float_scalar
 
-  SUBROUTINE h5dread_real_1(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dread_c_float_1(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1)) , TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -2869,16 +2887,16 @@ CONTAINS
     hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dread_real_1
+  END SUBROUTINE h5dread_c_float_1
 
-  SUBROUTINE h5dread_real_2(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dread_c_float_2(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2)) , TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -2901,16 +2919,16 @@ CONTAINS
     hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dread_real_2
+  END SUBROUTINE h5dread_c_float_2
 
-  SUBROUTINE h5dread_real_3(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dread_c_float_3(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3)) , TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -2933,16 +2951,16 @@ CONTAINS
     hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dread_real_3
+  END SUBROUTINE h5dread_c_float_3
 
-  SUBROUTINE h5dread_real_4(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dread_c_float_4(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3), dims(4)) , TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -2965,16 +2983,16 @@ CONTAINS
     hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dread_real_4
+  END SUBROUTINE h5dread_c_float_4
 
-  SUBROUTINE h5dread_real_5(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dread_c_float_5(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) , TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -2997,9 +3015,9 @@ CONTAINS
     hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dread_real_5
+  END SUBROUTINE h5dread_c_float_5
 
-  SUBROUTINE h5dread_real_6(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dread_c_float_6(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
 
     USE, INTRINSIC :: ISO_C_BINDING
@@ -3007,7 +3025,7 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) , TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -3030,16 +3048,16 @@ CONTAINS
     hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dread_real_6
+  END SUBROUTINE h5dread_c_float_6
 
-  SUBROUTINE h5dread_real_7(dset_id, mem_type_id, buf, dims, hdferr, &
+  SUBROUTINE h5dread_c_float_7(dset_id, mem_type_id, buf, dims, hdferr, &
        mem_space_id, file_space_id, xfer_prp)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
     INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    REAL, INTENT(INOUT), &
+    REAL(KIND=C_FLOAT), INTENT(INOUT), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) , TARGET :: buf
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -3063,7 +3081,571 @@ CONTAINS
     hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
          file_space_id_default, xfer_prp_default, f_ptr)
 
-  END SUBROUTINE h5dread_real_7
+  END SUBROUTINE h5dread_c_float_7
+
+  SUBROUTINE h5dread_c_double_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), TARGET :: buf ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+
+    f_ptr = C_LOC(buf)
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dread_c_double_scalar
+
+  SUBROUTINE h5dread_c_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1))
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dread_c_double_1
+
+  SUBROUTINE h5dread_c_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1))
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dread_c_double_2
+
+  SUBROUTINE h5dread_c_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1,1))
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dread_c_double_3
+
+  SUBROUTINE h5dread_c_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
+    ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1,1,1))
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dread_c_double_4
+
+  SUBROUTINE h5dread_c_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+
+    f_ptr = C_LOC(buf(1,1,1,1,1))
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dread_c_double_5
+
+  SUBROUTINE h5dread_c_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
+    ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1,1,1,1,1))
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dread_c_double_6
+
+  SUBROUTINE h5dread_c_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(INOUT), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
+    ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
+
+    hdferr = h5dread_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dread_c_double_7
+
+  SUBROUTINE h5dwrite_c_double_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(IN), TARGET :: buf ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf)
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_c_double_scalar
+
+  SUBROUTINE h5dwrite_c_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1))
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_c_double_1
+
+  SUBROUTINE h5dwrite_c_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1))
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_c_double_2
+
+  SUBROUTINE h5dwrite_c_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1,1))
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_c_double_3
+
+  SUBROUTINE h5dwrite_c_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1,1,1))
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_c_double_4
+
+  SUBROUTINE h5dwrite_c_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)), TARGET :: buf
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1,1,1,1))
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_c_double_5
+
+  SUBROUTINE h5dwrite_c_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)), TARGET :: buf
+    ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1,1,1,1,1))
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_c_double_6
+
+  SUBROUTINE h5dwrite_c_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
+       mem_space_id, file_space_id, xfer_prp)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
+    REAL(KIND=C_DOUBLE), INTENT(IN), &
+         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)), TARGET :: buf
+    ! Data buffer
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+    ! Memory dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+    ! File dataspace identfier
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+    ! Transfer property list identifier
+
+    INTEGER(HID_T) :: xfer_prp_default
+    INTEGER(HID_T) :: mem_space_id_default
+    INTEGER(HID_T) :: file_space_id_default
+    TYPE(C_PTR) :: f_ptr
+
+    xfer_prp_default = H5P_DEFAULT_F
+    mem_space_id_default = H5S_ALL_F
+    file_space_id_default = H5S_ALL_F
+
+    if (present(xfer_prp)) xfer_prp_default = xfer_prp
+    if (present(mem_space_id))  mem_space_id_default = mem_space_id
+    if (present(file_space_id)) file_space_id_default = file_space_id
+    f_ptr = C_LOC(buf(1,1,1,1,1,1,1))
+
+    hdferr = h5dwrite_f_c(dset_id, mem_type_id, mem_space_id_default, &
+         file_space_id_default, xfer_prp_default, f_ptr)
+
+  END SUBROUTINE h5dwrite_c_double_7
 
 !****s* H5D (F03)/h5dwrite_f_F03
 !
@@ -3247,7 +3829,7 @@ CONTAINS
 
 !
 ! NAME
-!  h5dfill_real
+!  h5dfill_c_float
 !
 ! PURPOSE
 !  Fills dataspace elements with a fill value in a memory buffer.
@@ -3270,12 +3852,12 @@ CONTAINS
 !  Elena Pourmal
 !  March 12, 2003
 !
-  SUBROUTINE h5dfill_real(fill_valuer, space_id, buf,  hdferr)
+  SUBROUTINE h5dfill_c_float(fill_valuer, space_id, buf,  hdferr)
     USE, INTRINSIC :: ISO_C_BINDING
     IMPLICIT NONE
-    REAL, INTENT(IN), TARGET :: fill_valuer  ! Fill value
+    REAL(KIND=C_FLOAT), INTENT(IN), TARGET :: fill_valuer  ! Fill value
     INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-    REAL, INTENT(IN), DIMENSION(*), TARGET :: buf ! Memory buffer to fill in
+    REAL(KIND=C_FLOAT), INTENT(IN), DIMENSION(*), TARGET :: buf ! Memory buffer to fill in
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
 
     INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
@@ -3293,7 +3875,55 @@ CONTAINS
     hdferr = h5dfill_c(f_ptr_fill_valuer, fill_type_id, space_id, &
          f_ptr_buf, mem_type_id)
 
-  END SUBROUTINE h5dfill_real
+  END SUBROUTINE h5dfill_c_float
+
+  !----------------------------------------------------------------------
+  ! Name:	  h5dfill_c_double
+  !
+  ! Purpose:      Fills dataspace elements with a fill value in a memory buffer.
+  !               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
+  !               of the fillvalues and buffers are supported. Buffer and fillvalue
+  !               are assumed to have the same datatype.
+  !               Only one-dimesional buffers are supported.
+  !
+  ! Inputs:
+  !		fill_value	- fill value
+  !		space_id	- memory space selection identifier
+  !		buf		- data buffer iin memory ro apply selection to
+  !				- of k-th dimension of the buf array
+  ! Outputs:
+  !		hdferr:		- error code
+  !				 	Success:  0
+  !				 	Failure: -1
+  !
+  ! Programmer:	Elena Pourmal
+  !		March 12, 2003
+  !
+  !----------------------------------------------------------------------
+
+  SUBROUTINE h5dfill_c_double(fill_value, space_id, buf,  hdferr)
+    IMPLICIT NONE
+    REAL(KIND=C_DOUBLE), INTENT(IN), TARGET :: fill_value  ! Fill value
+    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
+    REAL(KIND=C_DOUBLE), INTENT(IN), DIMENSION(*), TARGET :: buf ! Memory buffer to fill in
+    INTEGER, INTENT(OUT) :: hdferr      ! Error code
+
+    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
+    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
+
+    TYPE(C_PTR) :: f_ptr_fill_valuer ! C pointer to fill_value
+    TYPE(C_PTR) :: f_ptr_buf ! C pointer to buf
+
+    f_ptr_fill_valuer = C_LOC(fill_value)
+    f_ptr_buf = C_LOC(buf(1))
+
+    fill_type_id = H5T_NATIVE_DOUBLE
+    mem_type_id  = H5T_NATIVE_DOUBLE
+
+    hdferr = h5dfill_c(f_ptr_fill_valuer, fill_type_id, space_id, &
+         f_ptr_buf, mem_type_id)
+
+  END SUBROUTINE h5dfill_c_double
 
 !
 ! NAME		
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index bee2806..61259ff 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -394,36 +394,6 @@ h5pget_chunk_c ( hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims )
   return ret_value;
 }
 
-/****if* H5Pf/h5pset_fill_valuec_c
- * NAME
- *  h5pset_fill_valuec_c
- * PURPOSE
- *  Call h5pset_fill_value_c to a character fill value
- * INPUTS
- *  prp_id - property list identifier
- *  type_id - datatype identifier (fill value is of type type_id)
- *  fillvalue  - character value
- * RETURNS
- *  0 on success, -1 on failure
- *  Saturday, August 14, 1999
- * AUTHOR
- *  Elena Pourmal
- * SOURCE
-*/
-int_f
-h5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
-/******/
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5pset_fill_value_c  function.
-      */
-     ret_value = h5pset_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
-
-     return ret_value;
-}
-
 /****if* H5Pf/h5pset_fill_value_c
  * NAME
  *  h5pset_fill_value_c
@@ -461,68 +431,6 @@ h5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
      return ret_value;
 }
 
-int_f
-h5pset_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-/******/
-{
-     /*
-      * Call h5pset_fill_value_c  function.
-      */
-     return h5pset_fill_value_c(prp_id, type_id, fillvalue);
-}
-
-int_f
-h5pset_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-{
-     /*
-      * Call h5pset_fill_value_c  function.
-      */
-     return h5pset_fill_value_c(prp_id, type_id, fillvalue);
-}
-
-int_f
-h5pset_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-{
-     /*
-      * Call h5pset_fill_value_c  function.
-      */
-     return h5pset_fill_value_c(prp_id, type_id, fillvalue);
-}
-
-/****if* H5Pf/h5pget_fill_valuec_c
- * NAME
- *  h5pget_fill_valuec_c
- * PURPOSE
- *  Call h5pget_fill_value_c to a character fill value
- * INPUTS
- *  prp_id     - property list identifier
- *  type_id    - datatype identifier (fill value is of type type_id)
- *  fillvalue - character value
- * RETURNS
- *  0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  Saturday, August 14, 1999
- * HISTORY
- *  Fixed wrong call to C wrapper, was h5pset_fill_value_c, changed
- *  to h5pget_fill_value_c. MSB - 7/21/2014
- *
- * SOURCE
-*/
-int_f
-h5pget_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
-/******/
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5pget_fill_value_c function.
-      */
-     ret_value = h5pget_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
-
-     return ret_value;
-}
-
 /****if* H5Pf/h5pget_fill_value_c
  * NAME
  *  h5pget_fill_value_c
@@ -560,33 +468,6 @@ h5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
      return ret_value;
 }
 
-int_f
-h5pget_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-{
-     /*
-      * Call h5pget_fill_value_c  function.
-      */
-     return h5pget_fill_value_c(prp_id, type_id, fillvalue);
-}
-
-int_f
-h5pget_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-{
-     /*
-      * Call h5pget_fill_value_c  function.
-      */
-     return h5pget_fill_value_c(prp_id, type_id, fillvalue);
-}
-
-int_f
-h5pget_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
-{
-     /*
-      * Call h5pget_fill_value_c  function.
-      */
-     return h5pget_fill_value_c(prp_id, type_id, fillvalue);
-}
-
 /****if* H5Pf/h5pget_version_c
  * NAME
  *        h5pget_version_c
@@ -2831,40 +2712,6 @@ DONE:
      return ret_value;
 }
 
-
-/****if* H5Pf/h5pregisterc_c
- * NAME
- *  h5pregisterc_c
- * PURPOSE
- *  Call h5pregister_c to registers a permanent property
- * INPUTS
- *  class - property list class identifier
- *  name   - name of the new property
- *  name_len - length of the "name" buffer
- *  size - property size
- *  value - property value of character type
- * RETURNS
- *  0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  October 11, 2002
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-h5pregisterc_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, _fcd value, int_f UNUSED *value_len)
-/******/
-{
-     int ret_value = -1;
-
-     /*
-      * Call h5pregister_c function
-      */
-      ret_value = h5pregister_c(cls, name, name_len, size, _fcdtocp(value));
-      return ret_value;
-}
-
 /****if* H5Pf/h5pregister_c
  * NAME
  *  h5pregister_c
@@ -2908,66 +2755,6 @@ DONE:
      return ret_value;
 }
 
-int_f
-h5pregister_integer_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pregister_c function
-      */
-     return h5pregister_c(cls, name, name_len, size, value);
-}
-
-int_f
-h5pregister_real_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pregister_c function
-      */
-     return h5pregister_c(cls, name, name_len, size, value);
-}
-
-int_f
-h5pregister_double_c(hid_t_f *cls, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pregister_c function
-      */
-     return h5pregister_c(cls, name, name_len, size, value);
-}
-
-/****if* H5Pf/h5pinsertc_c
- * NAME
- *  h5pinsertc_c
- * PURPOSE
- *  Call h5pinsert_c to register a temporary property
- * INPUTS
- *  plist - property list identifier
- *  name   - name of the new property
- *  name_len - length of the "name" buffer
- *  size - property size
- *  value - property value of character type
- * RETURNS
- *  0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *  October 11, 2002
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-h5pinsertc_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, _fcd value, int_f UNUSED *value_len)
-/******/
-{
-     int_f ret_value = -1;
-
-     /*
-      * Call h5pinsert_c function
-      */
-      ret_value = h5pinsert_c(plist, name, name_len, size, _fcdtocp(value));
-      return ret_value;
-}
-
 /****if* H5Pf/h5pinsert_c
  * NAME
  *  h5pinsert_c
@@ -3011,33 +2798,6 @@ DONE:
      return ret_value;
 }
 
-int_f
-h5pinsert_integer_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pinsert_c function
-      */
-     return h5pinsert_c(plist, name, name_len, size, value);
-}
-
-int_f
-h5pinsert_real_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pinsert_c function
-      */
-     return h5pinsert_c(plist, name, name_len, size, value);
-}
-
-int_f
-h5pinsert_double_c(hid_t_f *plist, _fcd name, int_f *name_len, size_t_f *size, void *value)
-{
-     /*
-      * Call h5pinsert_c function
-      */
-     return h5pinsert_c(plist, name, name_len, size, value);
-}
-
 /****if* H5Pf/h5pexist_c
  * NAME
  *        h5pexist_c
@@ -3434,38 +3194,6 @@ DONE:
      return ret_value;
 }
 
-/****if* H5Pf/h5psetc_c
- * NAME
- *        h5psetc_c
- * PURPOSE
- *     Call h5setc_c to set property with the character string value
- * INPUTS
- *      plist - property list identifier
- *              name   - name of property
- *              name_len - length of the "name" buffer
- *              value - property value of character type
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              October 11, 2002
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-h5psetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED *value_len)
-/******/
-{
-     int_f ret_value = -1;
-
-     /*
-      * Call h5pset_c function
-      */
-      ret_value = h5pset_c(plist, name, name_len, _fcdtocp(value));
-      return ret_value;
-}
-
 /****if* H5Pf/h5pset_c
  * NAME
  *  h5pset_c
@@ -3506,64 +3234,6 @@ DONE:
      return ret_value;
 }
 
-int_f
-h5pset_integer_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pset_c function
-      */
-     return h5pset_c(plist, name, name_len, value);
-}
-
-int_f
-h5pset_real_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pset_c function
-      */
-     return h5pset_c(plist, name, name_len, value);
-}
-
-int_f
-h5pset_double_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pset_c function
-      */
-     return h5pset_c(plist, name, name_len, value);
-}
-/****if* H5Pf/h5pgetc_c
- * NAME
- *        h5pgetc_c
- * PURPOSE
- *     Call h5set_c to set property with the character string value
- * INPUTS
- *      plist - property list identifier
- *              name   - name of property
- *              name_len - length of the "name" buffer
- * Output:      value - property value of character type
- * RETURNS
- *     0 on success, -1 on failure
- * AUTHOR
- *  Elena Pourmal
- *              October 11, 2002
- * HISTORY
- *
- * SOURCE
-*/
-int_f
-h5pgetc_c(hid_t_f *plist, _fcd name, int_f *name_len, _fcd value, int_f UNUSED *value_len)
-/******/
-{
-     int_f ret_value = -1;
-
-     /*
-      * Call h5pget_c function
-      */
-      ret_value = h5pget_c(plist, name, name_len, _fcdtocp(value));
-      return ret_value;
-}
-
 /****if* H5Pf/h5pget_c
  * NAME
  *  h5pget_c
@@ -3605,34 +3275,6 @@ DONE:
      return ret_value;
 }
 
-int_f
-h5pget_integer_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pget_c function
-      */
-     return h5pget_c(plist, name, name_len, value);
-}
-
-int_f
-h5pget_real_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pget_c function
-      */
-     return h5pget_c(plist, name, name_len, value);
-}
-
-int_f
-h5pget_double_c(hid_t_f *plist, _fcd name, int_f *name_len, void *value)
-{
-     /*
-      * Call h5pget_c function
-      */
-     return h5pget_c(plist, name, name_len, value);
-}
-
-
 /****if* H5Pf/h5pset_shuffle_c
  * NAME
  *        h5pset_shuffle_c
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index b595100..3ec6e93 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -1,12 +1,10 @@
-!****h* ROBODoc/H5P (F90)
+!****h* ROBODoc/H5Pff
 !
 ! NAME
-!  H5P_PROVISIONAL
+!  H5P
 !
 ! PURPOSE
-!  This file contains Fortran interfaces for H5P functions. It includes
-!  all the functions that are independent on whether the Fortran 2003 functions
-!  are enabled or disabled.
+!  This file contains Fortran interfaces for H5P functions.
 !
 ! COPYRIGHT
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -36,7 +34,7 @@
 MODULE H5P
 
   USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_ptr, c_null_ptr, c_funptr, c_null_funptr, &
-       c_char, c_int, C_NULL_CHAR, C_LOC
+       c_char, c_int, C_NULL_CHAR, C_LOC, C_DOUBLE, C_FLOAT
   USE H5GLOBAL
   
   INTERFACE h5pset_fapl_multi_f
@@ -46,7 +44,8 @@ MODULE H5P
 
   INTERFACE h5pset_fill_value_f
      MODULE PROCEDURE h5pset_fill_value_integer
-     MODULE PROCEDURE h5pset_fill_value_real
+     MODULE PROCEDURE h5pset_fill_value_c_float
+     MODULE PROCEDURE h5pset_fill_value_c_double
      MODULE PROCEDURE h5pset_fill_value_char
      ! Recommended procedure:
      MODULE PROCEDURE h5pset_fill_value_ptr
@@ -55,7 +54,8 @@ MODULE H5P
 
   INTERFACE h5pget_fill_value_f
      MODULE PROCEDURE h5pget_fill_value_integer
-     MODULE PROCEDURE h5pget_fill_value_real
+     MODULE PROCEDURE h5pget_fill_value_c_float
+     MODULE PROCEDURE h5pget_fill_value_c_double
      MODULE PROCEDURE h5pget_fill_value_char
      ! Recommended procedure:
      MODULE PROCEDURE h5pget_fill_value_ptr
@@ -64,7 +64,8 @@ MODULE H5P
 
   INTERFACE h5pset_f
      MODULE PROCEDURE h5pset_integer
-     MODULE PROCEDURE h5pset_real
+     MODULE PROCEDURE h5pset_c_float
+     MODULE PROCEDURE h5pset_c_double
      MODULE PROCEDURE h5pset_char
      ! Recommended procedure:
      MODULE PROCEDURE h5pset_ptr
@@ -73,23 +74,24 @@ MODULE H5P
 
   INTERFACE h5pget_f
      MODULE PROCEDURE h5pget_integer
-     MODULE PROCEDURE h5pget_real
-     MODULE PROCEDURE h5pget_char
+     MODULE PROCEDURE h5pget_c_float
+     MODULE PROCEDURE h5pget_c_double
      ! Recommended procedure:
      MODULE PROCEDURE h5pget_ptr
   END INTERFACE
 
   INTERFACE h5pregister_f
      MODULE PROCEDURE h5pregister_integer
-     MODULE PROCEDURE h5pregister_real
-     MODULE PROCEDURE h5pregister_char
+     MODULE PROCEDURE h5pregister_c_float
+     MODULE PROCEDURE h5pregister_c_double
      ! Recommended procedure:
      MODULE PROCEDURE h5pregister_ptr
   END INTERFACE
 
   INTERFACE h5pinsert_f
      MODULE PROCEDURE h5pinsert_integer
-     MODULE PROCEDURE h5pinsert_real
+     MODULE PROCEDURE h5pinsert_c_float
+     MODULE PROCEDURE h5pinsert_c_double
      MODULE PROCEDURE h5pinsert_char
      ! Recommended procedure:
      MODULE PROCEDURE h5pinsert_ptr
@@ -6257,38 +6259,65 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
   END SUBROUTINE h5pget_fill_value_integer
 
 
-  SUBROUTINE h5pset_fill_value_real(prp_id, type_id, fillvalue, hdferr)
+  SUBROUTINE h5pset_fill_value_c_float(prp_id, type_id, fillvalue, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
     INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                           ! of fillvalue datatype
                                           ! (in memory)
-    REAL, INTENT(IN), TARGET :: fillvalue ! Fillvalue
+    REAL(KIND=C_FLOAT), INTENT(IN), TARGET :: fillvalue ! Fillvalue
     INTEGER, INTENT(OUT) :: hdferr        ! Error code
     TYPE(C_PTR) :: f_ptr                  ! C address
 
     f_ptr = C_LOC(fillvalue)
-
     hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)
 
-  END SUBROUTINE h5pset_fill_value_real
+  END SUBROUTINE h5pset_fill_value_c_float
 
+  SUBROUTINE h5pset_fill_value_c_double(prp_id, type_id, fillvalue, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
+                                          ! of fillvalue datatype
+                                          ! (in memory)
+    REAL(KIND=C_DOUBLE), INTENT(IN), TARGET :: fillvalue   ! Fillvalue
+    INTEGER, INTENT(OUT) :: hdferr  ! Error code
+    TYPE(C_PTR) :: f_ptr                  ! C address
 
-  SUBROUTINE h5pget_fill_value_real(prp_id, type_id, fillvalue, hdferr)
+    f_ptr = C_LOC(fillvalue)
+    hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)
+  END SUBROUTINE h5pset_fill_value_c_double
+
+  SUBROUTINE h5pget_fill_value_c_float(prp_id, type_id, fillvalue, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
     INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                           ! of fillvalue datatype
                                           ! (in memory)
-    REAL, INTENT(OUT), TARGET :: fillvalue  ! Fillvalue
+    REAL(KIND=C_FLOAT), INTENT(OUT), TARGET :: fillvalue  ! Fillvalue
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
     TYPE(C_PTR) :: f_ptr                    ! C address
 
     f_ptr = C_LOC(fillvalue)
+    hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)
+
+  END SUBROUTINE h5pget_fill_value_c_float
 
+  SUBROUTINE h5pget_fill_value_c_double(prp_id, type_id, fillvalue, &
+       hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
+                                          ! of fillvalue datatype
+                                          ! (in memory)
+    REAL(KIND=C_DOUBLE), INTENT(IN), TARGET :: fillvalue   ! Fillvalue
+    INTEGER, INTENT(OUT) :: hdferr  ! Error code
+    TYPE(C_PTR) :: f_ptr                  ! C address
+
+    f_ptr = C_LOC(fillvalue)
     hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)
 
-  END SUBROUTINE h5pget_fill_value_real
+  END SUBROUTINE h5pget_fill_value_c_double
 
   SUBROUTINE h5pset_fill_value_char(prp_id, type_id, fillvalue, hdferr)
     IMPLICIT NONE
@@ -6301,7 +6330,6 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     TYPE(C_PTR) :: f_ptr                       ! C address
 
     f_ptr = C_LOC(fillvalue)
-
     hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)
 
   END SUBROUTINE h5pset_fill_value_char
@@ -6331,7 +6359,6 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     ENDIF
 
     f_ptr = C_LOC(chr(1)(1:1))
-
     hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)
 
     DO i = 1, chr_len
@@ -6500,11 +6527,11 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 
   END SUBROUTINE h5pset_integer
 
-  SUBROUTINE h5pset_real(prp_id, name, value, hdferr)
+  SUBROUTINE h5pset_c_float(prp_id, name, value, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
     CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name ! Name of property to modify
-    REAL,   INTENT(IN), TARGET :: value  ! Property value
+    REAL(KIND=C_FLOAT),   INTENT(IN), TARGET :: value  ! Property value
     INTEGER, INTENT(OUT) :: hdferr       ! Error code
     INTEGER :: name_len
     TYPE(C_PTR) :: f_ptr
@@ -6514,7 +6541,45 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     name_len = LEN(name)
     hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
 
-  END SUBROUTINE h5pset_real
+  END SUBROUTINE h5pset_c_float
+
+!
+!****s* H5P (F90)/h5pset_c_double
+!
+! NAME
+!  h5pset_c_double
+!
+! PURPOSE
+!  Sets a property list value
+!
+! INPUTS
+!  prp_id 	 - iproperty list identifier to modify
+!  name 	 - name of property to modify
+!  value 	 - value to set property to
+! OUTPUTS
+!  hdferr:	 - error code
+!                   Success:  0
+!                   Failure: -1
+! AUTHOR
+!  Elena Pourmal
+!  October 9, 2002
+! SOURCE
+  SUBROUTINE h5pset_c_double(prp_id, name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier
+    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to modify
+    REAL(KIND=C_DOUBLE),   INTENT(IN), TARGET :: value ! Property value
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+!*****
+    INTEGER :: name_len
+    TYPE(C_PTR) :: f_ptr                  ! C address
+
+    f_ptr = C_LOC(value)
+
+    name_len = LEN(name)
+    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
+
+  END SUBROUTINE h5pset_c_double
 
   SUBROUTINE h5pset_char(prp_id, name, value, hdferr)
     IMPLICIT NONE
@@ -6599,11 +6664,11 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 
   END SUBROUTINE h5pget_integer
 
-  SUBROUTINE h5pget_real(prp_id, name, value, hdferr)
+  SUBROUTINE h5pget_c_float(prp_id, name, value, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
     CHARACTER(LEN=*), INTENT(IN) :: name ! Name of property to modify
-    REAL,   INTENT(OUT), TARGET :: value ! Property value
+    REAL(KIND=C_FLOAT),   INTENT(OUT), TARGET :: value ! Property value
     INTEGER, INTENT(OUT) :: hdferr       ! Error code
     INTEGER :: name_len
     TYPE(C_PTR) :: f_ptr
@@ -6612,7 +6677,44 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 
     name_len = LEN(name)
     hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
-  END SUBROUTINE h5pget_real
+  END SUBROUTINE h5pget_c_float
+
+!****s* H5P (F90)/h5pget_c_double
+!
+! NAME
+!  h5pget_c_double
+!
+! PURPOSE
+!  Gets a property list value
+!
+! INPUTS
+!  prp_id 	 - iproperty list identifier to modify
+!  name 	 - name of property to modify
+! OUTPUTS
+!  value 	 - value of property
+!  hdferr	 - error code
+!                   Success:  0
+!                   Failure: -1
+! AUTHOR
+!  Elena Pourmal
+!  October 9, 2002
+!
+! SOURCE
+  SUBROUTINE h5pget_c_double(prp_id, name, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: prp_id     ! Property list identifier
+    CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of property to modify
+    REAL(KIND=C_DOUBLE),   INTENT(OUT), TARGET :: value ! Property value
+    INTEGER, INTENT(OUT) :: hdferr           ! Error code
+!*****
+    INTEGER :: name_len
+    TYPE(C_PTR) :: f_ptr                  ! C address
+
+    f_ptr = C_LOC(value)
+
+    name_len = LEN(name)
+    hdferr = h5pget_c(prp_id, name, name_len, f_ptr)
+  END SUBROUTINE h5pget_c_double
 
   SUBROUTINE h5pget_char(prp_id, name, value, hdferr)
     IMPLICIT NONE
@@ -6778,12 +6880,12 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
 
   END SUBROUTINE h5pregister_integer
 
-  SUBROUTINE h5pregister_real(class, name, size, value, hdferr)
+  SUBROUTINE h5pregister_c_float(class, name, size, value, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier
     CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to register
     INTEGER(SIZE_T), INTENT(IN) :: size   ! size of the property value
-    REAL,   INTENT(IN), TARGET :: value   ! Property value
+    REAL(KIND=C_FLOAT),   INTENT(IN), TARGET :: value   ! Property value
     INTEGER, INTENT(OUT) :: hdferr        ! Error code
     INTEGER :: name_len
     TYPE(C_PTR) :: f_ptr
@@ -6793,7 +6895,51 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     name_len = LEN(name)
     hdferr = h5pregister_c(class, name, name_len, size, f_ptr)
 
-  END SUBROUTINE h5pregister_real
+  END SUBROUTINE h5pregister_c_float
+
+!
+!****s* H5P (F90)/h5pregister_c_double
+!
+! NAME
+!  h5pregister_c_double
+!
+! PURPOSE
+!  Registers a permanent property with a property list class.
+!
+! INPUTS
+!  class 	 - property list class to register
+!                  permanent property within
+!  name 	 - name of property to register
+!  size 	 - size of property in bytes
+!  value 	 - default value for property in newly
+!                  created property lists
+! OUTPUTS
+!  hdferr	 - error code
+!                   Success:  0
+!                   Failure: -1
+! AUTHOR
+!  Elena Pourmal
+!  October 10, 2002
+!
+! SOURCE
+  SUBROUTINE h5pregister_c_double(class, name, size, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: class     ! Property list class identifier
+    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to register
+    INTEGER(SIZE_T), INTENT(IN) :: size     ! Size of the property value
+    REAL(KIND=C_DOUBLE),   INTENT(IN), TARGET :: value ! Property value
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+!*****
+    INTEGER :: name_len
+    TYPE(C_PTR) :: f_ptr                  ! C address
+
+
+    f_ptr = C_LOC(value)
+
+    name_len = LEN(name)
+    hdferr = h5pregister_c(class, name, name_len, size, f_ptr)
+
+  END SUBROUTINE h5pregister_c_double
 
   SUBROUTINE h5pregister_char(class, name, size, value, hdferr)
     IMPLICIT NONE
@@ -6921,13 +7067,54 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     hdferr = h5pinsert_c(plist, name , name_len, size, f_ptr)
   END SUBROUTINE h5pinsert_integer
 
-  SUBROUTINE h5pinsert_real(plist, name, size, value, hdferr)
+  SUBROUTINE h5pinsert_c_float(plist, name, size, value, hdferr)
+    IMPLICIT NONE
+    INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
+    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
+    INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
+    REAL(KIND=C_FLOAT),   INTENT(IN), TARGET :: value   ! Property value
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code
+    INTEGER :: name_len
+    TYPE(c_ptr) :: f_ptr
+
+    f_ptr = c_loc(value)
+
+    name_len = LEN(name)
+    hdferr = h5pinsert_c(plist, name , name_len, size, f_ptr)
+
+  END SUBROUTINE h5pinsert_c_float
+
+!****s* H5P (F90)/h5pinsert_c_double
+!
+! NAME
+!
+!  h5pinsert_c_double
+!
+! PURPOSE
+!  Registers a temporary property with a property list class.
+!
+! INPUTS
+!  plist 	 - property list identifier
+!                  permanent property within
+!  name 	 - name of property to insert
+!  size 	 - size of property in bytes
+!  value 	 - initial value for the property
+! OUTPUTS
+!  hdferr	 - error code
+!                   Success:  0
+!                   Failure: -1
+! AUTHOR
+!  Elena Pourmal
+!  October 10, 2002
+! SOURCE
+  SUBROUTINE h5pinsert_c_double(plist, name, size, value, hdferr)
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
     CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
     INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
-    REAL,   INTENT(IN), TARGET :: value   ! Property value
+    REAL(KIND=C_DOUBLE), INTENT(IN), TARGET :: value ! Property value
     INTEGER, INTENT(OUT) :: hdferr        ! Error code
+!*****
     INTEGER :: name_len
     TYPE(c_ptr) :: f_ptr
 
@@ -6936,7 +7123,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
     name_len = LEN(name)
     hdferr = h5pinsert_c(plist, name , name_len, size, f_ptr)
 
-  END SUBROUTINE h5pinsert_real
+  END SUBROUTINE h5pinsert_c_double
 
   SUBROUTINE h5pinsert_char(plist, name, size, value, hdferr)
     IMPLICIT NONE
diff --git a/fortran/src/H5_DBLE_InterfaceExclude.F90 b/fortran/src/H5_DBLE_InterfaceExclude.F90
deleted file mode 100644
index 2a3e26f..0000000
--- a/fortran/src/H5_DBLE_InterfaceExclude.F90
+++ /dev/null
@@ -1,39 +0,0 @@
-!****h* fortran/src/H5_DBLE_InterfaceExclude.f90
-!
-! NAME
-!   H5_DBLE_INTERFACE
-!
-! FUNCTION
-!   This module is used for when the default REAL is of type DOUBLE PRECISION.
-!   We do not include the double precision interfaces if the defaut REAL is
-!   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-!   generic interfaces declared as REAL and those declared as DOUBLE PRECISION.
-!
-! NOTES
-!   Empty module.
-!
-! 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.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!
-!*****
-
-MODULE H5_DBLE_INTERFACE
-
-
-END MODULE H5_DBLE_INTERFACE
diff --git a/fortran/src/H5_DBLE_InterfaceInclude.F90 b/fortran/src/H5_DBLE_InterfaceInclude.F90
deleted file mode 100644
index 56bb1a4..0000000
--- a/fortran/src/H5_DBLE_InterfaceInclude.F90
+++ /dev/null
@@ -1,1701 +0,0 @@
-!****h* fortran/src/H5_DBLE_InterfaceInclude.f90
-!
-! NAME
-!   H5_DBLE_INTERFACE
-!
-! FUNCTION
-!   This module is used for when the default REAL is not of the type DOUBLE PRECISION.
-!   We only do not include the double precision interfaces if the defaut REAL is
-!   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-!   generic interfaces declared as REAL. Otherwise it is okay to include the interfaces.
-!
-! NOTES
-!   This module contains all the DOUBLE PRECISION interfaces and corresponding subroutines
-!   from the HDF function catagory H5A, H5D and H5P.
-!
-! 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.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-! AUTHOR
-!  M. Scot Breitenfeld
-!
-!*****
-
-MODULE H5_DBLE_INTERFACE
-
-  USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_CHAR
-  USE H5GLOBAL
-
-  !
-  ! ----- H5A ----
-  !
-  INTERFACE h5awrite_f
-     MODULE PROCEDURE h5awrite_double_scalar
-     MODULE PROCEDURE h5awrite_double_1
-     MODULE PROCEDURE h5awrite_double_2
-     MODULE PROCEDURE h5awrite_double_3
-     MODULE PROCEDURE h5awrite_double_4
-     MODULE PROCEDURE h5awrite_double_5
-     MODULE PROCEDURE h5awrite_double_6
-     MODULE PROCEDURE h5awrite_double_7
-  END INTERFACE
-
-  INTERFACE h5aread_f
-     MODULE PROCEDURE h5aread_double_scalar
-     MODULE PROCEDURE h5aread_double_1
-     MODULE PROCEDURE h5aread_double_2
-     MODULE PROCEDURE h5aread_double_3
-     MODULE PROCEDURE h5aread_double_4
-     MODULE PROCEDURE h5aread_double_5
-     MODULE PROCEDURE h5aread_double_6
-     MODULE PROCEDURE h5aread_double_7
-  END INTERFACE
-  !
-  ! ----- H5D ----
-  !
-  INTERFACE h5dwrite_f
-     MODULE PROCEDURE h5dwrite_double_scalar
-     MODULE PROCEDURE h5dwrite_double_1
-     MODULE PROCEDURE h5dwrite_double_2
-     MODULE PROCEDURE h5dwrite_double_3
-     MODULE PROCEDURE h5dwrite_double_4
-     MODULE PROCEDURE h5dwrite_double_5
-     MODULE PROCEDURE h5dwrite_double_6
-     MODULE PROCEDURE h5dwrite_double_7
-  END INTERFACE
-
-  INTERFACE h5dread_f
-     MODULE PROCEDURE h5dread_double_scalar
-     MODULE PROCEDURE h5dread_double_1
-     MODULE PROCEDURE h5dread_double_2
-     MODULE PROCEDURE h5dread_double_3
-     MODULE PROCEDURE h5dread_double_4
-     MODULE PROCEDURE h5dread_double_5
-     MODULE PROCEDURE h5dread_double_6
-     MODULE PROCEDURE h5dread_double_7
-  END INTERFACE
-
-  INTERFACE h5dfill_f
-     MODULE PROCEDURE h5dfill_double
-  END INTERFACE
-
-  !
-  ! ----- H5P ----
-  !
-  INTERFACE h5pset_fill_value_f
-     MODULE PROCEDURE h5pset_fill_value_double
-  END INTERFACE
-
-  INTERFACE h5pget_fill_value_f
-     MODULE PROCEDURE h5pget_fill_value_double
-  END INTERFACE
-
-  INTERFACE h5pset_f
-     MODULE PROCEDURE h5pset_double
-  END INTERFACE
-
-  INTERFACE h5pget_f
-     MODULE PROCEDURE h5pget_double
-  END INTERFACE
-
-  INTERFACE h5pregister_f
-     MODULE PROCEDURE h5pregister_double
-  END INTERFACE
-
-  INTERFACE h5pinsert_f
-     MODULE PROCEDURE h5pinsert_double
-  END INTERFACE
-
-CONTAINS
-
-  !
-  ! ----- H5A ----
-  !
-  SUBROUTINE h5awrite_double_scalar(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id    ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN) :: buf     ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_s_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5awrite_double_s_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN)::buf
-       END FUNCTION h5awrite_double_s_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_s_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_scalar
-
-  SUBROUTINE h5awrite_double_1(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1)) :: buf ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_1_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5awrite_double_1_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5awrite_double_1_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_1_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_1
-
-
-  SUBROUTINE h5awrite_double_2(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_2_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_2_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5awrite_double_2_c')
-         IMPORT :: HID_T, HSIZE_T
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5awrite_double_2_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_2_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_2
-
-
-  SUBROUTINE h5awrite_double_3(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_3_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5awrite_double_3_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5awrite_double_3_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_3_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_3
-
-
-  SUBROUTINE h5awrite_double_4(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5awrite_double_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_4_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5awrite_double_4_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5awrite_double_4_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_4_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_4
-
-
-  SUBROUTINE h5awrite_double_5(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_5_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5awrite_double_5_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5awrite_double_5_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_5_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_5
-
-
-  SUBROUTINE h5awrite_double_6(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_6_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5awrite_double_6_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5awrite_double_6_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_6_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_6
-
-
-  SUBROUTINE h5awrite_double_7(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5awrite_double_7_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5awrite_double_7_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5awrite_double_7_c
-    END INTERFACE
-
-    hdferr = h5awrite_double_7_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5awrite_double_7
-
-
-  SUBROUTINE h5aread_double_scalar(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT) :: buf    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_s_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5aread_double_s_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT)::buf
-       END FUNCTION h5aread_double_s_c
-    END INTERFACE
-
-    hdferr = h5aread_double_s_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_scalar
-
-  SUBROUTINE h5aread_double_1(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_1_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5aread_double_1_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5aread_double_1_c
-    END INTERFACE
-
-    hdferr = h5aread_double_1_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_1
-
-
-  SUBROUTINE h5aread_double_2(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_2_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5aread_double_2_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5aread_double_2_c
-    END INTERFACE
-
-    hdferr = h5aread_double_2_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_2
-
-
-  SUBROUTINE h5aread_double_3(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_3_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5aread_double_3_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5aread_double_3_c
-    END INTERFACE
-
-    hdferr = h5aread_double_3_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_3
-
-
-  SUBROUTINE h5aread_double_4(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_4_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_4_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5aread_double_4_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5aread_double_4_c
-    END INTERFACE
-
-    hdferr = h5aread_double_4_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_4
-
-
-  SUBROUTINE h5aread_double_5(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    !            INTEGER, EXTERNAL :: h5aread_double_5_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_5_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5aread_double_5_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5aread_double_5_c
-    END INTERFACE
-
-    hdferr = h5aread_double_5_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_5
-
-
-  SUBROUTINE h5aread_double_6(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_6_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5aread_double_6_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5aread_double_6_c
-    END INTERFACE
-
-    hdferr = h5aread_double_6_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_6
-
-
-  SUBROUTINE h5aread_double_7(attr_id, memtype_id,  buf, dims, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
-                                                ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    ! Attribute data
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5aread_double_7_c(attr_id, memtype_id,  buf, dims) BIND(C,NAME='h5aread_double_7_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
-         INTEGER(HID_T), INTENT(IN) :: attr_id
-         INTEGER(HID_T), INTENT(IN) :: memtype_id
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5aread_double_7_c
-    END INTERFACE
-
-    hdferr = h5aread_double_7_c(attr_id, memtype_id,  buf, dims)
-  END SUBROUTINE h5aread_double_7
-
-
-  !
-  ! ----- H5D ----
-  !
-  SUBROUTINE h5dwrite_double_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dwrite_double_s_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN) :: buf
-       END FUNCTION h5dwrite_double_s_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_scalar
-
-  SUBROUTINE h5dwrite_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dwrite_double_1_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dwrite_double_1_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_1
-
-  SUBROUTINE h5dwrite_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dwrite_double_2_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dwrite_double_2_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_2
-
-  SUBROUTINE h5dwrite_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_3_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dwrite_double_3_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dwrite_double_3_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_3
-
-  SUBROUTINE h5dwrite_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dwrite_double_4_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5dwrite_double_4_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_4
-
-  SUBROUTINE h5dwrite_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dwrite_double_5_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dwrite_double_5_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_5
-
-  SUBROUTINE h5dwrite_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dwrite_double_6_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dwrite_double_6_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_6
-
-  SUBROUTINE h5dwrite_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(IN), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dwrite_double_7_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dwrite_double_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dwrite_double_7_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(IN), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dwrite_double_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dwrite_double_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dwrite_double_7
-
-  SUBROUTINE h5dread_double_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT) :: buf ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_s_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_s_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dread_double_s_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(OUT) :: buf
-       END FUNCTION h5dread_double_s_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_s_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_scalar
-
-  SUBROUTINE h5dread_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    !            INTEGER, EXTERNAL :: h5dread_double_1_c
-    !  MS FORTRAN needs explicit interface for C functions called here.
-    !
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_1_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dread_double_1_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1)) :: buf
-       END FUNCTION h5dread_double_1_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_1_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_1
-
-  SUBROUTINE h5dread_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_2_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dread_double_2_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2)) :: buf
-       END FUNCTION h5dread_double_2_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_2_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_2
-
-  SUBROUTINE h5dread_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_3_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dread_double_3_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3)) :: buf
-       END FUNCTION h5dread_double_3_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_3_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_3
-
-  SUBROUTINE h5dread_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_4_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dread_double_4_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-       END FUNCTION h5dread_double_4_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_4_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_4
-
-  SUBROUTINE h5dread_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_5_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dread_double_5_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-       END FUNCTION h5dread_double_5_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_5_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_5
-
-  SUBROUTINE h5dread_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_6_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dread_double_6_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-       END FUNCTION h5dread_double_6_c
-    END INTERFACE
-
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_6_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_6
-
-  SUBROUTINE h5dread_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
-       mem_space_id, file_space_id, xfer_prp)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
-    INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-    DOUBLE PRECISION, INTENT(INOUT), &
-         DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    ! Data buffer
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
-    ! Memory dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
-    ! File dataspace identfier
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
-    ! Transfer property list identifier
-
-    INTEGER(HID_T) :: xfer_prp_default
-    INTEGER(HID_T) :: mem_space_id_default
-    INTEGER(HID_T) :: file_space_id_default
-
-    INTERFACE
-       INTEGER FUNCTION h5dread_double_7_c(dset_id, mem_type_id, &
-            mem_space_id_default, &
-            file_space_id_default, &
-            xfer_prp_default, buf, dims) BIND(C,NAME='h5dread_double_7_c')
-         IMPORT :: HID_T, HSIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: dset_id
-         INTEGER(HID_T), INTENT(IN) :: mem_type_id
-         INTEGER(HID_T)  :: mem_space_id_default
-         INTEGER(HID_T) :: file_space_id_default
-         INTEGER(HID_T) :: xfer_prp_default
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-         DOUBLE PRECISION, INTENT(INOUT), &
-              DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-       END FUNCTION h5dread_double_7_c
-    END INTERFACE
-
-    xfer_prp_default = H5P_DEFAULT_F
-    mem_space_id_default = H5S_ALL_F
-    file_space_id_default = H5S_ALL_F
-
-    if (present(xfer_prp)) xfer_prp_default = xfer_prp
-    if (present(mem_space_id))  mem_space_id_default = mem_space_id
-    if (present(file_space_id)) file_space_id_default = file_space_id
-
-    hdferr = h5dread_double_7_c(dset_id, mem_type_id, mem_space_id_default, &
-         file_space_id_default, xfer_prp_default, buf, dims)
-
-  END SUBROUTINE h5dread_double_7
-
-  !----------------------------------------------------------------------
-  ! Name:		h5dfill_double
-  !
-  ! Purpose:      Fills dataspace elements with a fill value in a memory buffer.
-  !               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
-  !               of the fillvalues and buffers are supported. Buffer and fillvalue
-  !               are assumed to have the same datatype.
-  !               Only one-dimesional buffers are supported.
-  !
-  ! Inputs:
-  !		fill_value	- fill value
-  !		space_id	- memory space selection identifier
-  !		buf		- data buffer iin memory ro apply selection to
-  !				- of k-th dimension of the buf array
-  ! Outputs:
-  !		hdferr:		- error code
-  !				 	Success:  0
-  !				 	Failure: -1
-  !
-  ! Programmer:	Elena Pourmal
-  !		March 12, 2003
-  !
-  !----------------------------------------------------------------------
-
-  SUBROUTINE h5dfill_double(fill_value, space_id, buf,  hdferr)
-    IMPLICIT NONE
-    DOUBLE PRECISION, INTENT(IN) :: fill_value  ! Fill value
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-    DOUBLE PRECISION, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-    INTEGER, INTENT(OUT) :: hdferr      ! Error code
-
-    INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-    INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-
-    INTERFACE
-       INTEGER FUNCTION h5dfill_double_c(fill_value, fill_type_id, space_id, &
-            buf, mem_type_id) BIND(C,NAME='h5dfill_double_c')
-         IMPORT :: HID_T
-         IMPLICIT NONE
-         DOUBLE PRECISION, INTENT(IN) :: fill_value  ! Fill value
-         INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-         INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
-         DOUBLE PRECISION, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-         INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
-       END FUNCTION h5dfill_double_c
-    END INTERFACE
-    fill_type_id = H5T_NATIVE_DOUBLE
-    mem_type_id  = H5T_NATIVE_DOUBLE
-
-    hdferr = h5dfill_double_c(fill_value, fill_type_id, space_id, &
-         buf, mem_type_id)
-
-
-  END SUBROUTINE h5dfill_double
-
-  !
-  ! -- H5P ---
-  !
-
-  SUBROUTINE h5pset_fill_value_double(prp_id, type_id, fillvalue, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    DOUBLE PRECISION, INTENT(IN) :: fillvalue   ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_fill_value_double_c(prp_id, type_id, fillvalue) BIND(C,NAME='h5pset_fill_value_double_c')
-         IMPORT :: HID_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         DOUBLE PRECISION, INTENT(IN) :: fillvalue
-       END FUNCTION h5pset_fill_value_double_c
-    END INTERFACE
-
-    hdferr = h5pset_fill_value_double_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pset_fill_value_double
-
-  SUBROUTINE h5pget_fill_value_double(prp_id, type_id, fillvalue, &
-       hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-    INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
-                                          ! of fillvalue datatype
-                                          ! (in memory)
-    DOUBLE PRECISION, INTENT(IN) :: fillvalue   ! Fillvalue
-    INTEGER, INTENT(OUT) :: hdferr  ! Error code
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_fill_value_double_c(prp_id, type_id, fillvalue) BIND(C,NAME='h5pget_fill_value_double_c')
-         IMPORT :: HID_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER(HID_T), INTENT(IN) :: type_id
-         DOUBLE PRECISION :: fillvalue
-       END FUNCTION h5pget_fill_value_double_c
-    END INTERFACE
-
-    hdferr = h5pget_fill_value_double_c(prp_id, type_id, fillvalue)
-  END SUBROUTINE h5pget_fill_value_double
-
-!
-!****s* H5P (F90)/h5pset_double
-!
-! NAME
-!  h5pset_double
-!
-! PURPOSE
-!  Sets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-!  value 	 - value to set property to
-! OUTPUTS
-!  hdferr:	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-! SOURCE
-  SUBROUTINE h5pset_double(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to modify
-    DOUBLE PRECISION,   INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pset_double_c(prp_id, name, name_len, value) BIND(C,NAME='h5pset_double_c')
-         IMPORT :: C_CHAR
-         IMPORT :: HID_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         DOUBLE PRECISION, INTENT(IN) :: value
-       END FUNCTION h5pset_double_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pset_double_c(prp_id, name , name_len, value)
-  END SUBROUTINE h5pset_double
-
-!****s* H5P (F90)/h5pget_double
-!
-! NAME
-!  h5pget_double
-!
-! PURPOSE
-!  Gets a property list value
-!
-! INPUTS
-!  prp_id 	 - iproperty list identifier to modify
-!  name 	 - name of property to modify
-! OUTPUTS
-!  value 	 - value of property
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 9, 2002
-!
-! SOURCE
-  SUBROUTINE h5pget_double(prp_id, name, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id     ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of property to modify
-    DOUBLE PRECISION,   INTENT(OUT) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr           ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pget_double_c(prp_id, name, name_len, value) BIND(C,NAME='h5pget_double_c')
-         IMPORT :: C_CHAR
-         IMPORT :: HID_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         DOUBLE PRECISION, INTENT(OUT) :: value
-       END FUNCTION h5pget_double_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pget_double_c(prp_id, name , name_len, value)
-  END SUBROUTINE h5pget_double
-
-!
-!****s* H5P (F90)/h5pregister_double
-!
-! NAME
-!  h5pregister_double
-!
-! PURPOSE
-!  Registers a permanent property with a property list class.
-!
-! INPUTS
-!  class 	 - property list class to register
-!                  permanent property within
-!  name 	 - name of property to register
-!  size 	 - size of property in bytes
-!  value 	 - default value for property in newly
-!                  created property lists
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-!
-! SOURCE
-  SUBROUTINE h5pregister_double(class, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: class     ! Property list class identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name    ! Name of property to register
-    INTEGER(SIZE_T), INTENT(IN) :: size     ! Size of the property value
-    DOUBLE PRECISION,   INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pregister_double_c(class, name, name_len, size, value) BIND(C,NAME='h5pregister_double_c')
-         IMPORT :: C_CHAR
-         IMPORT :: HID_T, SIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: class
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         DOUBLE PRECISION, INTENT(IN) :: value
-       END FUNCTION h5pregister_double_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pregister_double_c(class, name , name_len, size, value)
-  END SUBROUTINE h5pregister_double
-
-!****s* H5P (F90)/h5pinsert_double
-!
-! NAME
-!
-!  h5pinsert_double
-!
-! PURPOSE
-!  Registers a temporary property with a property list class.
-!
-! INPUTS
-!  plist 	 - property list identifier
-!                  permanent property within
-!  name 	 - name of property to insert
-!  size 	 - size of property in bytes
-!  value 	 - initial value for the property
-! OUTPUTS
-!  hdferr	 - error code
-!                   Success:  0
-!                   Failure: -1
-! AUTHOR
-!  Elena Pourmal
-!  October 10, 2002
-! SOURCE
-  SUBROUTINE h5pinsert_double(plist, name, size, value, hdferr)
-    IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
-    CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
-    INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
-    DOUBLE PRECISION, INTENT(IN) :: value ! Property value
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code
-!*****
-    INTEGER :: name_len
-
-    INTERFACE
-       INTEGER FUNCTION h5pinsert_double_c(plist, name, name_len, size, value) BIND(C,NAME='h5pinsert_double_c')
-         IMPORT :: C_CHAR
-         IMPORT :: HID_T, SIZE_T
-         IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: plist
-         CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
-         INTEGER, INTENT(IN)         :: name_len
-         INTEGER(SIZE_T), INTENT(IN) :: size
-         DOUBLE PRECISION, INTENT(IN) :: value
-       END FUNCTION h5pinsert_double_c
-    END INTERFACE
-
-    name_len = LEN(name)
-    hdferr = h5pinsert_double_c(plist, name , name_len, size, value)
-  END SUBROUTINE h5pinsert_double
-
-END MODULE H5_DBLE_INTERFACE
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 4da66fb..b62af4e 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -141,110 +141,25 @@ H5_FCDLL int_f h5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f
 			     hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
 H5_FCDLL int_f h5dopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id);
 H5_FCDLL int_f h5dclose_c ( hid_t_f *dset_id );
-H5_FCDLL int_f h5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dwrite_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dwrite_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwrite_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
 
 H5_FCDLL int_f h5dwrite_vl_integer_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len);
 H5_FCDLL int_f h5dwrite_vl_real_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len);
 H5_FCDLL int_f h5dwrite_vl_string_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len);
 H5_FCDLL int_f h5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, haddr_t_f *buf, hsize_t_f *dims);
 H5_FCDLL int_f h5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dwritec_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dwritec_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwritec_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwritec_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwritec_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwritec_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwritec_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwritec_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dwritec_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dread_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dread_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dread_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dread_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dread_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims);
-
 H5_FCDLL int_f h5dread_vl_integer_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len);
 H5_FCDLL int_f h5dread_vl_real_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len);
 H5_FCDLL int_f h5dread_vl_string_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len);
 H5_FCDLL int_f h5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, haddr_t_f * buf, hsize_t_f *dims);
 H5_FCDLL int_f h5dread_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f * buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dreadc_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-
-H5_FCDLL int_f h5dreadc_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dreadc_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dreadc_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dreadc_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dreadc_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dreadc_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dreadc_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
-H5_FCDLL int_f h5dreadc_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims);
 H5_FCDLL int_f h5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id);
-
-
 H5_FCDLL int_f h5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id);
 H5_FCDLL int_f h5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id);
 H5_FCDLL int_f h5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id);
 H5_FCDLL int_f h5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims);
 H5_FCDLL int_f h5dvlen_get_max_len_c(hid_t_f *dataset_id, hid_t_f *type_id, hid_t_f *space_id, size_t_f *len);
 H5_FCDLL int_f h5dget_storage_size_c(hid_t_f *dataset_id, hsize_t_f *size);
-H5_FCDLL int_f h5dfillc_c(_fcd fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, _fcd buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f h5dfill_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
-H5_FCDLL int_f h5dfill_integer_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
-H5_FCDLL int_f h5dfill_real_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
-H5_FCDLL int_f h5dfill_double_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f h5dget_space_status_c ( hid_t_f *dset_id, int_f *flag);
 H5_FCDLL int_f h5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
 				  hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
@@ -286,75 +201,7 @@ H5_FCDLL int_f h5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f
 
 H5_FCDLL int_f h5acreate_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp, hid_t_f *aapl,  hid_t_f *attr_id);
 H5_FCDLL int_f h5aopen_name_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_id);
-H5_FCDLL int_f h5awritec_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5awritec_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5awritec_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5awritec_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5awritec_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5awritec_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5awritec_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5awritec_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5awritec_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5awrite_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5awrite_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
 H5_FCDLL int_f h5awrite_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
-H5_FCDLL int_f h5areadc_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5areadc_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5areadc_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5areadc_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5areadc_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5areadc_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5areadc_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5areadc_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5areadc_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims);
-H5_FCDLL int_f h5aread_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
-H5_FCDLL int_f h5aread_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void *dims);
 H5_FCDLL int_f h5aread_f_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf);
 H5_FCDLL int_f h5aclose_c ( hid_t_f *attr_id );
 H5_FCDLL int_f h5adelete_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen);
@@ -514,17 +361,9 @@ H5_FCDLL int_f h5pset_deflate_c ( hid_t_f *prp_id , int_f *level);
 H5_FCDLL int_f h5pset_chunk_c ( hid_t_f *prp_id, int_f *rank, hsize_t_f *dims );
 H5_FCDLL int_f h5pget_chunk_c ( hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims );
 H5_FCDLL int_f h5pset_file_image_c (hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len);
-H5_FCDLL int_f h5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue);
 H5_FCDLL int_f h5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f h5pset_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f h5pset_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f h5pset_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
 H5_FCDLL int_f h5pget_file_image_c (hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len);
-H5_FCDLL int_f h5pget_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue);
 H5_FCDLL int_f h5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f h5pget_fill_value_integer_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f h5pget_fill_value_real_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
-H5_FCDLL int_f h5pget_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue);
 H5_FCDLL int_f h5pset_preserve_c ( hid_t_f *prp_id , int_f *flag);
 H5_FCDLL int_f h5pget_preserve_c ( hid_t_f *prp_id , int_f *flag);
 H5_FCDLL int_f h5pget_version_c (hid_t_f *prp_id, int_f * boot,int_f * freelist, int_f * stab, int_f *shhdr);
@@ -592,25 +431,10 @@ H5_FCDLL int_f h5pcreate_class_c(hid_t_f *parent, _fcd name, int_f *name_len, hi
 				  H5P_cls_close_func_t close, void *close_data);
 H5_FCDLL int_f h5pcreate_class_f90_c(hid_t_f *parent, _fcd name, int_f *name_len, hid_t_f *cls);
 H5_FCDLL int_f h5pregister_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
-H5_FCDLL int_f h5pregister_integer_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
-H5_FCDLL int_f h5pregister_real_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
-H5_FCDLL int_f h5pregister_double_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, void *value);
 H5_FCDLL int_f h5pregisterc_c(hid_t_f *cls, _fcd name, int_f * name_len, size_t_f *size, _fcd value, int_f *value_len);
 H5_FCDLL int_f h5pinsert_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
-H5_FCDLL int_f h5pinsert_integer_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
-H5_FCDLL int_f h5pinsert_real_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
-H5_FCDLL int_f h5pinsert_double_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, void *value);
-H5_FCDLL int_f h5pinsertc_c(hid_t_f  *plist, _fcd name, int_f *name_len, size_t_f *size, _fcd value, int_f *value_len);
 H5_FCDLL int_f h5pset_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f h5pset_integer_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f h5pset_real_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f h5pset_double_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f h5psetc_c(hid_t_f *prp_id, _fcd name, int_f *name_len, _fcd value, int_f *value_len);
 H5_FCDLL int_f h5pget_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f h5pget_double_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f h5pget_integer_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f h5pget_real_c(hid_t_f *prp_id, _fcd name, int_f *name_len, void *value);
-H5_FCDLL int_f h5pgetc_c(hid_t_f *prp_id, _fcd name, int_f *name_len, _fcd value, int_f *value_len);
 H5_FCDLL int_f h5pexist_c(hid_t_f *prp_id, _fcd name, int_f *name_len);
 H5_FCDLL int_f h5pget_size_c(hid_t_f *prp_id, _fcd name, int_f *name_len, size_t_f *size);
 H5_FCDLL int_f h5pget_nprops_c(hid_t_f *prp_id, size_t_f *nprops);
diff --git a/fortran/src/HDF5.F90 b/fortran/src/HDF5.F90
index e23f833..9e25be2 100644
--- a/fortran/src/HDF5.F90
+++ b/fortran/src/HDF5.F90
@@ -41,6 +41,5 @@ MODULE HDF5
   USE H5P
   USE H5R
   USE H5Z
-  USE H5_DBLE_INTERFACE
   USE H5LIB
 END MODULE HDF5
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index 3b2c0a0..4c38575 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -42,23 +42,11 @@ else
    AM_LDFLAGS+=-static
 endif
 
-#   Condition for including/excluding the DBLE interfaces for when the 
-#   default REAL is of type DOUBLE PRECISION.
-#   We do not include the double precision interfaces if the defaut REAL is
-#   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-#   generic interfaces declared as REAL.
-if FORTRAN_DEFAULT_REALisDBLE_F
-   F_DBLE = Exclude
-else
-   F_DBLE = Include
-endif
-
 # Source files for the library.
 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_DBLE_Interface$(F_DBLE).F90 \
+          H5Tff.F90 H5Zff.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
 
@@ -186,13 +174,11 @@ H5Rff.lo:            $(srcdir)/H5Rff.F90 H5f90global.lo
 H5Sff.lo:            $(srcdir)/H5Sff.F90 H5f90global.lo
 H5Tff.lo:            $(srcdir)/H5Tff.F90 H5f90global.lo
 H5Zff.lo:            $(srcdir)/H5Zff.F90 H5f90global.lo
-H5_DBLE_Interface$(F_DBLE).lo:  $(srcdir)/H5_DBLE_Interface$(F_DBLE).F90 H5f90global.lo
 HDF5.lo:             $(srcdir)/HDF5.F90 H5f90global.lo H5_ff.lo H5Aff.lo  \
                      H5Dff.lo \
                      H5Eff.lo \
 		     H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo \
 	             H5Off.lo H5Pff.lo H5Rff.lo \
-                     H5Sff.lo H5Tff.lo H5Zff.lo \
-                     H5_DBLE_Interface$(F_DBLE).lo
+                     H5Sff.lo H5Tff.lo H5Zff.lo
 
 include $(top_srcdir)/config/conclude.am
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 5a925df..f3997c9 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -153,9 +153,9 @@ libhdf5_fortran_la_DEPENDENCIES = $(LIBHDF5)
 am_libhdf5_fortran_la_OBJECTS = H5f90global.lo H5fortran_types.lo \
 	H5_ff.lo H5Aff.lo H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo \
 	H5Lff.lo H5Off.lo H5Pff.lo H5Rff.lo H5Sff.lo H5Tff.lo H5Zff.lo \
-	H5_DBLE_Interface$(F_DBLE).lo H5f90kit.lo H5_f.lo H5Af.lo \
-	H5Df.lo H5Ef.lo H5Ff.lo H5Gf.lo H5If.lo H5Lf.lo H5Of.lo \
-	H5Pf.lo H5Rf.lo H5Sf.lo H5Tf.lo H5Zf.lo HDF5.lo
+	H5f90kit.lo H5_f.lo H5Af.lo H5Df.lo H5Ef.lo H5Ff.lo H5Gf.lo \
+	H5If.lo H5Lf.lo H5Of.lo H5Pf.lo H5Rf.lo H5Sf.lo H5Tf.lo \
+	H5Zf.lo HDF5.lo
 libhdf5_fortran_la_OBJECTS = $(am_libhdf5_fortran_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -722,21 +722,12 @@ lib_LTLIBRARIES = libhdf5_fortran.la
 
 # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am)
 libhdf5_fortran_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
-@FORTRAN_DEFAULT_REALisDBLE_F_FALSE@F_DBLE = Include
-
-#   Condition for including/excluding the DBLE interfaces for when the 
-#   default REAL is of type DOUBLE PRECISION.
-#   We do not include the double precision interfaces if the defaut REAL is
-#   DOUBLE PRECISION since this would lead to a non-unique conflict with the
-#   generic interfaces declared as REAL.
-@FORTRAN_DEFAULT_REALisDBLE_F_TRUE@F_DBLE = Exclude
 
 # Source files for the library.
 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_DBLE_Interface$(F_DBLE).F90 \
+          H5Tff.F90 H5Zff.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
 
@@ -1434,14 +1425,12 @@ H5Rff.lo:            $(srcdir)/H5Rff.F90 H5f90global.lo
 H5Sff.lo:            $(srcdir)/H5Sff.F90 H5f90global.lo
 H5Tff.lo:            $(srcdir)/H5Tff.F90 H5f90global.lo
 H5Zff.lo:            $(srcdir)/H5Zff.F90 H5f90global.lo
-H5_DBLE_Interface$(F_DBLE).lo:  $(srcdir)/H5_DBLE_Interface$(F_DBLE).F90 H5f90global.lo
 HDF5.lo:             $(srcdir)/HDF5.F90 H5f90global.lo H5_ff.lo H5Aff.lo  \
                      H5Dff.lo \
                      H5Eff.lo \
 		     H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo \
 	             H5Off.lo H5Pff.lo H5Rff.lo \
-                     H5Sff.lo H5Tff.lo H5Zff.lo \
-                     H5_DBLE_Interface$(F_DBLE).lo
+                     H5Sff.lo H5Tff.lo H5Zff.lo
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in
index 48fb343..1f475ae 100644
--- a/fortran/src/hdf5_fortrandll.def.in
+++ b/fortran/src/hdf5_fortrandll.def.in
@@ -9,22 +9,6 @@ H5LIB_mp_H5DONT_ATEXIT_F
 H5LIB_mp_H5KIND_TO_TYPE
 @H5_NOF03EXP@H5LIB_PROVISIONAL_mp_H5OFFSETOF
 ; H5_DBLE_INTERFACE
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_SCALAR
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_1
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_2
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_3
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_4
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_5
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_6
-H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_7
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_SCALAR
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_1
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_2
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_3
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_4
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_5
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_6
-H5_DBLE_INTERFACE_mp_H5AWRITE_DOUBLE_7
 H5_DBLE_INTERFACE_mp_H5DFILL_DOUBLE
 H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_SCALAR
 H5_DBLE_INTERFACE_mp_H5DREAD_DOUBLE_1
@@ -52,54 +36,6 @@ H5_DBLE_INTERFACE_mp_H5PREGISTER_DOUBLE
 H5A_mp_H5ACREATE_F
 H5A_mp_H5AOPEN_NAME_F
 H5A_mp_H5AOPEN_IDX_F
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_SCALAR
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_1
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_2
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_3
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_4
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_5
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_6
-H5A_PROVISIONAL_mp_H5AWRITE_INTEGER_7
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_SCALAR
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_1
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_2
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_3
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_4
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_5
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_6
-H5A_PROVISIONAL_mp_H5AWRITE_REAL_7
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_SCALAR
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_1
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_2
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_3
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_4
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_5
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_6
-H5A_PROVISIONAL_mp_H5AWRITE_CHAR_7
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_SCALAR
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_1
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_2
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_3
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_4
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_5
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_6
-H5A_PROVISIONAL_mp_H5AREAD_INTEGER_7
-H5A_PROVISIONAL_mp_H5AREAD_REAL_SCALAR
-H5A_PROVISIONAL_mp_H5AREAD_REAL_1
-H5A_PROVISIONAL_mp_H5AREAD_REAL_2
-H5A_PROVISIONAL_mp_H5AREAD_REAL_3
-H5A_PROVISIONAL_mp_H5AREAD_REAL_4
-H5A_PROVISIONAL_mp_H5AREAD_REAL_5
-H5A_PROVISIONAL_mp_H5AREAD_REAL_6
-H5A_PROVISIONAL_mp_H5AREAD_REAL_7
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_SCALAR
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_1
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_2
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_3
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_4
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_5
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_6
-H5A_PROVISIONAL_mp_H5AREAD_CHAR_7
 H5A_mp_H5AGET_SPACE_F
 H5A_mp_H5AGET_TYPE_F
 H5A_mp_H5AGET_NAME_F
@@ -122,8 +58,6 @@ H5A_mp_H5AEXISTS_F
 H5A_mp_H5AEXISTS_BY_NAME_F
 H5A_mp_H5AOPEN_BY_NAME_F
 H5A_mp_H5ARENAME_F
-@H5_NOF03EXP@H5A_PROVISIONAL_mp_H5AWRITE_PTR
-@H5_NOF03EXP@H5A_PROVISIONAL_mp_H5AREAD_PTR
 ; H5D
 H5D_mp_H5DCREATE_F
 H5D_mp_H5DOPEN_F
diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4
index cda2fee..c177143 100644
--- a/m4/aclocal_fc.m4
+++ b/m4/aclocal_fc.m4
@@ -111,39 +111,6 @@ AC_DEFUN([PAC_PROG_FC_STORAGE_SIZE],[
 
 ])
 
-dnl Check to see if -r8 was specified to determine if we need to
-dnl compile the DOUBLE PRECISION interfaces.
-
-AC_DEFUN([PAC_PROG_FC_DEFAULT_REALisDBLE],[
-  FORTRAN_DEFAULT_REALisDBLE="no"	
-  AC_MSG_CHECKING([if Fortran default REAL is DOUBLE PRECISION])
-  
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-     MODULE type_mod
-       INTERFACE h5t	
-         MODULE PROCEDURE h5t_real
-         MODULE PROCEDURE h5t_dble
-       END INTERFACE
-     CONTAINS
-       SUBROUTINE h5t_real(r)
-         REAL :: r
-       END SUBROUTINE h5t_real
-       SUBROUTINE h5t_dble(d)
-         DOUBLE PRECISION :: d
-       END SUBROUTINE h5t_dble
-     END MODULE type_mod
-     PROGRAM main
-       USE type_mod
-       REAL :: r
-       DOUBLE PRECISION :: d
-       CALL h5t(r)
-       CALL h5t(d)
-     END PROGRAM main
-    ])], [AC_MSG_RESULT([no])], 
-         [AC_MSG_RESULT([yes])
-            FORTRAN_DEFAULT_REALisDBLE="yes"])
-])
-
 dnl Checking if the compiler supports the required Fortran 2003 features and
 dnl disable Fortran 2003 if it does not.