[svn-r10747] Purpose:

bug fix

Description:
the fortran type integer*1 has become not portable.
define the image fortran datatype as "integer" and make special save, read, and palette functions
that use native integer for a memory type and UCHAR as disk type for the image data
added some more tests with new palette definitions

Solution:

Platforms tested:
linux
solaris

Misc. update:

1 files changed, 346 insertions, 359 deletions

diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90
index 4d91aee..5d435e2 100755
--- a/hl/fortran/src/H5TBff.f90
+++ b/hl/fortran/src/H5TBff.f90
@@ -16,9 +16,9 @@
 ! This file contains FORTRAN90 interfaces for H5TB functions
 !
       
-module H5TB
-use H5FORTRAN_TYPES
-use HDF5 
+module h5tb
+use h5fortran_types
+use hdf5 
 
 
 interface h5tbwrite_field_name_f
@@ -58,9 +58,6 @@ interface h5tbinsert_field_f
 end interface
 
 
-
-
-
 contains
 
 
@@ -95,17 +92,17 @@ subroutine h5tbmake_table_f(table_title,&
                             errcode ) 
 
  implicit none
- character(LEN=*), intent(IN) :: table_title                      ! name of the dataset 
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- integer(HSIZE_T), intent(IN) :: nfields                          ! fields 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- character(LEN=*), dimension(nfields), intent(IN) :: field_names  ! field names
- integer(SIZE_T),  dimension(nfields), intent(IN) :: field_offset ! field offset
- integer(HID_T),   dimension(nfields), intent(IN) :: field_types  ! field types
- integer(HSIZE_T), intent(IN) :: chunk_size                       ! chunk size
- integer,          intent(IN) :: compress                         ! compress
+ character(len=*), intent(in) :: table_title                      ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hsize_t), intent(in) :: nfields                          ! fields 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ character(len=*), dimension(nfields), intent(in) :: field_names  ! field names
+ integer(size_t),  dimension(nfields), intent(in) :: field_offset ! field offset
+ integer(hid_t),   dimension(nfields), intent(in) :: field_types  ! field types
+ integer(hsize_t), intent(in) :: chunk_size                       ! chunk size
+ integer,          intent(in) :: compress                         ! compress
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -129,23 +126,23 @@ subroutine h5tbmake_table_f(table_title,&
   namelen2,&
   field_names)
 
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBMAKE_TABLE_C'::h5tbmake_table_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: table_title
-  character(LEN=*), intent(IN) :: table_title                      ! name of the dataset 
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  integer(HSIZE_T), intent(IN) :: nfields                          ! fields 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  character(LEN=*), dimension(nfields), intent(IN) :: field_names  ! field names
-  integer(SIZE_T),  dimension(nfields), intent(IN) :: field_offset ! field offset
-  integer(HID_T),   dimension(nfields), intent(IN) :: field_types  ! field types
-  integer(HSIZE_T), intent(IN) :: chunk_size                       ! chunk size
-  integer,          intent(IN) :: compress                         ! compress
+  character(len=*), intent(in) :: table_title                      ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hsize_t), intent(in) :: nfields                          ! fields 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  character(len=*), dimension(nfields), intent(in) :: field_names  ! field names
+  integer(size_t),  dimension(nfields), intent(in) :: field_offset ! field offset
+  integer(hid_t),   dimension(nfields), intent(in) :: field_types  ! field types
+  integer(hsize_t), intent(in) :: chunk_size                       ! chunk size
+  integer,          intent(in) :: compress                         ! compress
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
   integer, dimension(nfields) :: namelen2                          ! name lengths
@@ -201,13 +198,13 @@ subroutine h5tbwrite_field_name_f_int(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ integer, intent(in), dimension(*) :: buf                         ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -216,19 +213,19 @@ subroutine h5tbwrite_field_name_f_int(loc_id,&
   integer function h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_NAME_C'::h5tbwrite_field_name_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  integer, intent(in), dimension(*) :: buf                         ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -268,13 +265,13 @@ subroutine h5tbwrite_field_name_f_float(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- real, intent(IN), dimension(*) :: buf                            ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ real, intent(in), dimension(*) :: buf                            ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -283,19 +280,19 @@ subroutine h5tbwrite_field_name_f_float(loc_id,&
   integer function h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_NAME_C'::h5tbwrite_field_name_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  real, intent(IN), dimension(*) :: buf                            ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  real, intent(in), dimension(*) :: buf                            ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -337,13 +334,13 @@ subroutine h5tbwrite_field_name_f_double(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ double precision, intent(in), dimension(*) :: buf                ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -352,19 +349,19 @@ subroutine h5tbwrite_field_name_f_double(loc_id,&
   integer function h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_NAME_C'::h5tbwrite_field_name_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  double precision, intent(in), dimension(*) :: buf                ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -404,13 +401,13 @@ subroutine h5tbwrite_field_name_f_string(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -419,19 +416,19 @@ subroutine h5tbwrite_field_name_f_string(loc_id,&
   integer function h5tbwrite_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_NAME_C'::h5tbwrite_field_name_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -472,13 +469,13 @@ subroutine h5tbread_field_name_f_int(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ integer, intent(in), dimension(*) :: buf                         ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -487,19 +484,19 @@ subroutine h5tbread_field_name_f_int(loc_id,&
   integer function h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_NAME_C'::h5tbread_field_name_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  integer, intent(in), dimension(*) :: buf                         ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -539,13 +536,13 @@ subroutine h5tbread_field_name_f_float(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- real, intent(IN), dimension(*) :: buf                            ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ real, intent(in), dimension(*) :: buf                            ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -554,19 +551,19 @@ subroutine h5tbread_field_name_f_float(loc_id,&
   integer function h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_NAME_C'::h5tbread_field_name_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  real, intent(IN), dimension(*) :: buf                            ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  real, intent(in), dimension(*) :: buf                            ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -606,13 +603,13 @@ subroutine h5tbread_field_name_f_double(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ double precision, intent(in), dimension(*) :: buf                ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -621,19 +618,19 @@ subroutine h5tbread_field_name_f_double(loc_id,&
   integer function h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_NAME_C'::h5tbread_field_name_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  double precision, intent(in), dimension(*) :: buf                ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -673,13 +670,13 @@ subroutine h5tbread_field_name_f_string(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -688,19 +685,19 @@ subroutine h5tbread_field_name_f_string(loc_id,&
   integer function h5tbread_field_name_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_NAME_C'::h5tbread_field_name_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -716,9 +713,6 @@ subroutine h5tbread_field_name_f_string(loc_id,&
 end subroutine h5tbread_field_name_f_string
 
 
-
-
-
 !-------------------------------------------------------------------------
 ! Function: h5tbwrite_field_index_f_int
 !
@@ -744,13 +738,13 @@ subroutine h5tbwrite_field_index_f_int(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- integer, intent(IN) :: field_index                               ! index
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer, intent(in) :: field_index                               ! index
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ integer, intent(in), dimension(*) :: buf                         ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
@@ -758,18 +752,18 @@ subroutine h5tbwrite_field_index_f_int(loc_id,&
   integer function h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_INDEX_C'::h5tbwrite_field_index_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  integer, intent(IN) :: field_index                               ! index
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer, intent(in) :: field_index                               ! index
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  integer, intent(in), dimension(*) :: buf                         ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbwrite_field_index_c
@@ -807,13 +801,13 @@ subroutine h5tbwrite_field_index_f_float(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- integer, intent(IN) :: field_index                               ! index
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- real, intent(IN), dimension(*) :: buf                            ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer, intent(in) :: field_index                               ! index
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ real, intent(in), dimension(*) :: buf                            ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
@@ -821,18 +815,18 @@ subroutine h5tbwrite_field_index_f_float(loc_id,&
   integer function h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_INDEX_C'::h5tbwrite_field_index_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  integer, intent(IN) :: field_index                               ! index
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  real, intent(IN), dimension(*) :: buf                            ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer, intent(in) :: field_index                               ! index
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  real, intent(in), dimension(*) :: buf                            ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbwrite_field_index_c
@@ -872,13 +866,13 @@ subroutine h5tbwrite_field_index_f_double(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- integer, intent(IN) :: field_index                               ! index
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer, intent(in) :: field_index                               ! index
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ double precision, intent(in), dimension(*) :: buf                ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
@@ -886,18 +880,18 @@ subroutine h5tbwrite_field_index_f_double(loc_id,&
   integer function h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_INDEX_C'::h5tbwrite_field_index_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  integer, intent(IN) :: field_index                               ! index
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer, intent(in) :: field_index                               ! index
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  double precision, intent(in), dimension(*) :: buf                ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbwrite_field_index_c
@@ -935,13 +929,13 @@ subroutine h5tbwrite_field_index_f_string(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- integer, intent(IN) :: field_index                               ! index
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer, intent(in) :: field_index                               ! index
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
@@ -949,18 +943,18 @@ subroutine h5tbwrite_field_index_f_string(loc_id,&
   integer function h5tbwrite_field_index_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBWRITE_FIELD_INDEX_C'::h5tbwrite_field_index_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  integer, intent(IN) :: field_index                               ! index
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer, intent(in) :: field_index                               ! index
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbwrite_field_index_c
@@ -999,13 +993,13 @@ subroutine h5tbread_field_index_f_int(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- integer, intent(IN) :: field_index                               ! index
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer, intent(in) :: field_index                               ! index
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ integer, intent(in), dimension(*) :: buf                         ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
@@ -1013,18 +1007,18 @@ subroutine h5tbread_field_index_f_int(loc_id,&
   integer function h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_INDEX_C'::h5tbread_field_index_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  integer, intent(IN) :: field_index                               ! index
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer, intent(in) :: field_index                               ! index
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  integer, intent(in), dimension(*) :: buf                         ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbread_field_index_c
@@ -1062,13 +1056,13 @@ subroutine h5tbread_field_index_f_float(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- integer, intent(IN) :: field_index                               ! index
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- real, intent(IN), dimension(*) :: buf                            ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer, intent(in) :: field_index                               ! index
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ real, intent(in), dimension(*) :: buf                            ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
@@ -1076,18 +1070,18 @@ subroutine h5tbread_field_index_f_float(loc_id,&
   integer function h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,&
    start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_INDEX_C'::h5tbread_field_index_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  integer, intent(IN) :: field_index                               ! index
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  real, intent(IN), dimension(*) :: buf                            ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer, intent(in) :: field_index                               ! index
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  real, intent(in), dimension(*) :: buf                            ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbread_field_index_c
@@ -1125,13 +1119,13 @@ subroutine h5tbread_field_index_f_double(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- integer, intent(IN) :: field_index                               ! index
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer, intent(in) :: field_index                               ! index
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ double precision, intent(in), dimension(*) :: buf                ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
@@ -1139,18 +1133,18 @@ subroutine h5tbread_field_index_f_double(loc_id,&
   integer function h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,&
    start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_INDEX_C'::h5tbread_field_index_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  integer, intent(IN) :: field_index                               ! index
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer, intent(in) :: field_index                               ! index
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  double precision, intent(in), dimension(*) :: buf                ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbread_field_index_c
@@ -1188,13 +1182,13 @@ subroutine h5tbread_field_index_f_string(loc_id,&
                                       errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- integer, intent(IN) :: field_index                               ! index
- integer(HSIZE_T), intent(IN) :: start                            ! start record 
- integer(HSIZE_T), intent(IN) :: nrecords                         ! records
- integer(SIZE_T),  intent(IN) :: type_size                        ! type size
- character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer, intent(in) :: field_index                               ! index
+ integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: nrecords                         ! records
+ integer(size_t),  intent(in) :: type_size                        ! type size
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
@@ -1202,18 +1196,18 @@ subroutine h5tbread_field_index_f_string(loc_id,&
   integer function h5tbread_field_index_c(loc_id,namelen,dset_name,field_index,&
    start,nrecords,type_size,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBREAD_FIELD_INDEX_C'::h5tbread_field_index_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  integer, intent(IN) :: field_index                               ! index
-  integer(HSIZE_T), intent(IN) :: start                            ! start record 
-  integer(HSIZE_T), intent(IN) :: nrecords                         ! records
-  integer(SIZE_T),  intent(IN) :: type_size                        ! type size
-  character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer, intent(in) :: field_index                               ! index
+  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: nrecords                         ! records
+  integer(size_t),  intent(in) :: type_size                        ! type size
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbread_field_index_c
@@ -1227,9 +1221,6 @@ subroutine h5tbread_field_index_f_string(loc_id,&
 end subroutine h5tbread_field_index_f_string
 
 
-
-
-
 !-------------------------------------------------------------------------
 ! Function: h5tbinsert_field_f_int
 !
@@ -1253,12 +1244,12 @@ subroutine h5tbinsert_field_f_int(loc_id,&
                                   buf,&
                                   errcode ) 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HID_T), intent(IN)   :: field_type                       ! field type
- integer, intent(IN) :: field_index                               ! field_index
- integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hid_t), intent(in)   :: field_type                       ! field type
+ integer, intent(in) :: field_index                               ! field_index
+ integer, intent(in), dimension(*) :: buf                         ! data buffer 
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -1268,18 +1259,18 @@ subroutine h5tbinsert_field_f_int(loc_id,&
   integer function h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBINSERT_FIELD_C'::h5tbinsert_field_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HID_T), intent(IN)   :: field_type                       ! field type
-  integer, intent(IN) :: field_index                               ! field_index
-  integer, intent(IN), dimension(*) :: buf                         ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hid_t), intent(in)   :: field_type                       ! field type
+  integer, intent(in) :: field_index                               ! field_index
+  integer, intent(in), dimension(*) :: buf                         ! data buffer 
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length length
   end function h5tbinsert_field_c
@@ -1318,12 +1309,12 @@ subroutine h5tbinsert_field_f_float(loc_id,&
                                   buf,&
                                   errcode ) 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HID_T), intent(IN)   :: field_type                       ! field type
- integer, intent(IN) :: field_index                               ! field_index
- real, intent(IN), dimension(*) :: buf                            ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hid_t), intent(in)   :: field_type                       ! field type
+ integer, intent(in) :: field_index                               ! field_index
+ real, intent(in), dimension(*) :: buf                            ! data buffer 
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -1333,18 +1324,18 @@ subroutine h5tbinsert_field_f_float(loc_id,&
   integer function h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBINSERT_FIELD_C'::h5tbinsert_field_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HID_T), intent(IN)   :: field_type                       ! field type
-  integer, intent(IN) :: field_index                               ! field_index
-  real, intent(IN), dimension(*) :: buf                            ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hid_t), intent(in)   :: field_type                       ! field type
+  integer, intent(in) :: field_index                               ! field_index
+  real, intent(in), dimension(*) :: buf                            ! data buffer 
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length length
   end function h5tbinsert_field_c
@@ -1383,12 +1374,12 @@ subroutine h5tbinsert_field_f_double(loc_id,&
                                   buf,&
                                   errcode ) 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HID_T), intent(IN)   :: field_type                       ! field type
- integer, intent(IN) :: field_index                               ! field_index
- double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hid_t), intent(in)   :: field_type                       ! field type
+ integer, intent(in) :: field_index                               ! field_index
+ double precision, intent(in), dimension(*) :: buf                ! data buffer 
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -1398,18 +1389,18 @@ subroutine h5tbinsert_field_f_double(loc_id,&
   integer function h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBINSERT_FIELD_C'::h5tbinsert_field_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HID_T), intent(IN)   :: field_type                       ! field type
-  integer, intent(IN) :: field_index                               ! field_index
-  double precision, intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hid_t), intent(in)   :: field_type                       ! field type
+  integer, intent(in) :: field_index                               ! field_index
+  double precision, intent(in), dimension(*) :: buf                ! data buffer 
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length length
   end function h5tbinsert_field_c
@@ -1449,12 +1440,12 @@ subroutine h5tbinsert_field_f_string(loc_id,&
                                   buf,&
                                   errcode ) 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
- integer(HID_T), intent(IN)   :: field_type                       ! field type
- integer, intent(IN) :: field_index                               ! field_index
- character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
+ integer(hid_t), intent(in)   :: field_type                       ! field type
+ integer, intent(in) :: field_index                               ! field_index
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -1464,18 +1455,18 @@ subroutine h5tbinsert_field_f_string(loc_id,&
   integer function h5tbinsert_field_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBINSERT_FIELD_C'::h5tbinsert_field_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
-  character(LEN=*), intent(IN) :: field_name                       ! name of the field
-  integer(HID_T), intent(IN)   :: field_type                       ! field type
-  integer, intent(IN) :: field_index                               ! field_index
-  character(LEN=*), intent(IN), dimension(*) :: buf                ! data buffer 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  character(len=*), intent(in) :: field_name                       ! name of the field
+  integer(hid_t), intent(in)   :: field_type                       ! field type
+  integer, intent(in) :: field_index                               ! field_index
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length length
   end function h5tbinsert_field_c
@@ -1512,9 +1503,9 @@ subroutine h5tbdelete_field_f(loc_id,&
                               field_name,&
                               errcode ) 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
- character(LEN=*), intent(IN) :: field_name                       ! name of the field
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ character(len=*), intent(in) :: field_name                       ! name of the field
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -1523,7 +1514,7 @@ subroutine h5tbdelete_field_f(loc_id,&
  interface
   integer function h5tbdelete_field_c(loc_id,namelen,dset_name,namelen1,field_name)
  
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBDELETE_FIELD_C'::h5tbdelete_field_c
   !DEC$ ENDIF
@@ -1570,24 +1561,24 @@ subroutine h5tbget_table_info_f(loc_id,&
                                 errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id             ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name          ! name of the dataset 
- integer(HSIZE_T), intent(INOUT):: nfields          ! nfields 
- integer(HSIZE_T), intent(INOUT):: nrecords         ! nrecords 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
+ character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hsize_t), intent(inout):: nfields          ! nfields 
+ integer(hsize_t), intent(inout):: nrecords         ! nrecords 
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
 
  interface
   integer function h5tbget_table_info_c(loc_id,namelen,dset_name,nfields,nrecords)
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBGET_TABLE_INFO_C'::h5tbget_table_info_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id             ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name          ! name of the dataset 
-  integer(HSIZE_T), intent(INOUT):: nfields          ! nfields 
-  integer(HSIZE_T), intent(INOUT):: nrecords         ! nrecords 
+  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
+  character(len=*), intent(in) :: dset_name          ! name of the dataset 
+  integer(hsize_t), intent(inout):: nfields          ! nfields 
+  integer(hsize_t), intent(inout):: nrecords         ! nrecords 
   integer :: namelen                                 ! name length
   end function h5tbget_table_info_c
  end interface
@@ -1598,10 +1589,6 @@ subroutine h5tbget_table_info_f(loc_id,&
 end subroutine h5tbget_table_info_f
 
 
-
-
-
-
 !-------------------------------------------------------------------------
 ! Function: h5tbget_field_info_f
 !
@@ -1629,13 +1616,13 @@ subroutine h5tbget_field_info_f(loc_id,&
                                 errcode ) 
 
  implicit none
- integer(HID_T),   intent(IN) :: loc_id                                ! file or group identifier 
- character(LEN=*), intent(IN) :: dset_name                             ! name of the dataset 
- integer(HSIZE_T), intent(IN):: nfields                                ! nfields 
- character(LEN=*), dimension(nfields), intent(INOUT) :: field_names    ! field names
- integer(SIZE_T),  dimension(nfields), intent(INOUT) :: field_sizes    ! field sizes
- integer(SIZE_T),  dimension(nfields), intent(INOUT) :: field_offsets  ! field offsets
- integer(SIZE_T),  intent(INOUT):: type_size                           ! type size 
+ integer(hid_t),   intent(in) :: loc_id                                ! file or group identifier 
+ character(len=*), intent(in) :: dset_name                             ! name of the dataset 
+ integer(hsize_t), intent(in):: nfields                                ! nfields 
+ character(len=*), dimension(nfields), intent(inout) :: field_names    ! field names
+ integer(size_t),  dimension(nfields), intent(inout) :: field_sizes    ! field sizes
+ integer(size_t),  dimension(nfields), intent(inout) :: field_offsets  ! field offsets
+ integer(size_t),  intent(inout):: type_size                           ! type size 
  integer :: errcode                                                    ! error code
  integer :: namelen                                                    ! name length
  integer, dimension(nfields) :: namelen2                               ! name lengths
@@ -1645,18 +1632,18 @@ subroutine h5tbget_field_info_f(loc_id,&
   integer function h5tbget_field_info_c(loc_id,namelen,dset_name,nfields,&
    field_sizes,field_offsets,type_size,namelen2,field_names)
 
-  use H5GLOBAL
+  use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !MS$ATTRIBUTES C,reference,alias:'_H5TBGET_FIELD_INFO_C'::h5tbget_field_info_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(HID_T),   intent(IN) :: loc_id                                ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                             ! name of the dataset 
-  integer(HSIZE_T), intent(IN):: nfields                                ! nfields 
-  character(LEN=*), dimension(nfields), intent(INOUT) :: field_names    ! field names
-  integer(SIZE_T),  dimension(nfields), intent(INOUT) :: field_sizes    ! field sizes
-  integer(SIZE_T),  dimension(nfields), intent(INOUT) :: field_offsets  ! field offsets
-  integer(SIZE_T),  intent(INOUT):: type_size                           ! type size 
+  integer(hid_t),   intent(in) :: loc_id                                ! file or group identifier 
+  character(len=*), intent(in) :: dset_name                             ! name of the dataset 
+  integer(hsize_t), intent(in):: nfields                                ! nfields 
+  character(len=*), dimension(nfields), intent(inout) :: field_names    ! field names
+  integer(size_t),  dimension(nfields), intent(inout) :: field_sizes    ! field sizes
+  integer(size_t),  dimension(nfields), intent(inout) :: field_offsets  ! field offsets
+  integer(size_t),  intent(inout):: type_size                           ! type size 
   integer :: namelen                                                    ! name length
   integer, dimension(nfields) :: namelen2                               ! name lengths
   end function h5tbget_field_info_c