diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-30 04:16:01 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-30 04:16:01 (GMT) |
commit | 05fba39c115dd4ef12cbf96f5ae5dcfbf2c4c660 (patch) | |
tree | 47b9a9e0bdcb0dc6b2deeb682a235b73470abaf0 /hl | |
parent | 24e0562529d9436f29b2b79f303f03c031f7490a (diff) | |
download | hdf5-05fba39c115dd4ef12cbf96f5ae5dcfbf2c4c660.zip hdf5-05fba39c115dd4ef12cbf96f5ae5dcfbf2c4c660.tar.gz hdf5-05fba39c115dd4ef12cbf96f5ae5dcfbf2c4c660.tar.bz2 |
[svn-r18196] Description:
Trim trailing whitespace from source files, with the following command:
find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.f90" \) -print |xargs -n 1 sed -i "" 's/[[:blank:]]*$//'
Tested on:
None - just eyeballed
Diffstat (limited to 'hl')
36 files changed, 1667 insertions, 1667 deletions
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp index 77edce4..79339f4 100644 --- a/hl/c++/test/ptableTest.cpp +++ b/hl/c++/test/ptableTest.cpp @@ -253,13 +253,13 @@ out: int TestCompress() { - + unsigned int flags = 0; unsigned int config = 0; size_t cd_nelemts = 0; TESTING("compression") -#ifdef H5_HAVE_FILTER_DEFLATE +#ifdef H5_HAVE_FILTER_DEFLATE try { /* Create packet table with compression. */ FL_PacketTable wrapper(fileID, "/compressTest", H5T_NATIVE_CHAR, 100, 8); diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c index 1ffcb22..de304d9 100644 --- a/hl/examples/ex_table_01.c +++ b/hl/examples/ex_table_01.c @@ -129,7 +129,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c index 1ef661c..98e33d3 100644 --- a/hl/examples/ex_table_02.c +++ b/hl/examples/ex_table_02.c @@ -123,7 +123,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_03.c b/hl/examples/ex_table_03.c index af3894e..7315fd3 100644 --- a/hl/examples/ex_table_03.c +++ b/hl/examples/ex_table_03.c @@ -129,7 +129,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_04.c b/hl/examples/ex_table_04.c index 10d888f..0a01116 100644 --- a/hl/examples/ex_table_04.c +++ b/hl/examples/ex_table_04.c @@ -155,7 +155,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_05.c b/hl/examples/ex_table_05.c index ee671e0..f0c96eb 100644 --- a/hl/examples/ex_table_05.c +++ b/hl/examples/ex_table_05.c @@ -166,7 +166,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_06.c b/hl/examples/ex_table_06.c index e2e1038..261b23c 100644 --- a/hl/examples/ex_table_06.c +++ b/hl/examples/ex_table_06.c @@ -87,7 +87,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_07.c b/hl/examples/ex_table_07.c index 1be9f13..3479aa8 100644 --- a/hl/examples/ex_table_07.c +++ b/hl/examples/ex_table_07.c @@ -105,7 +105,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c index 6ec0ac1..4078bea 100644 --- a/hl/examples/ex_table_08.c +++ b/hl/examples/ex_table_08.c @@ -136,7 +136,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_09.c b/hl/examples/ex_table_09.c index 82dca3f..7ba0aa1 100644 --- a/hl/examples/ex_table_09.c +++ b/hl/examples/ex_table_09.c @@ -137,7 +137,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c index fb11a98..20543c2 100644 --- a/hl/examples/ex_table_10.c +++ b/hl/examples/ex_table_10.c @@ -129,7 +129,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_11.c b/hl/examples/ex_table_11.c index 7679ac6..872fa4e 100644 --- a/hl/examples/ex_table_11.c +++ b/hl/examples/ex_table_11.c @@ -109,7 +109,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/examples/ex_table_12.c b/hl/examples/ex_table_12.c index b4a5a3a..b6cc2b4 100644 --- a/hl/examples/ex_table_12.c +++ b/hl/examples/ex_table_12.c @@ -102,7 +102,7 @@ int main( void ) /* close type */ H5Tclose( string_type ); - + /* close the file */ H5Fclose( file_id ); diff --git a/hl/fortran/examples/exlite.f90 b/hl/fortran/examples/exlite.f90 index ad9c6d5..916bcb9 100644 --- a/hl/fortran/examples/exlite.f90 +++ b/hl/fortran/examples/exlite.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,7 +11,7 @@ ! 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. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! ! This file contains a FORTRAN90 example for the H5LT API @@ -20,7 +20,7 @@ program lite_example -use H5LT ! module of H5LT +use H5LT ! module of H5LT use HDF5 ! module of HDF5 library implicit none @@ -28,7 +28,7 @@ implicit none integer, parameter :: DIM1 = 4; ! Dimension of array character(len=9), parameter :: filename = "exlite.h5"! File name character(LEN=5), parameter :: dsetname1 = "dset1" ! Dataset name -integer(HID_T) :: file_id ! File identifier +integer(HID_T) :: file_id ! File identifier integer(HSIZE_T), dimension(1) :: dims = (/DIM1/) ! Dataset dimensions integer :: rank = 1 ! Dataset rank integer, dimension(DIM1) :: buf1 ! Data buffer @@ -49,7 +49,7 @@ end do ! Initialize FORTRAN predefined datatypes. ! -call h5open_f(errcode) +call h5open_f(errcode) ! ! Create a new file using default properties. @@ -58,13 +58,13 @@ call h5open_f(errcode) call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode) ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname1, rank, dims, H5T_NATIVE_INTEGER, buf1, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname1, H5T_NATIVE_INTEGER, bufr1, dims, errcode) @@ -96,10 +96,10 @@ call h5fclose_f(file_id, errcode) call h5close_f(errcode) ! -! end +! end ! -end program lite_example +end program lite_example diff --git a/hl/fortran/src/H5IMff.f90 b/hl/fortran/src/H5IMff.f90 index 0fd4cd8..6053c4e 100755 --- a/hl/fortran/src/H5IMff.f90 +++ b/hl/fortran/src/H5IMff.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,15 +11,15 @@ ! 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. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! ! ! This file contains FORTRAN90 interfaces for H5IM functions ! - + module h5im use h5fortran_types -use hdf5 +use hdf5 contains @@ -40,12 +40,12 @@ contains ! !------------------------------------------------------------------------- -subroutine h5immake_image_8bit_f(loc_id,& +subroutine h5immake_image_8bit_f(loc_id,& dset_name,& - width,& + width,& height,& buf,& - errcode ) + errcode ) implicit none @@ -56,14 +56,14 @@ subroutine h5immake_image_8bit_f(loc_id,& !DEC$endif ! - 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) :: width ! width of image + 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) :: width ! width of image integer(hsize_t), intent(in) :: height ! height of image - integer, intent(in), dimension(*) :: buf ! buffer + integer, intent(in), dimension(*) :: buf ! buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5immake_image_8bit_c(loc_id,namelen,dset_name,width,height,buf) use h5global @@ -73,10 +73,10 @@ subroutine h5immake_image_8bit_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), intent(in) :: width ! width of image + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), intent(in) :: width ! width of image integer(hsize_t), intent(in) :: height ! height of image - integer , intent(in), dimension(*) :: buf ! buffer + integer , intent(in), dimension(*) :: buf ! buffer end function h5immake_image_8bit_c end interface @@ -105,10 +105,10 @@ end subroutine h5immake_image_8bit_f !------------------------------------------------------------------------- -subroutine h5imread_image_f(loc_id,& +subroutine h5imread_image_f(loc_id,& dset_name,& buf,& - errcode ) + errcode ) implicit none @@ -118,12 +118,12 @@ subroutine h5imread_image_f(loc_id,& !DEC$attributes dllexport :: h5imread_image_f !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(inout), dimension(*) :: buf ! buffer + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(inout), dimension(*) :: buf ! buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5imread_image_c(loc_id,namelen,dset_name,buf) use h5global @@ -133,8 +133,8 @@ subroutine h5imread_image_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(inout), dimension(*) :: buf ! buffer + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(inout), dimension(*) :: buf ! buffer end function h5imread_image_c end interface @@ -161,13 +161,13 @@ end subroutine h5imread_image_f ! !------------------------------------------------------------------------- -subroutine h5immake_image_24bit_f(loc_id,& +subroutine h5immake_image_24bit_f(loc_id,& dset_name,& - width,& + width,& height,& il,& buf,& - errcode ) + errcode ) implicit none @@ -178,16 +178,16 @@ subroutine h5immake_image_24bit_f(loc_id,& !DEC$endif ! - 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) :: width ! width of image + 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) :: width ! width of image integer(hsize_t), intent(in) :: height ! height of image character(len=*), intent(in) :: il ! interlace - integer, intent(in), dimension(*) :: buf ! buffer + integer, intent(in), dimension(*) :: buf ! buffer integer :: errcode ! error code integer :: namelen ! name length integer :: ilen ! name length - + interface integer function h5immake_image_24bit_c(loc_id,namelen,dset_name,ilen,il,width,height,buf) use h5global @@ -197,14 +197,14 @@ subroutine h5immake_image_24bit_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name !DEC$ATTRIBUTES reference :: il 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) :: width ! width of image + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), intent(in) :: width ! width of image integer(hsize_t), intent(in) :: height ! height of image character(len=*), intent(in) :: il ! interlace - integer, intent(in), dimension(*) :: buf ! buffer + integer, intent(in), dimension(*) :: buf ! buffer integer :: namelen ! lenght of name buffer integer :: ilen ! name length - + end function h5immake_image_24bit_c end interface @@ -218,7 +218,7 @@ end subroutine h5immake_image_24bit_f !------------------------------------------------------------------------- ! Function: h5imget_image_info_f ! -! Purpose: Gets information about an image dataset (dimensions, interlace mode +! Purpose: Gets information about an image dataset (dimensions, interlace mode ! and number of associated palettes). ! ! Return: Success: 0, Failure: -1 @@ -233,14 +233,14 @@ end subroutine h5immake_image_24bit_f ! !------------------------------------------------------------------------- -subroutine h5imget_image_info_f(loc_id,& +subroutine h5imget_image_info_f(loc_id,& dset_name,& width,& height,& planes,& interlace,& npals,& - errcode ) + errcode ) implicit none @@ -251,13 +251,13 @@ subroutine h5imget_image_info_f(loc_id,& !DEC$endif ! - 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) :: width ! width of image + 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) :: width ! width of image integer(hsize_t), intent(inout) :: height ! height of image integer(hsize_t), intent(inout) :: planes ! color planes integer(hsize_t), intent(inout) :: npals ! palettes - character(len=*), intent(inout) :: interlace ! interlace + character(len=*), intent(inout) :: interlace ! interlace integer :: errcode ! error code integer :: namelen ! name length integer :: ilen ! name length @@ -270,13 +270,13 @@ subroutine h5imget_image_info_f(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name !DEC$ATTRIBUTES reference :: interlace - 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) :: width ! width of image + 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) :: width ! width of image integer(hsize_t), intent(inout) :: height ! height of image integer(hsize_t), intent(inout) :: planes ! color planes integer(hsize_t), intent(inout) :: npals ! palettes - character(len=*), intent(inout) :: interlace ! interlace + character(len=*), intent(inout) :: interlace ! interlace integer :: namelen ! name length integer :: ilen ! name length end function h5imget_image_info_c @@ -306,8 +306,8 @@ end subroutine h5imget_image_info_f ! !------------------------------------------------------------------------- -integer function h5imis_image_f(loc_id,& - dset_name) +integer function h5imis_image_f(loc_id,& + dset_name) implicit none @@ -318,8 +318,8 @@ integer function h5imis_image_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 :: errcode ! error code integer :: namelen ! name length @@ -332,7 +332,7 @@ integer function h5imis_image_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset end function h5imis_image_c end interface @@ -360,11 +360,11 @@ end function h5imis_image_f ! !------------------------------------------------------------------------- -subroutine h5immake_palette_f(loc_id,& +subroutine h5immake_palette_f(loc_id,& dset_name,& - pal_dims,& + pal_dims,& buf,& - errcode ) + errcode ) implicit none @@ -375,13 +375,13 @@ subroutine h5immake_palette_f(loc_id,& !DEC$endif ! - 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), dimension(*) :: pal_dims ! dimensions - integer, intent(in), dimension(*) :: buf ! buffer + 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), dimension(*) :: pal_dims ! dimensions + integer, intent(in), dimension(*) :: buf ! buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5immake_palette_c(loc_id,namelen,dset_name,pal_dims,buf) use h5global @@ -391,9 +391,9 @@ subroutine h5immake_palette_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset integer(hsize_t), intent(in), dimension(*) :: pal_dims ! dimensions - integer, intent(in), dimension(*) :: buf ! buffer + integer, intent(in), dimension(*) :: buf ! buffer end function h5immake_palette_c end interface @@ -421,10 +421,10 @@ end subroutine h5immake_palette_f ! !------------------------------------------------------------------------- -subroutine h5imlink_palette_f(loc_id,& +subroutine h5imlink_palette_f(loc_id,& dset_name,& pal_name,& - errcode ) + errcode ) implicit none @@ -434,9 +434,9 @@ subroutine h5imlink_palette_f(loc_id,& !DEC$attributes dllexport :: h5imlink_palette_f !DEC$endif ! - 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) :: pal_name ! palette 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) :: pal_name ! palette name integer :: errcode ! error code integer :: namelen ! name length integer :: ilen ! name length @@ -449,9 +449,9 @@ subroutine h5imlink_palette_f(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name !DEC$ATTRIBUTES reference :: pal_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) :: pal_name ! palette 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) :: pal_name ! palette name integer :: namelen ! name length integer :: ilen ! name length end function h5imlink_palette_c @@ -481,10 +481,10 @@ end subroutine h5imlink_palette_f ! !------------------------------------------------------------------------- -subroutine h5imunlink_palette_f(loc_id,& +subroutine h5imunlink_palette_f(loc_id,& dset_name,& pal_name,& - errcode ) + errcode ) implicit none @@ -496,9 +496,9 @@ subroutine h5imunlink_palette_f(loc_id,& ! - 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) :: pal_name ! palette 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) :: pal_name ! palette name integer :: errcode ! error code integer :: namelen ! name length integer :: ilen ! name length @@ -511,9 +511,9 @@ subroutine h5imunlink_palette_f(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name !DEC$ATTRIBUTES reference :: pal_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) :: pal_name ! palette 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) :: pal_name ! palette name integer :: namelen ! name length integer :: ilen ! name length end function h5imunlink_palette_c @@ -544,10 +544,10 @@ end subroutine h5imunlink_palette_f ! !------------------------------------------------------------------------- -subroutine h5imget_npalettes_f(loc_id,& +subroutine h5imget_npalettes_f(loc_id,& dset_name,& npals,& - errcode ) + errcode ) implicit none @@ -558,8 +558,8 @@ subroutine h5imget_npalettes_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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(inout) :: npals ! palettes integer :: errcode ! error code integer :: namelen ! name length @@ -571,8 +571,8 @@ subroutine h5imget_npalettes_f(loc_id,& !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IMGET_NPALETTES_C'::h5imget_npalettes_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(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) :: npals ! palettes integer :: namelen ! name length end function h5imget_npalettes_c @@ -601,15 +601,15 @@ end subroutine h5imget_npalettes_f ! !------------------------------------------------------------------------- -subroutine h5imget_palette_info_f(loc_id,& +subroutine h5imget_palette_info_f(loc_id,& dset_name,& pal_number,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -617,10 +617,10 @@ subroutine h5imget_palette_info_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: pal_number ! palette number - integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions + integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions integer :: errcode ! error code integer :: namelen ! name length @@ -631,10 +631,10 @@ subroutine h5imget_palette_info_f(loc_id,& !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IMGET_PALETTE_INFO_C'::h5imget_palette_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(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset integer, intent(in) :: pal_number ! palette number - integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions + integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions integer :: namelen ! name length end function h5imget_palette_info_c end interface @@ -664,11 +664,11 @@ end subroutine h5imget_palette_info_f !------------------------------------------------------------------------- -subroutine h5imget_palette_f(loc_id,& +subroutine h5imget_palette_f(loc_id,& dset_name,& pal_number,& buf,& - errcode ) + errcode ) implicit none @@ -679,13 +679,13 @@ subroutine h5imget_palette_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: pal_number ! palette number - integer, intent(inout), dimension(*) :: buf ! buffer + integer, intent(inout), dimension(*) :: buf ! buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5imget_palette_c(loc_id,namelen,dset_name,pal_number,buf) use h5global @@ -695,9 +695,9 @@ subroutine h5imget_palette_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset integer, intent(in) :: pal_number ! palette number - integer, intent(inout), dimension(*) :: buf ! buffer + integer, intent(inout), dimension(*) :: buf ! buffer end function h5imget_palette_c end interface @@ -724,8 +724,8 @@ end subroutine h5imget_palette_f ! !------------------------------------------------------------------------- -integer function h5imis_palette_f(loc_id,& - dset_name) +integer function h5imis_palette_f(loc_id,& + dset_name) implicit none @@ -736,8 +736,8 @@ integer function h5imis_palette_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 :: errcode ! error code integer :: namelen ! name length @@ -750,7 +750,7 @@ integer function h5imis_palette_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset end function h5imis_palette_c end interface @@ -764,7 +764,7 @@ end function h5imis_palette_f ! end ! end module H5IM - + diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90 index 45d9a23..e8eb96d 100755 --- a/hl/fortran/src/H5LTff.f90 +++ b/hl/fortran/src/H5LTff.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,7 +11,7 @@ ! 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. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! ! ! This file contains FORTRAN90 interfaces for H5LT functions @@ -19,7 +19,7 @@ module h5lt use h5fortran_types -use hdf5 +use hdf5 interface h5ltmake_dataset_f module procedure h5ltmake_dataset_f_int1 @@ -103,16 +103,16 @@ contains ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_f_int1(loc_id,& +subroutine h5ltmake_dataset_f_int1(loc_id,& dset_name,& - rank,& + rank,& dims,& type_id,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -120,15 +120,15 @@ subroutine h5ltmake_dataset_f_int1(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer(hid_t), intent(in) :: type_id ! datatype identifier - 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) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: type_id ! datatype identifier + integer, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5ltmake_dataset_int1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -137,12 +137,12 @@ subroutine h5ltmake_dataset_f_int1(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer, intent(in), dimension(*) :: buf ! data buffer + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer, intent(in), dimension(*) :: buf ! data buffer end function h5ltmake_dataset_int1_c end interface @@ -168,16 +168,16 @@ end subroutine h5ltmake_dataset_f_int1 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_f_int2(loc_id,& +subroutine h5ltmake_dataset_f_int2(loc_id,& dset_name,& - rank,& + rank,& dims,& type_id,& buf,& - errcode ) + errcode ) + + implicit none - implicit none - ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -185,16 +185,16 @@ subroutine h5ltmake_dataset_f_int2(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: errcode ! error code integer :: namelen ! name length integer, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer - + dimension(dims(1),dims(2)) :: buf ! data buffer + interface integer function h5ltmake_dataset_int2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -203,13 +203,13 @@ subroutine h5ltmake_dataset_f_int2(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltmake_dataset_int2_c end interface @@ -235,16 +235,16 @@ end subroutine h5ltmake_dataset_f_int2 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_f_int3(loc_id,& +subroutine h5ltmake_dataset_f_int3(loc_id,& dset_name,& - rank,& + rank,& dims,& type_id,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -252,16 +252,16 @@ subroutine h5ltmake_dataset_f_int3(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: errcode ! error code integer :: namelen ! name length integer, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer - + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + interface integer function h5ltmake_dataset_int3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -270,13 +270,13 @@ subroutine h5ltmake_dataset_f_int3(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltmake_dataset_int3_c end interface @@ -303,16 +303,16 @@ end subroutine h5ltmake_dataset_f_int3 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_f_float1(loc_id,& +subroutine h5ltmake_dataset_f_float1(loc_id,& dset_name,& - rank,& + rank,& dims,& type_id,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -320,15 +320,15 @@ subroutine h5ltmake_dataset_f_float1(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer(hid_t), intent(in) :: type_id ! datatype identifier - 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) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: type_id ! datatype identifier + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5ltmake_dataset_fl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -337,12 +337,12 @@ subroutine h5ltmake_dataset_f_float1(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - real, intent(in), dimension(*) :: buf ! data buffer + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + real, intent(in), dimension(*) :: buf ! data buffer end function h5ltmake_dataset_fl1_c end interface @@ -368,16 +368,16 @@ end subroutine h5ltmake_dataset_f_float1 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_f_float2(loc_id,& +subroutine h5ltmake_dataset_f_float2(loc_id,& dset_name,& - rank,& + rank,& dims,& type_id,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -385,16 +385,16 @@ subroutine h5ltmake_dataset_f_float2(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: errcode ! error code integer :: namelen ! name length real, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer - + dimension(dims(1),dims(2)) :: buf ! data buffer + interface integer function h5ltmake_dataset_fl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -403,13 +403,13 @@ subroutine h5ltmake_dataset_f_float2(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf real, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltmake_dataset_fl2_c end interface @@ -435,16 +435,16 @@ end subroutine h5ltmake_dataset_f_float2 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_f_float3(loc_id,& +subroutine h5ltmake_dataset_f_float3(loc_id,& dset_name,& - rank,& + rank,& dims,& type_id,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -452,16 +452,16 @@ subroutine h5ltmake_dataset_f_float3(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: errcode ! error code integer :: namelen ! name length real, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer - + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + interface integer function h5ltmake_dataset_fl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -470,13 +470,13 @@ subroutine h5ltmake_dataset_f_float3(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf real, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltmake_dataset_fl3_c end interface @@ -502,16 +502,16 @@ end subroutine h5ltmake_dataset_f_float3 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_f_double1(loc_id,& +subroutine h5ltmake_dataset_f_double1(loc_id,& dset_name,& - rank,& + rank,& dims,& type_id,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -519,15 +519,15 @@ subroutine h5ltmake_dataset_f_double1(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer(hid_t), intent(in) :: type_id ! datatype identifier - 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) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: type_id ! datatype identifier + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5ltmake_dataset_dl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -536,12 +536,12 @@ subroutine h5ltmake_dataset_f_double1(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - double precision, intent(in), dimension(*) :: buf ! data buffer + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + double precision, intent(in), dimension(*) :: buf ! data buffer end function h5ltmake_dataset_dl1_c end interface @@ -567,16 +567,16 @@ end subroutine h5ltmake_dataset_f_double1 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_f_double2(loc_id,& +subroutine h5ltmake_dataset_f_double2(loc_id,& dset_name,& - rank,& + rank,& dims,& type_id,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -584,16 +584,16 @@ subroutine h5ltmake_dataset_f_double2(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: errcode ! error code integer :: namelen ! name length double precision, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer - + dimension(dims(1),dims(2)) :: buf ! data buffer + interface integer function h5ltmake_dataset_dl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -602,13 +602,13 @@ subroutine h5ltmake_dataset_f_double2(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltmake_dataset_dl2_c end interface @@ -634,16 +634,16 @@ end subroutine h5ltmake_dataset_f_double2 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_f_double3(loc_id,& +subroutine h5ltmake_dataset_f_double3(loc_id,& dset_name,& - rank,& + rank,& dims,& type_id,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -651,16 +651,16 @@ subroutine h5ltmake_dataset_f_double3(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: errcode ! error code integer :: namelen ! name length double precision, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer - + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + interface integer function h5ltmake_dataset_dl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -669,13 +669,13 @@ subroutine h5ltmake_dataset_f_double3(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltmake_dataset_dl3_c end interface @@ -703,15 +703,15 @@ end subroutine h5ltmake_dataset_f_double3 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_f_int1(loc_id,& +subroutine h5ltread_dataset_f_int1(loc_id,& dset_name,& type_id,& buf,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -719,11 +719,11 @@ subroutine h5ltread_dataset_f_int1(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hid_t), intent(in) :: type_id ! datatype identifier - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer, intent(inout), 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(hid_t), intent(in) :: type_id ! datatype identifier + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer, intent(inout), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length @@ -735,11 +735,11 @@ subroutine h5ltread_dataset_f_int1(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(HID_T), intent(IN) :: loc_id ! file or group identifier - integer(HID_T), intent(IN) :: type_id ! datatype identifier + integer(HID_T), intent(IN) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(LEN=*), intent(IN) :: dset_name ! name of the dataset - integer(HSIZE_T), dimension(*), intent(IN) :: dims ! size of the bufffer buf - integer, intent(IN), dimension(*) :: buf ! data buffer + character(LEN=*), intent(IN) :: dset_name ! name of the dataset + integer(HSIZE_T), dimension(*), intent(IN) :: dims ! size of the bufffer buf + integer, intent(IN), dimension(*) :: buf ! data buffer end function h5ltread_dataset_int1_c end interface @@ -765,15 +765,15 @@ end subroutine h5ltread_dataset_f_int1 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_f_int2(loc_id,& +subroutine h5ltread_dataset_f_int2(loc_id,& dset_name,& type_id,& buf,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -781,14 +781,14 @@ subroutine h5ltread_dataset_f_int2(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hid_t), intent(in) :: type_id ! datatype identifier - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length integer, intent(inout), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer interface integer function h5ltread_dataset_int2_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -798,12 +798,12 @@ subroutine h5ltread_dataset_f_int2(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltread_dataset_int2_c end interface @@ -829,15 +829,15 @@ end subroutine h5ltread_dataset_f_int2 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_f_int3(loc_id,& +subroutine h5ltread_dataset_f_int3(loc_id,& dset_name,& type_id,& buf,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -845,14 +845,14 @@ subroutine h5ltread_dataset_f_int3(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hid_t), intent(in) :: type_id ! datatype identifier - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length integer, intent(inout), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer interface integer function h5ltread_dataset_int3_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -862,12 +862,12 @@ subroutine h5ltread_dataset_f_int3(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltread_dataset_int3_c end interface @@ -896,15 +896,15 @@ end subroutine h5ltread_dataset_f_int3 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_f_float1(loc_id,& +subroutine h5ltread_dataset_f_float1(loc_id,& dset_name,& type_id,& buf,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -912,11 +912,11 @@ subroutine h5ltread_dataset_f_float1(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hid_t), intent(in) :: type_id ! datatype identifier - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - real, intent(inout), 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(hid_t), intent(in) :: type_id ! datatype identifier + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + real, intent(inout), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length @@ -928,11 +928,11 @@ subroutine h5ltread_dataset_f_float1(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - real, intent(in), dimension(*) :: buf ! data buffer + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + real, intent(in), dimension(*) :: buf ! data buffer end function h5ltread_dataset_fl1_c end interface @@ -958,15 +958,15 @@ end subroutine h5ltread_dataset_f_float1 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_f_float2(loc_id,& +subroutine h5ltread_dataset_f_float2(loc_id,& dset_name,& type_id,& buf,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -975,14 +975,14 @@ subroutine h5ltread_dataset_f_float2(loc_id,& ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hid_t), intent(in) :: type_id ! datatype identifier - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length real, intent(inout), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer interface integer function h5ltread_dataset_fl2_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -992,12 +992,12 @@ subroutine h5ltread_dataset_f_float2(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf real, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltread_dataset_fl2_c end interface @@ -1023,15 +1023,15 @@ end subroutine h5ltread_dataset_f_float2 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_f_float3(loc_id,& +subroutine h5ltread_dataset_f_float3(loc_id,& dset_name,& type_id,& buf,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1039,14 +1039,14 @@ subroutine h5ltread_dataset_f_float3(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hid_t), intent(in) :: type_id ! datatype identifier - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length real, intent(inout), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer interface integer function h5ltread_dataset_fl3_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -1056,12 +1056,12 @@ subroutine h5ltread_dataset_f_float3(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf real, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltread_dataset_fl3_c end interface @@ -1088,15 +1088,15 @@ end subroutine h5ltread_dataset_f_float3 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_f_double1(loc_id,& +subroutine h5ltread_dataset_f_double1(loc_id,& dset_name,& type_id,& buf,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1104,11 +1104,11 @@ subroutine h5ltread_dataset_f_double1(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hid_t), intent(in) :: type_id ! datatype identifier - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - double precision, intent(inout), 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(hid_t), intent(in) :: type_id ! datatype identifier + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + double precision, intent(inout), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length @@ -1120,11 +1120,11 @@ subroutine h5ltread_dataset_f_double1(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - double precision, intent(in), dimension(*) :: buf ! data buffer + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + double precision, intent(in), dimension(*) :: buf ! data buffer end function h5ltread_dataset_dl1_c end interface @@ -1150,15 +1150,15 @@ end subroutine h5ltread_dataset_f_double1 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_f_double2(loc_id,& +subroutine h5ltread_dataset_f_double2(loc_id,& dset_name,& type_id,& buf,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1166,14 +1166,14 @@ subroutine h5ltread_dataset_f_double2(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hid_t), intent(in) :: type_id ! datatype identifier - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length double precision, intent(inout), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer interface integer function h5ltread_dataset_dl2_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -1183,12 +1183,12 @@ subroutine h5ltread_dataset_f_double2(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltread_dataset_dl2_c end interface @@ -1214,15 +1214,15 @@ end subroutine h5ltread_dataset_f_double2 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_f_double3(loc_id,& +subroutine h5ltread_dataset_f_double3(loc_id,& dset_name,& type_id,& buf,& dims,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1230,14 +1230,14 @@ subroutine h5ltread_dataset_f_double3(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hid_t), intent(in) :: type_id ! datatype identifier - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length double precision, intent(inout), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer interface integer function h5ltread_dataset_dl3_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -1247,12 +1247,12 @@ subroutine h5ltread_dataset_f_double3(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltread_dataset_dl3_c end interface @@ -1279,15 +1279,15 @@ end subroutine h5ltread_dataset_f_double3 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_int_f_1 (loc_id,& +subroutine h5ltmake_dataset_int_f_1 (loc_id,& dset_name,& - rank,& + rank,& dims,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1295,14 +1295,14 @@ subroutine h5ltmake_dataset_int_f_1 (loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - 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) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5ltmake_dataset_nint1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -1311,12 +1311,12 @@ subroutine h5ltmake_dataset_int_f_1 (loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - integer, intent(in), dimension(*) :: buf ! data buffer + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer, intent(in), dimension(*) :: buf ! data buffer end function h5ltmake_dataset_nint1_c end interface @@ -1342,15 +1342,15 @@ end subroutine h5ltmake_dataset_int_f_1 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_int_f_2 (loc_id,& +subroutine h5ltmake_dataset_int_f_2 (loc_id,& dset_name,& - rank,& + rank,& dims,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1358,16 +1358,16 @@ subroutine h5ltmake_dataset_int_f_2 (loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length integer, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer - - + dimension(dims(1),dims(2)) :: buf ! data buffer + + interface integer function h5ltmake_dataset_nint2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -1376,13 +1376,13 @@ subroutine h5ltmake_dataset_int_f_2 (loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltmake_dataset_nint2_c end interface @@ -1409,15 +1409,15 @@ end subroutine h5ltmake_dataset_int_f_2 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_int_f_3 (loc_id,& +subroutine h5ltmake_dataset_int_f_3 (loc_id,& dset_name,& - rank,& + rank,& dims,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1425,16 +1425,16 @@ subroutine h5ltmake_dataset_int_f_3 (loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length integer, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer - - + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + + interface integer function h5ltmake_dataset_nint3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -1443,13 +1443,13 @@ subroutine h5ltmake_dataset_int_f_3 (loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltmake_dataset_nint3_c end interface @@ -1477,15 +1477,15 @@ end subroutine h5ltmake_dataset_int_f_3 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_float_f_1 (loc_id,& +subroutine h5ltmake_dataset_float_f_1 (loc_id,& dset_name,& - rank,& + rank,& dims,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1493,14 +1493,14 @@ subroutine h5ltmake_dataset_float_f_1 (loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - 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) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5ltmake_dataset_nfl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -1509,12 +1509,12 @@ subroutine h5ltmake_dataset_float_f_1 (loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf - real, intent(in), dimension(*) :: buf ! data buffer + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + real, intent(in), dimension(*) :: buf ! data buffer end function h5ltmake_dataset_nfl1_c end interface @@ -1540,15 +1540,15 @@ end subroutine h5ltmake_dataset_float_f_1 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_float_f_2 (loc_id,& +subroutine h5ltmake_dataset_float_f_2 (loc_id,& dset_name,& - rank,& + rank,& dims,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1556,15 +1556,15 @@ subroutine h5ltmake_dataset_float_f_2 (loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length real, intent(in), & dimension(dims(1),dims(2)) :: buf ! data buffer - + interface integer function h5ltmake_dataset_nfl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -1573,13 +1573,13 @@ subroutine h5ltmake_dataset_float_f_2 (loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf real, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltmake_dataset_nfl2_c end interface @@ -1605,15 +1605,15 @@ end subroutine h5ltmake_dataset_float_f_2 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_float_f_3 (loc_id,& +subroutine h5ltmake_dataset_float_f_3 (loc_id,& dset_name,& - rank,& + rank,& dims,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1621,15 +1621,15 @@ subroutine h5ltmake_dataset_float_f_3 (loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length real, intent(in), & dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer - + interface integer function h5ltmake_dataset_nfl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -1638,13 +1638,13 @@ subroutine h5ltmake_dataset_float_f_3 (loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf real, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltmake_dataset_nfl3_c end interface @@ -1673,15 +1673,15 @@ end subroutine h5ltmake_dataset_float_f_3 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_double_f_1 (loc_id,& +subroutine h5ltmake_dataset_double_f_1 (loc_id,& dset_name,& - rank,& + rank,& dims,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1689,15 +1689,15 @@ subroutine h5ltmake_dataset_double_f_1 (loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length double precision, intent(in), & - dimension(dims(1)) :: buf ! data buffer - + dimension(dims(1)) :: buf ! data buffer + interface integer function h5ltmake_dataset_ndl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -1706,13 +1706,13 @@ subroutine h5ltmake_dataset_double_f_1 (loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(in), & - dimension(dims(1)) :: buf ! data buffer + dimension(dims(1)) :: buf ! data buffer end function h5ltmake_dataset_ndl1_c end interface @@ -1739,15 +1739,15 @@ end subroutine h5ltmake_dataset_double_f_1 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_double_f_2 (loc_id,& +subroutine h5ltmake_dataset_double_f_2 (loc_id,& dset_name,& - rank,& + rank,& dims,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1755,15 +1755,15 @@ subroutine h5ltmake_dataset_double_f_2 (loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length double precision, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer - + dimension(dims(1),dims(2)) :: buf ! data buffer + interface integer function h5ltmake_dataset_ndl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -1772,13 +1772,13 @@ subroutine h5ltmake_dataset_double_f_2 (loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(in), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltmake_dataset_ndl2_c end interface @@ -1804,15 +1804,15 @@ end subroutine h5ltmake_dataset_double_f_2 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_double_f_3 (loc_id,& +subroutine h5ltmake_dataset_double_f_3 (loc_id,& dset_name,& - rank,& + rank,& dims,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1820,15 +1820,15 @@ subroutine h5ltmake_dataset_double_f_3 (loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length double precision, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer - + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + interface integer function h5ltmake_dataset_ndl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf) use h5global @@ -1837,13 +1837,13 @@ subroutine h5ltmake_dataset_double_f_3 (loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(in) :: rank ! rank - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(in) :: rank ! rank + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(in), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltmake_dataset_ndl3_c end interface @@ -1871,14 +1871,14 @@ end subroutine h5ltmake_dataset_double_f_3 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_int_f_1(loc_id,& +subroutine h5ltread_dataset_int_f_1(loc_id,& dset_name,& buf,& - dims,& - errcode ) + dims,& + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1886,13 +1886,13 @@ subroutine h5ltread_dataset_int_f_1(loc_id,& !DEC$endif ! - integer(HID_T), intent(IN) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(HID_T), intent(IN) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length integer, intent(inout), & - dimension(dims(1)) :: buf ! data buffer + dimension(dims(1)) :: buf ! data buffer interface integer function h5ltread_dataset_nint1_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -1902,12 +1902,12 @@ subroutine h5ltread_dataset_int_f_1(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer, intent(inout), & - dimension(dims(1)) :: buf ! data buffer + dimension(dims(1)) :: buf ! data buffer end function h5ltread_dataset_nint1_c end interface @@ -1920,7 +1920,7 @@ end subroutine h5ltread_dataset_int_f_1 !------------------------------------------------------------------------- ! Function: h5ltread_dataset_int_f_2 ! -! Purpose: Read a dataset +! Purpose: Read a dataset ! ! Return: Success: 0, Failure: -1 ! @@ -1934,14 +1934,14 @@ end subroutine h5ltread_dataset_int_f_1 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_int_f_2(loc_id,& +subroutine h5ltread_dataset_int_f_2(loc_id,& dset_name,& buf,& - dims,& - errcode ) + dims,& + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1949,13 +1949,13 @@ subroutine h5ltread_dataset_int_f_2(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length integer, intent(inout), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer interface integer function h5ltread_dataset_nint2_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -1965,12 +1965,12 @@ subroutine h5ltread_dataset_int_f_2(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer, intent(inout), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltread_dataset_nint2_c end interface @@ -1982,7 +1982,7 @@ end subroutine h5ltread_dataset_int_f_2 !------------------------------------------------------------------------- ! Function: h5ltread_dataset_int_f_3 ! -! Purpose: Read a dataset +! Purpose: Read a dataset ! ! Return: Success: 0, Failure: -1 ! @@ -1996,14 +1996,14 @@ end subroutine h5ltread_dataset_int_f_2 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_int_f_3(loc_id,& +subroutine h5ltread_dataset_int_f_3(loc_id,& dset_name,& buf,& - dims,& - errcode ) + dims,& + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2011,13 +2011,13 @@ subroutine h5ltread_dataset_int_f_3(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length integer, intent(inout), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer interface integer function h5ltread_dataset_nint3_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -2027,12 +2027,12 @@ subroutine h5ltread_dataset_int_f_3(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer, intent(inout), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltread_dataset_nint3_c end interface @@ -2045,7 +2045,7 @@ end subroutine h5ltread_dataset_int_f_3 !------------------------------------------------------------------------- ! Function: h5ltread_dataset_float_f_1 ! -! Purpose: Read a dataset +! Purpose: Read a dataset ! ! Return: Success: 0, Failure: -1 ! @@ -2059,14 +2059,14 @@ end subroutine h5ltread_dataset_int_f_3 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_float_f_1(loc_id,& +subroutine h5ltread_dataset_float_f_1(loc_id,& dset_name,& buf,& - dims,& - errcode ) + dims,& + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2074,13 +2074,13 @@ subroutine h5ltread_dataset_float_f_1(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length real, intent(inout), & - dimension(dims(1)) :: buf ! data buffer + dimension(dims(1)) :: buf ! data buffer interface integer function h5ltread_dataset_nfl1_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -2090,12 +2090,12 @@ subroutine h5ltread_dataset_float_f_1(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf real, intent(inout), & - dimension(dims(1)) :: buf ! data buffer + dimension(dims(1)) :: buf ! data buffer end function h5ltread_dataset_nfl1_c end interface @@ -2108,7 +2108,7 @@ end subroutine h5ltread_dataset_float_f_1 !------------------------------------------------------------------------- ! Function: h5ltread_dataset_float_f_2 ! -! Purpose: Read a dataset +! Purpose: Read a dataset ! ! Return: Success: 0, Failure: -1 ! @@ -2122,14 +2122,14 @@ end subroutine h5ltread_dataset_float_f_1 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_float_f_2(loc_id,& +subroutine h5ltread_dataset_float_f_2(loc_id,& dset_name,& buf,& - dims,& - errcode ) + dims,& + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2137,13 +2137,13 @@ subroutine h5ltread_dataset_float_f_2(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length real, intent(inout), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer interface integer function h5ltread_dataset_nfl2_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -2153,12 +2153,12 @@ subroutine h5ltread_dataset_float_f_2(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf real, intent(inout), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltread_dataset_nfl2_c end interface @@ -2184,14 +2184,14 @@ end subroutine h5ltread_dataset_float_f_2 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_float_f_3(loc_id,& +subroutine h5ltread_dataset_float_f_3(loc_id,& dset_name,& buf,& - dims,& - errcode ) + dims,& + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2199,13 +2199,13 @@ subroutine h5ltread_dataset_float_f_3(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length real, intent(inout), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer interface integer function h5ltread_dataset_nfl3_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -2215,12 +2215,12 @@ subroutine h5ltread_dataset_float_f_3(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf real, intent(inout), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltread_dataset_nfl3_c end interface @@ -2232,7 +2232,7 @@ end subroutine h5ltread_dataset_float_f_3 !------------------------------------------------------------------------- ! Function: h5ltread_dataset_double_f_1 ! -! Purpose: Read a dataset +! Purpose: Read a dataset ! ! Return: Success: 0, Failure: -1 ! @@ -2246,14 +2246,14 @@ end subroutine h5ltread_dataset_float_f_3 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_double_f_1(loc_id,& +subroutine h5ltread_dataset_double_f_1(loc_id,& dset_name,& buf,& - dims,& - errcode ) + dims,& + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2261,13 +2261,13 @@ subroutine h5ltread_dataset_double_f_1(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length double precision, intent(inout), & - dimension(dims(1)) :: buf ! data buffer + dimension(dims(1)) :: buf ! data buffer interface integer function h5ltread_dataset_ndl1_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -2277,12 +2277,12 @@ subroutine h5ltread_dataset_double_f_1(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(inout), & - dimension(dims(1)) :: buf ! data buffer + dimension(dims(1)) :: buf ! data buffer end function h5ltread_dataset_ndl1_c end interface @@ -2295,7 +2295,7 @@ end subroutine h5ltread_dataset_double_f_1 !------------------------------------------------------------------------- ! Function: h5ltread_dataset_double_f_2 ! -! Purpose: Read a dataset +! Purpose: Read a dataset ! ! Return: Success: 0, Failure: -1 ! @@ -2309,14 +2309,14 @@ end subroutine h5ltread_dataset_double_f_1 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_double_f_2(loc_id,& +subroutine h5ltread_dataset_double_f_2(loc_id,& dset_name,& buf,& - dims,& - errcode ) + dims,& + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2324,13 +2324,13 @@ subroutine h5ltread_dataset_double_f_2(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length double precision, intent(inout), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer interface integer function h5ltread_dataset_ndl2_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -2340,12 +2340,12 @@ subroutine h5ltread_dataset_double_f_2(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(inout), & - dimension(dims(1),dims(2)) :: buf ! data buffer + dimension(dims(1),dims(2)) :: buf ! data buffer end function h5ltread_dataset_ndl2_c end interface @@ -2357,7 +2357,7 @@ end subroutine h5ltread_dataset_double_f_2 !------------------------------------------------------------------------- ! Function: h5ltread_dataset_double_f_3 ! -! Purpose: Read a dataset +! Purpose: Read a dataset ! ! Return: Success: 0, Failure: -1 ! @@ -2371,14 +2371,14 @@ end subroutine h5ltread_dataset_double_f_2 ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_double_f_3(loc_id,& +subroutine h5ltread_dataset_double_f_3(loc_id,& dset_name,& buf,& - dims,& - errcode ) + dims,& + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2386,13 +2386,13 @@ subroutine h5ltread_dataset_double_f_3(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf integer :: errcode ! error code integer :: namelen ! name length double precision, intent(inout), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer interface integer function h5ltread_dataset_ndl3_c(loc_id,namelen,dset_name,type_id,buf,dims) @@ -2402,12 +2402,12 @@ subroutine h5ltread_dataset_double_f_3(loc_id,& !DEC$ ENDIF !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier - integer(hid_t), intent(in) :: type_id ! datatype identifier + integer(hid_t), intent(in) :: type_id ! datatype identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf double precision, intent(inout), & - dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer + dimension(dims(1),dims(2),dims(3)) :: buf ! data buffer end function h5ltread_dataset_ndl3_c end interface @@ -2434,13 +2434,13 @@ end subroutine h5ltread_dataset_double_f_3 ! !------------------------------------------------------------------------- -subroutine h5ltmake_dataset_string_f(loc_id,& +subroutine h5ltmake_dataset_string_f(loc_id,& dset_name,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2448,12 +2448,12 @@ subroutine h5ltmake_dataset_string_f(loc_id,& !DEC$endif ! - 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) :: 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) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length - + interface integer function h5ltmake_dataset_string_c(loc_id,namelen,dset_name,buf) use h5global @@ -2463,8 +2463,8 @@ subroutine h5ltmake_dataset_string_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - character(len=*), intent(in) :: buf ! data buffer + character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: buf ! data buffer end function h5ltmake_dataset_string_c end interface @@ -2476,7 +2476,7 @@ end subroutine h5ltmake_dataset_string_f !------------------------------------------------------------------------- ! Function: h5ltread_dataset_string_f ! -! Purpose: Read a dataset +! Purpose: Read a dataset ! ! Return: Success: 0, Failure: -1 ! @@ -2490,13 +2490,13 @@ end subroutine h5ltmake_dataset_string_f ! !------------------------------------------------------------------------- -subroutine h5ltread_dataset_string_f(loc_id,& +subroutine h5ltread_dataset_string_f(loc_id,& dset_name,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2504,8 +2504,8 @@ subroutine h5ltread_dataset_string_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(inout) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length @@ -2519,7 +2519,7 @@ subroutine h5ltread_dataset_string_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(inout) :: buf ! data buffer end function h5ltread_dataset_string_c end interface @@ -2554,15 +2554,15 @@ end subroutine h5ltread_dataset_string_f ! !------------------------------------------------------------------------- -subroutine h5ltset_attribute_int_f(loc_id,& +subroutine h5ltset_attribute_int_f(loc_id,& dset_name,& attr_name,& buf,& size,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2570,8 +2570,8 @@ subroutine h5ltset_attribute_int_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute integer(size_t), intent(in) :: size ! size of attribute array integer :: errcode ! error code @@ -2590,7 +2590,7 @@ subroutine h5ltset_attribute_int_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute integer(size_t), intent(in) :: size ! size of attribute array integer, intent(in), dimension(*) :: buf ! data buffer @@ -2620,15 +2620,15 @@ end subroutine h5ltset_attribute_int_f ! !------------------------------------------------------------------------- -subroutine h5ltset_attribute_float_f(loc_id,& +subroutine h5ltset_attribute_float_f(loc_id,& dset_name,& attr_name,& buf,& size,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2636,8 +2636,8 @@ subroutine h5ltset_attribute_float_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute integer(size_t), intent(in) :: size ! size of attribute array integer :: errcode ! error code @@ -2656,7 +2656,7 @@ subroutine h5ltset_attribute_float_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute integer(size_t), intent(in) :: size ! size of attribute array real, intent(in), dimension(*) :: buf ! data buffer @@ -2686,15 +2686,15 @@ end subroutine h5ltset_attribute_float_f ! !------------------------------------------------------------------------- -subroutine h5ltset_attribute_double_f(loc_id,& +subroutine h5ltset_attribute_double_f(loc_id,& dset_name,& attr_name,& buf,& size,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2702,8 +2702,8 @@ subroutine h5ltset_attribute_double_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute integer(size_t), intent(in) :: size ! size of attribute array integer :: errcode ! error code @@ -2722,7 +2722,7 @@ subroutine h5ltset_attribute_double_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute integer(size_t), intent(in) :: size ! size of attribute array double precision, intent(in), dimension(*) :: buf ! data buffer @@ -2753,14 +2753,14 @@ end subroutine h5ltset_attribute_double_f ! !------------------------------------------------------------------------- -subroutine h5ltset_attribute_string_f(loc_id,& +subroutine h5ltset_attribute_string_f(loc_id,& dset_name,& attr_name,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2768,8 +2768,8 @@ subroutine h5ltset_attribute_string_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute integer :: errcode ! error code character(len=*), intent(in) :: buf ! data buffer @@ -2787,7 +2787,7 @@ subroutine h5ltset_attribute_string_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute character(len=*), intent(in) :: buf ! data buffer end function h5ltset_attribute_string_c @@ -2818,14 +2818,14 @@ end subroutine h5ltset_attribute_string_f ! !------------------------------------------------------------------------- -subroutine h5ltget_attribute_int_f(loc_id,& +subroutine h5ltget_attribute_int_f(loc_id,& dset_name,& attr_name,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2833,8 +2833,8 @@ subroutine h5ltget_attribute_int_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute integer :: errcode ! error code integer, intent(inout), dimension(*) :: buf ! data buffer @@ -2852,7 +2852,7 @@ subroutine h5ltget_attribute_int_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute integer, intent(inout), dimension(*) :: buf ! data buffer end function h5ltget_attribute_int_c @@ -2882,14 +2882,14 @@ end subroutine h5ltget_attribute_int_f ! !------------------------------------------------------------------------- -subroutine h5ltget_attribute_float_f(loc_id,& +subroutine h5ltget_attribute_float_f(loc_id,& dset_name,& attr_name,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2897,8 +2897,8 @@ subroutine h5ltget_attribute_float_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute integer :: errcode ! error code real, intent(inout), dimension(*) :: buf ! data buffer @@ -2916,7 +2916,7 @@ subroutine h5ltget_attribute_float_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute real, intent(inout), dimension(*) :: buf ! data buffer end function h5ltget_attribute_float_c @@ -2945,14 +2945,14 @@ end subroutine h5ltget_attribute_float_f ! !------------------------------------------------------------------------- -subroutine h5ltget_attribute_double_f(loc_id,& +subroutine h5ltget_attribute_double_f(loc_id,& dset_name,& attr_name,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -2960,8 +2960,8 @@ subroutine h5ltget_attribute_double_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute integer :: errcode ! error code double precision,intent(inout),dimension(*) :: buf ! data buffer @@ -2979,7 +2979,7 @@ subroutine h5ltget_attribute_double_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute double precision, intent(inout), dimension(*) :: buf ! data buffer end function h5ltget_attribute_double_c @@ -3008,14 +3008,14 @@ end subroutine h5ltget_attribute_double_f ! !------------------------------------------------------------------------- -subroutine h5ltget_attribute_string_f(loc_id,& +subroutine h5ltget_attribute_string_f(loc_id,& dset_name,& attr_name,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -3023,8 +3023,8 @@ subroutine h5ltget_attribute_string_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute integer :: errcode ! error code character(len=*), intent(inout) :: buf ! data buffer @@ -3042,7 +3042,7 @@ subroutine h5ltget_attribute_string_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute character(len=*), intent(inout) :: buf ! data buffer end function h5ltget_attribute_string_c @@ -3075,13 +3075,13 @@ end subroutine h5ltget_attribute_string_f ! !------------------------------------------------------------------------- -subroutine h5ltget_dataset_ndims_f(loc_id,& +subroutine h5ltget_dataset_ndims_f(loc_id,& dset_name,& rank,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -3089,9 +3089,9 @@ subroutine h5ltget_dataset_ndims_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(inout) :: rank ! rank + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(inout) :: rank ! rank integer :: errcode ! error code integer :: namelen ! name length @@ -3104,8 +3104,8 @@ subroutine h5ltget_dataset_ndims_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer, intent(inout) :: rank ! rank + character(len=*), intent(in) :: dset_name ! name of the dataset + integer, intent(inout) :: rank ! rank end function h5ltget_dataset_ndims_c end interface @@ -3118,7 +3118,7 @@ end subroutine h5ltget_dataset_ndims_f !------------------------------------------------------------------------- ! Function: h5ltfind_dataset_f ! -! Purpose: Inquires if a dataset named dset_name exists attached +! Purpose: Inquires if a dataset named dset_name exists attached ! to the object loc_id. ! ! Return: Success: 0, Failure: -1 @@ -3133,11 +3133,11 @@ end subroutine h5ltget_dataset_ndims_f ! !------------------------------------------------------------------------- -integer function h5ltfind_dataset_f(loc_id,& - dset_name) +integer function h5ltfind_dataset_f(loc_id,& + dset_name) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -3145,8 +3145,8 @@ integer function h5ltfind_dataset_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 :: errcode ! error code integer :: namelen ! name length @@ -3159,7 +3159,7 @@ integer function h5ltfind_dataset_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset end function h5ltfind_dataset_c end interface @@ -3186,15 +3186,15 @@ end function h5ltfind_dataset_f ! !------------------------------------------------------------------------- -subroutine h5ltget_dataset_info_f(loc_id,& +subroutine h5ltget_dataset_info_f(loc_id,& dset_name,& dims,& type_class,& type_size,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -3202,9 +3202,9 @@ subroutine h5ltget_dataset_info_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions + integer(hid_t), intent(in) :: loc_id ! file or group identifier + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions integer, intent(inout) :: type_class ! type class integer(size_t), intent(inout) :: type_size ! type size integer :: errcode ! error code @@ -3219,10 +3219,10 @@ subroutine h5ltget_dataset_info_f(loc_id,& !DEC$ATTRIBUTES reference :: dset_name integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset - integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions + character(len=*), intent(in) :: dset_name ! name of the dataset + integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions integer, intent(inout) :: type_class ! type class - integer(size_t), intent(inout) :: type_size ! type size + integer(size_t), intent(inout) :: type_size ! type size end function h5ltget_dataset_info_c end interface @@ -3254,14 +3254,14 @@ end subroutine h5ltget_dataset_info_f ! !------------------------------------------------------------------------- -subroutine h5ltget_attribute_ndims_f(loc_id,& +subroutine h5ltget_attribute_ndims_f(loc_id,& dset_name,& attr_name,& rank,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -3269,10 +3269,10 @@ subroutine h5ltget_attribute_ndims_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute - integer, intent(inout) :: rank ! rank + integer, intent(inout) :: rank ! rank integer :: errcode ! error code integer :: namelen ! name length integer :: attrlen ! name length @@ -3288,9 +3288,9 @@ subroutine h5ltget_attribute_ndims_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute - integer, intent(inout) :: rank ! rank + integer, intent(inout) :: rank ! rank end function h5ltget_attribute_ndims_c end interface @@ -3318,16 +3318,16 @@ end subroutine h5ltget_attribute_ndims_f ! !------------------------------------------------------------------------- -subroutine h5ltget_attribute_info_f(loc_id,& +subroutine h5ltget_attribute_info_f(loc_id,& dset_name,& attr_name,& dims,& type_class,& type_size,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -3335,10 +3335,10 @@ subroutine h5ltget_attribute_info_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: attr_name ! name of the attribute - integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions + integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions integer, intent(inout) :: type_class ! type class integer(size_t), intent(inout) :: type_size ! type size integer :: errcode ! error code @@ -3356,11 +3356,11 @@ subroutine h5ltget_attribute_info_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer - character(len=*), intent(in) :: dset_name ! name of the dataset + character(len=*), intent(in) :: dset_name ! name of the dataset character(len=*), intent(in) :: attr_name ! name of the attribute - integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions + integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions integer, intent(inout) :: type_class ! type class - integer(size_t), intent(inout) :: type_size ! type size + integer(size_t), intent(inout) :: type_size ! type size end function h5ltget_attribute_info_c end interface @@ -3375,9 +3375,9 @@ end subroutine h5ltget_attribute_info_f ! end ! end module H5LT - - + + diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c index cea094a..c641cf4 100755 --- a/hl/fortran/src/H5TBfc.c +++ b/hl/fortran/src/H5TBfc.c @@ -635,7 +635,7 @@ int_f nh5tbinsert_field_c(hid_t_f *loc_id, int_f *namelen, _fcd name, - int_f *namelen1, + int_f *namelen1, _fcd field_name, hid_t_f *field_type, int_f *position, diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90 index 781bd6a..6731b79 100755 --- a/hl/fortran/src/H5TBff.f90 +++ b/hl/fortran/src/H5TBff.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,15 +11,15 @@ ! 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. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! ! ! This file contains FORTRAN90 interfaces for H5TB functions ! - + module h5tb use h5fortran_types -use hdf5 +use hdf5 interface h5tbwrite_field_name_f @@ -80,9 +80,9 @@ contains !------------------------------------------------------------------------- subroutine h5tbmake_table_f(table_title,& - loc_id,& + loc_id,& dset_name,& - nfields,& + nfields,& nrecords,& type_size,& field_names,& @@ -90,7 +90,7 @@ subroutine h5tbmake_table_f(table_title,& field_types,& chunk_size,& compress,& - errcode ) + errcode ) implicit none @@ -101,10 +101,10 @@ subroutine h5tbmake_table_f(table_title,& !DEC$endif ! - 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 + 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 @@ -118,7 +118,7 @@ subroutine h5tbmake_table_f(table_title,& integer, dimension(nfields) :: namelen2 ! name lengths integer :: i ! general purpose integer - + interface integer function h5tbmake_table_c(namelen1,& table_title,& @@ -141,10 +141,10 @@ subroutine h5tbmake_table_f(table_title,& !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 + 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 @@ -197,17 +197,17 @@ end subroutine h5tbmake_table_f ! !------------------------------------------------------------------------- -subroutine h5tbwrite_field_name_f_int(loc_id,& +subroutine h5tbwrite_field_name_f_int(loc_id,& dset_name,& - field_name,& + field_name,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -215,13 +215,13 @@ subroutine h5tbwrite_field_name_f_int(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: field_name ! name of the field - integer(hsize_t), intent(in) :: start ! start record + 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, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -229,20 +229,20 @@ subroutine h5tbwrite_field_name_f_int(loc_id,& interface integer function h5tbwrite_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_INT_C'::h5tbwrite_field_name_int_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 + 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) :: 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, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -251,7 +251,7 @@ subroutine h5tbwrite_field_name_f_int(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbwrite_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) @@ -272,17 +272,17 @@ end subroutine h5tbwrite_field_name_f_int ! !------------------------------------------------------------------------- -subroutine h5tbwrite_field_name_f_float(loc_id,& +subroutine h5tbwrite_field_name_f_float(loc_id,& dset_name,& - field_name,& + field_name,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -290,13 +290,13 @@ subroutine h5tbwrite_field_name_f_float(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: field_name ! name of the field - integer(hsize_t), intent(in) :: start ! start record + 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -304,20 +304,20 @@ subroutine h5tbwrite_field_name_f_float(loc_id,& interface integer function h5tbwrite_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_FL_C'::h5tbwrite_field_name_fl_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 + 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) :: 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -326,7 +326,7 @@ subroutine h5tbwrite_field_name_f_float(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbwrite_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) @@ -349,17 +349,17 @@ end subroutine h5tbwrite_field_name_f_float ! !------------------------------------------------------------------------- -subroutine h5tbwrite_field_name_f_double(loc_id,& +subroutine h5tbwrite_field_name_f_double(loc_id,& dset_name,& - field_name,& + field_name,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -367,13 +367,13 @@ subroutine h5tbwrite_field_name_f_double(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: field_name ! name of the field - integer(hsize_t), intent(in) :: start ! start record + 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -381,20 +381,20 @@ subroutine h5tbwrite_field_name_f_double(loc_id,& interface integer function h5tbwrite_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_DL_C'::h5tbwrite_field_name_dl_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 + 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) :: 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -403,7 +403,7 @@ subroutine h5tbwrite_field_name_f_double(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbwrite_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) @@ -424,17 +424,17 @@ end subroutine h5tbwrite_field_name_f_double ! !------------------------------------------------------------------------- -subroutine h5tbwrite_field_name_f_string(loc_id,& +subroutine h5tbwrite_field_name_f_string(loc_id,& dset_name,& - field_name,& + field_name,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -442,13 +442,13 @@ subroutine h5tbwrite_field_name_f_string(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: field_name ! name of the field - integer(hsize_t), intent(in) :: start ! start record + 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -456,20 +456,20 @@ subroutine h5tbwrite_field_name_f_string(loc_id,& interface integer function h5tbwrite_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_ST_C'::h5tbwrite_field_name_st_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 + 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) :: 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -478,7 +478,7 @@ subroutine h5tbwrite_field_name_f_string(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbwrite_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) @@ -500,17 +500,17 @@ end subroutine h5tbwrite_field_name_f_string ! !------------------------------------------------------------------------- -subroutine h5tbread_field_name_f_int(loc_id,& +subroutine h5tbread_field_name_f_int(loc_id,& dset_name,& - field_name,& + field_name,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -518,13 +518,13 @@ subroutine h5tbread_field_name_f_int(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: field_name ! name of the field - integer(hsize_t), intent(in) :: start ! start record + 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, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -532,20 +532,20 @@ subroutine h5tbread_field_name_f_int(loc_id,& interface integer function h5tbread_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_INT_C'::h5tbread_field_name_int_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 + 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) :: 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, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -554,7 +554,7 @@ subroutine h5tbread_field_name_f_int(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbread_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) @@ -575,17 +575,17 @@ end subroutine h5tbread_field_name_f_int ! !------------------------------------------------------------------------- -subroutine h5tbread_field_name_f_float(loc_id,& +subroutine h5tbread_field_name_f_float(loc_id,& dset_name,& - field_name,& + field_name,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -593,13 +593,13 @@ subroutine h5tbread_field_name_f_float(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: field_name ! name of the field - integer(hsize_t), intent(in) :: start ! start record + 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -607,20 +607,20 @@ subroutine h5tbread_field_name_f_float(loc_id,& interface integer function h5tbread_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_FL_C'::h5tbread_field_name_fl_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 + 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) :: 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -629,7 +629,7 @@ subroutine h5tbread_field_name_f_float(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbread_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) @@ -650,17 +650,17 @@ end subroutine h5tbread_field_name_f_float ! !------------------------------------------------------------------------- -subroutine h5tbread_field_name_f_double(loc_id,& +subroutine h5tbread_field_name_f_double(loc_id,& dset_name,& - field_name,& + field_name,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -668,13 +668,13 @@ subroutine h5tbread_field_name_f_double(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: field_name ! name of the field - integer(hsize_t), intent(in) :: start ! start record + 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -682,20 +682,20 @@ subroutine h5tbread_field_name_f_double(loc_id,& interface integer function h5tbread_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_DL_C'::h5tbread_field_name_dl_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 + 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) :: 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -704,7 +704,7 @@ subroutine h5tbread_field_name_f_double(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbread_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) @@ -725,17 +725,17 @@ end subroutine h5tbread_field_name_f_double ! !------------------------------------------------------------------------- -subroutine h5tbread_field_name_f_string(loc_id,& +subroutine h5tbread_field_name_f_string(loc_id,& dset_name,& - field_name,& + field_name,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -743,13 +743,13 @@ subroutine h5tbread_field_name_f_string(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: field_name ! name of the field - integer(hsize_t), intent(in) :: start ! start record + 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -757,20 +757,20 @@ subroutine h5tbread_field_name_f_string(loc_id,& interface integer function h5tbread_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_ST_C'::h5tbread_field_name_st_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 + 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) :: 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length integer :: namelen1 ! name length @@ -779,7 +779,7 @@ subroutine h5tbread_field_name_f_string(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbread_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,& start,nrecords,type_size,buf) @@ -801,17 +801,17 @@ end subroutine h5tbread_field_name_f_string ! !------------------------------------------------------------------------- -subroutine h5tbwrite_field_index_f_int(loc_id,& +subroutine h5tbwrite_field_index_f_int(loc_id,& dset_name,& - field_index,& + field_index,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -819,39 +819,39 @@ subroutine h5tbwrite_field_index_f_int(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: field_index ! index - integer(hsize_t), intent(in) :: start ! start record + 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, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length interface integer function h5tbwrite_field_index_int_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_INT_C'::h5tbwrite_field_index_int_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(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) :: 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, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length end function h5tbwrite_field_index_int_c end interface namelen = len(dset_name) - + errcode = h5tbwrite_field_index_int_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) @@ -872,17 +872,17 @@ end subroutine h5tbwrite_field_index_f_int ! !------------------------------------------------------------------------- -subroutine h5tbwrite_field_index_f_float(loc_id,& +subroutine h5tbwrite_field_index_f_float(loc_id,& dset_name,& - field_index,& + field_index,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -890,39 +890,39 @@ subroutine h5tbwrite_field_index_f_float(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: field_index ! index - integer(hsize_t), intent(in) :: start ! start record + 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length interface integer function h5tbwrite_field_index_fl_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_FL_C'::h5tbwrite_field_index_fl_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(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) :: 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length end function h5tbwrite_field_index_fl_c end interface namelen = len(dset_name) - + errcode = h5tbwrite_field_index_fl_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) @@ -945,17 +945,17 @@ end subroutine h5tbwrite_field_index_f_float ! !------------------------------------------------------------------------- -subroutine h5tbwrite_field_index_f_double(loc_id,& +subroutine h5tbwrite_field_index_f_double(loc_id,& dset_name,& - field_index,& + field_index,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -963,39 +963,39 @@ subroutine h5tbwrite_field_index_f_double(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: field_index ! index - integer(hsize_t), intent(in) :: start ! start record + 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length interface integer function h5tbwrite_field_index_dl_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_DL_C'::h5tbwrite_field_index_dl_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(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) :: 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length end function h5tbwrite_field_index_dl_c end interface namelen = len(dset_name) - + errcode = h5tbwrite_field_index_dl_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) @@ -1016,17 +1016,17 @@ end subroutine h5tbwrite_field_index_f_double ! !------------------------------------------------------------------------- -subroutine h5tbwrite_field_index_f_string(loc_id,& +subroutine h5tbwrite_field_index_f_string(loc_id,& dset_name,& - field_index,& + field_index,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1034,39 +1034,39 @@ subroutine h5tbwrite_field_index_f_string(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: field_index ! index - integer(hsize_t), intent(in) :: start ! start record + 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length interface integer function h5tbwrite_field_index_st_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_ST_C'::h5tbwrite_field_index_st_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(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) :: 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length end function h5tbwrite_field_index_st_c end interface namelen = len(dset_name) - + errcode = h5tbwrite_field_index_st_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) @@ -1088,17 +1088,17 @@ end subroutine h5tbwrite_field_index_f_string ! !------------------------------------------------------------------------- -subroutine h5tbread_field_index_f_int(loc_id,& +subroutine h5tbread_field_index_f_int(loc_id,& dset_name,& - field_index,& + field_index,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1106,39 +1106,39 @@ subroutine h5tbread_field_index_f_int(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: field_index ! index - integer(hsize_t), intent(in) :: start ! start record + 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, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length interface integer function h5tbread_field_index_int_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_INT_C'::h5tbread_field_index_int_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(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) :: 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, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length end function h5tbread_field_index_int_c end interface namelen = len(dset_name) - + errcode = h5tbread_field_index_int_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) @@ -1159,17 +1159,17 @@ end subroutine h5tbread_field_index_f_int ! !------------------------------------------------------------------------- -subroutine h5tbread_field_index_f_float(loc_id,& +subroutine h5tbread_field_index_f_float(loc_id,& dset_name,& - field_index,& + field_index,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1177,39 +1177,39 @@ subroutine h5tbread_field_index_f_float(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: field_index ! index - integer(hsize_t), intent(in) :: start ! start record + 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length interface integer function h5tbread_field_index_fl_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_FL_C'::h5tbread_field_index_fl_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(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) :: 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length end function h5tbread_field_index_fl_c end interface namelen = len(dset_name) - + errcode = h5tbread_field_index_fl_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) @@ -1230,17 +1230,17 @@ end subroutine h5tbread_field_index_f_float ! !------------------------------------------------------------------------- -subroutine h5tbread_field_index_f_double(loc_id,& +subroutine h5tbread_field_index_f_double(loc_id,& dset_name,& - field_index,& + field_index,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1248,39 +1248,39 @@ subroutine h5tbread_field_index_f_double(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: field_index ! index - integer(hsize_t), intent(in) :: start ! start record + 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length interface integer function h5tbread_field_index_dl_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_DL_C'::h5tbread_field_index_dl_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(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) :: 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length end function h5tbread_field_index_dl_c end interface namelen = len(dset_name) - + errcode = h5tbread_field_index_dl_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) @@ -1301,17 +1301,17 @@ end subroutine h5tbread_field_index_f_double ! !------------------------------------------------------------------------- -subroutine h5tbread_field_index_f_string(loc_id,& +subroutine h5tbread_field_index_f_string(loc_id,& dset_name,& - field_index,& + field_index,& start,& nrecords,& type_size,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1319,39 +1319,39 @@ subroutine h5tbread_field_index_f_string(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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, intent(in) :: field_index ! index - integer(hsize_t), intent(in) :: start ! start record + 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length interface integer function h5tbread_field_index_st_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_ST_C'::h5tbread_field_index_st_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(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) :: 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: errcode ! error code integer :: namelen ! name length end function h5tbread_field_index_st_c end interface namelen = len(dset_name) - + errcode = h5tbread_field_index_st_c(loc_id,namelen,dset_name,field_index,& start,nrecords,type_size,buf) @@ -1373,15 +1373,15 @@ end subroutine h5tbread_field_index_f_string ! !------------------------------------------------------------------------- -subroutine h5tbinsert_field_f_int(loc_id,& +subroutine h5tbinsert_field_f_int(loc_id,& dset_name,& - field_name,& + field_name,& field_type,& field_index,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1389,12 +1389,12 @@ subroutine h5tbinsert_field_f_int(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 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, intent(in), dimension(*) :: buf ! data buffer integer :: namelen ! name length integer :: namelen1 ! name length integer :: errcode ! error code @@ -1403,19 +1403,19 @@ subroutine h5tbinsert_field_f_int(loc_id,& interface integer function h5tbinsert_field_int_c(loc_id,namelen,dset_name,namelen1,field_name,& field_type,field_index,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_INT_C'::h5tbinsert_field_int_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 + 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, intent(in), dimension(*) :: buf ! data buffer integer :: namelen ! name length integer :: namelen1 ! name length length end function h5tbinsert_field_int_c @@ -1423,7 +1423,7 @@ subroutine h5tbinsert_field_f_int(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbinsert_field_int_c(loc_id,namelen,dset_name,namelen1,field_name,& field_type,field_index,buf) @@ -1446,15 +1446,15 @@ end subroutine h5tbinsert_field_f_int ! !------------------------------------------------------------------------- -subroutine h5tbinsert_field_f_float(loc_id,& +subroutine h5tbinsert_field_f_float(loc_id,& dset_name,& - field_name,& + field_name,& field_type,& field_index,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1462,12 +1462,12 @@ subroutine h5tbinsert_field_f_float(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: namelen ! name length integer :: namelen1 ! name length integer :: errcode ! error code @@ -1476,19 +1476,19 @@ subroutine h5tbinsert_field_f_float(loc_id,& interface integer function h5tbinsert_field_fl_c(loc_id,namelen,dset_name,namelen1,field_name,& field_type,field_index,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_FL_C'::h5tbinsert_field_fl_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 + 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 + real, intent(in), dimension(*) :: buf ! data buffer integer :: namelen ! name length integer :: namelen1 ! name length length end function h5tbinsert_field_fl_c @@ -1496,7 +1496,7 @@ subroutine h5tbinsert_field_f_float(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbinsert_field_fl_c(loc_id,namelen,dset_name,namelen1,field_name,& field_type,field_index,buf) @@ -1519,15 +1519,15 @@ end subroutine h5tbinsert_field_f_float ! !------------------------------------------------------------------------- -subroutine h5tbinsert_field_f_double(loc_id,& +subroutine h5tbinsert_field_f_double(loc_id,& dset_name,& - field_name,& + field_name,& field_type,& field_index,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1535,12 +1535,12 @@ subroutine h5tbinsert_field_f_double(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: namelen ! name length integer :: namelen1 ! name length integer :: errcode ! error code @@ -1549,19 +1549,19 @@ subroutine h5tbinsert_field_f_double(loc_id,& interface integer function h5tbinsert_field_dl_c(loc_id,namelen,dset_name,namelen1,field_name,& field_type,field_index,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_DL_C'::h5tbinsert_field_dl_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 + 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 + double precision, intent(in), dimension(*) :: buf ! data buffer integer :: namelen ! name length integer :: namelen1 ! name length length end function h5tbinsert_field_dl_c @@ -1569,7 +1569,7 @@ subroutine h5tbinsert_field_f_double(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbinsert_field_dl_c(loc_id,namelen,dset_name,namelen1,field_name,& field_type,field_index,buf) @@ -1593,15 +1593,15 @@ end subroutine h5tbinsert_field_f_double ! !------------------------------------------------------------------------- -subroutine h5tbinsert_field_f_string(loc_id,& +subroutine h5tbinsert_field_f_string(loc_id,& dset_name,& - field_name,& + field_name,& field_type,& field_index,& buf,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1609,12 +1609,12 @@ subroutine h5tbinsert_field_f_string(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: namelen ! name length integer :: namelen1 ! name length integer :: errcode ! error code @@ -1623,19 +1623,19 @@ subroutine h5tbinsert_field_f_string(loc_id,& interface integer function h5tbinsert_field_st_c(loc_id,namelen,dset_name,namelen1,field_name,& field_type,field_index,buf) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_ST_C'::h5tbinsert_field_st_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 + 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 + character(len=*), intent(in), dimension(*) :: buf ! data buffer integer :: namelen ! name length integer :: namelen1 ! name length length end function h5tbinsert_field_st_c @@ -1643,7 +1643,7 @@ subroutine h5tbinsert_field_f_string(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbinsert_field_st_c(loc_id,namelen,dset_name,namelen1,field_name,& field_type,field_index,buf) @@ -1667,12 +1667,12 @@ end subroutine h5tbinsert_field_f_string ! !------------------------------------------------------------------------- -subroutine h5tbdelete_field_f(loc_id,& +subroutine h5tbdelete_field_f(loc_id,& dset_name,& field_name,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1680,8 +1680,8 @@ subroutine h5tbdelete_field_f(loc_id,& !DEC$endif ! - integer(hid_t), intent(in) :: loc_id ! file or group identifier - character(len=*), intent(in) :: dset_name ! 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 character(len=*), intent(in) :: field_name ! name of the field integer :: namelen ! name length integer :: namelen1 ! name length @@ -1690,15 +1690,15 @@ subroutine h5tbdelete_field_f(loc_id,& interface integer function h5tbdelete_field_c(loc_id,namelen,dset_name,namelen1,field_name) - + use h5global !DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBDELETE_FIELD_C'::h5tbdelete_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 + 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 length @@ -1707,7 +1707,7 @@ subroutine h5tbdelete_field_f(loc_id,& namelen = len(dset_name) namelen1 = len(field_name) - + errcode = h5tbdelete_field_c(loc_id,namelen,dset_name,namelen1,field_name) end subroutine h5tbdelete_field_f @@ -1731,14 +1731,14 @@ end subroutine h5tbdelete_field_f ! !------------------------------------------------------------------------- -subroutine h5tbget_table_info_f(loc_id,& +subroutine h5tbget_table_info_f(loc_id,& dset_name,& nfields,& nrecords,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1746,10 +1746,10 @@ subroutine h5tbget_table_info_f(loc_id,& !DEC$endif ! - 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 @@ -1760,10 +1760,10 @@ subroutine h5tbget_table_info_f(loc_id,& !DEC$ ATTRIBUTES C,reference,decorate,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 @@ -1791,17 +1791,17 @@ end subroutine h5tbget_table_info_f ! !------------------------------------------------------------------------- -subroutine h5tbget_field_info_f(loc_id,& +subroutine h5tbget_field_info_f(loc_id,& dset_name,& nfields,& field_names,& field_sizes,& field_offsets,& type_size,& - errcode ) + errcode ) implicit none - + ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1809,13 +1809,13 @@ subroutine h5tbget_field_info_f(loc_id,& !DEC$endif ! - 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 + 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(size_t), intent(inout):: type_size ! type size integer :: errcode ! error code integer :: namelen ! name length integer, dimension(nfields) :: namelen2 ! name lengths @@ -1830,13 +1830,13 @@ subroutine h5tbget_field_info_f(loc_id,& !DEC$ ATTRIBUTES C,reference,decorate,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 + 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(size_t), intent(inout):: type_size ! type size integer :: namelen ! name length integer, dimension(nfields) :: namelen2 ! name lengths end function h5tbget_field_info_c @@ -1856,9 +1856,9 @@ end subroutine h5tbget_field_info_f ! end ! end module H5TB - - + + diff --git a/hl/fortran/test/tstimage.f90 b/hl/fortran/test/tstimage.f90 index 9eee787..3794bbf 100755 --- a/hl/fortran/test/tstimage.f90 +++ b/hl/fortran/test/tstimage.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,21 +11,21 @@ ! 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. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! ! -! This file contains the FORTRAN90 tests for H5LT +! This file contains the FORTRAN90 tests for H5LT ! program image_test call make_image1() -end program image_test +end program image_test !------------------------------------------------------------------------- -! make_image1 +! make_image1 !------------------------------------------------------------------------- subroutine make_image1() @@ -39,7 +39,7 @@ character(len=8), parameter :: filename = "f1img.h5" ! file name character(len=4), parameter :: dsetname1 = "img1" ! dataset name character(len=4), parameter :: dsetname2 = "img2" ! dataset name character(len=15), parameter :: il ="INTERLACE_PIXEL"! dataset name -integer(hid_t) :: file_id ! file identifier +integer(hid_t) :: file_id ! file identifier integer(hsize_t), parameter :: width = 500 ! width of image integer(hsize_t), parameter :: height = 200 ! height of image integer, parameter :: pal_entries = 9 ! palette number of entries @@ -47,39 +47,39 @@ integer, dimension(width*height) :: buf1 ! data buffer integer, dimension(width*height) :: bufr1 ! data buffer integer, dimension(width*height*3) :: buf2 ! data buffer integer, dimension(width*height*3) :: bufr2 ! data buffer -integer(hsize_t) :: widthr ! width of image +integer(hsize_t) :: widthr ! width of image integer(hsize_t) :: heightr ! height of image integer(hsize_t) :: planesr ! color planes integer(hsize_t) :: npalsr ! palettes -character(len=15) :: interlacer ! interlace +character(len=15) :: interlacer ! interlace integer :: errcode ! error flag integer :: is_image ! error flag integer :: i, j, n ! general purpose integers ! ! palette -! create a 9 entry palette +! create a 9 entry palette ! character(len=4), parameter :: pal_name = "pal1" ! dataset name integer(hsize_t), dimension(2) :: pal_dims = (/pal_entries,3/) ! palette dimensions integer(hsize_t), dimension(2) :: pal_dims_out ! palette dimensions integer, dimension(pal_entries*3) :: pal_data_out ! data buffer integer(hsize_t) :: npals ! number of palettes -integer :: pal_number ! palette number -integer :: is_palette ! is palette +integer :: pal_number ! palette number +integer :: is_palette ! is palette integer :: space integer, dimension(pal_entries*3) :: pal_data_in = (/& - 0,0,168,& ! dark blue - 0,0,252,& ! blue - 0,168,252,& ! ocean blue - 84,252,252,& ! light blue - 168,252,168,& ! light green - 0,252,168,& ! green - 252,252,84,& ! yellow - 252,168,0,& ! orange - 252,0,0/) ! red + 0,0,168,& ! dark blue + 0,0,252,& ! blue + 0,168,252,& ! ocean blue + 84,252,252,& ! light blue + 168,252,168,& ! light green + 0,252,168,& ! green + 252,252,84,& ! yellow + 252,168,0,& ! orange + 252,0,0/) ! red -! create an 8bit image of 9 values divided evenly by the array +! create an 8bit image of 9 values divided evenly by the array ! space = width*height / pal_entries; n = 0; j = 0; @@ -110,7 +110,7 @@ end do ! Initialize FORTRAN predefined datatypes. ! -call h5open_f(errcode) +call h5open_f(errcode) ! ! Create a new file using default properties. @@ -119,17 +119,17 @@ call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode) !------------------------------------------------------------------------- -! indexed image +! indexed image !------------------------------------------------------------------------- call test_begin(' Make/Read image 8bit ') ! -! write image. +! write image. ! call h5immake_image_8bit_f(file_id,dsetname1,width,height,buf1,errcode) ! -! read image. +! read image. ! call h5imread_image_f(file_id,dsetname1,bufr1,errcode) ! @@ -144,7 +144,7 @@ do i = 1, width*height end do ! -! get image info. +! get image info. ! call h5imget_image_info_f(file_id,dsetname1,widthr,heightr,planesr,interlacer,npalsr,errcode) @@ -163,18 +163,18 @@ endif call passed() !------------------------------------------------------------------------- -! true color image +! true color image !------------------------------------------------------------------------- call test_begin(' Make/Read image 24bit ') ! -! write image. +! write image. ! call h5immake_image_24bit_f(file_id,dsetname2,width,height,il,buf2,errcode) ! -! read image. +! read image. ! call h5imread_image_f(file_id,dsetname2,bufr2,errcode) @@ -190,7 +190,7 @@ do i = 1, width*height*3 end do ! -! get image info. +! get image info. ! call h5imget_image_info_f(file_id,dsetname2,widthr,heightr,planesr,interlacer,npalsr,errcode) @@ -210,15 +210,15 @@ endif call passed() !------------------------------------------------------------------------- -! palette +! palette !------------------------------------------------------------------------- call test_begin(' Make palette ') ! -! make palette. +! make palette. ! -call h5immake_palette_f(file_id,pal_name,pal_dims,pal_data_in,errcode) +call h5immake_palette_f(file_id,pal_name,pal_dims,pal_data_in,errcode) call passed() @@ -226,13 +226,13 @@ call passed() call test_begin(' Link/Unlink palette ') ! -! link palette. +! link palette. ! call h5imlink_palette_f(file_id,dsetname1,pal_name,errcode) ! -! read palette. +! read palette. ! pal_number = 0 call h5imget_palette_f(file_id,dsetname1,pal_number,pal_data_out,errcode) @@ -251,7 +251,7 @@ end do ! ! get number of palettes ! -call h5imget_npalettes_f(file_id,dsetname1,npals,errcode) +call h5imget_npalettes_f(file_id,dsetname1,npals,errcode) if ( npals /= 1) then print *, 'h5imget_npalettes_f bad value' @@ -262,7 +262,7 @@ endif ! get palette info ! pal_number = 0 -call h5imget_palette_info_f(file_id,dsetname1,pal_number,pal_dims_out,errcode) +call h5imget_palette_info_f(file_id,dsetname1,pal_number,pal_dims_out,errcode) if ( (pal_dims_out(1) /= pal_dims(1)) .or. (pal_dims_out(2) /= pal_dims(2))) then print *, 'h5imget_palette_info_f bad value' @@ -270,9 +270,9 @@ if ( (pal_dims_out(1) /= pal_dims(1)) .or. (pal_dims_out(2) /= pal_dims(2))) the endif ! -! is palette +! is palette ! -is_palette = h5imis_palette_f(file_id,pal_name) +is_palette = h5imis_palette_f(file_id,pal_name) if ( is_palette /= 1 ) then print *, 'h5imis_palette_f bad value' @@ -280,14 +280,14 @@ if ( is_palette /= 1 ) then endif ! -! unlink palette. +! unlink palette. ! call h5imunlink_palette_f(file_id,dsetname1,pal_name,errcode) ! ! get number of palettes ! -call h5imget_npalettes_f(file_id,dsetname1,npals,errcode ) +call h5imget_npalettes_f(file_id,dsetname1,npals,errcode ) if ( npals /= 0) then print *, 'h5imget_npalettes_f bad value' @@ -304,7 +304,7 @@ call passed() !------------------------------------------------------------------------- -! end +! end !------------------------------------------------------------------------- ! @@ -323,17 +323,17 @@ call h5close_f(errcode) end subroutine make_image1 !------------------------------------------------------------------------- -! test_begin +! test_begin !------------------------------------------------------------------------- subroutine test_begin(string) character(len=*), intent(in) :: string write(*, fmt = '(14a)', advance = 'no') string -write(*, fmt = '(40x,a)', advance = 'no') ' ' +write(*, fmt = '(40x,a)', advance = 'no') ' ' end subroutine test_begin !------------------------------------------------------------------------- -! passed +! passed !------------------------------------------------------------------------- subroutine passed() diff --git a/hl/fortran/test/tstlite.f90 b/hl/fortran/test/tstlite.f90 index c261ad8..37ce9b2 100644 --- a/hl/fortran/test/tstlite.f90 +++ b/hl/fortran/test/tstlite.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,10 +11,10 @@ ! 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. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! ! -! This file contains the FORTRAN90 tests for H5LT +! This file contains the FORTRAN90 tests for H5LT ! program lite_test @@ -25,16 +25,16 @@ call test_dataset3D() call test_datasets() call test_attributes() -end program lite_test +end program lite_test !------------------------------------------------------------------------- -! test_dataset1D +! test_dataset1D !------------------------------------------------------------------------- subroutine test_dataset1D() -use H5LT ! module of H5LT +use H5LT ! module of H5LT use HDF5 ! module of HDF5 library implicit none @@ -44,7 +44,7 @@ character(len=9), parameter :: filename = "dsetf1.h5"! File name character(LEN=5), parameter :: dsetname1 = "dset1" ! Dataset name character(LEN=5), parameter :: dsetname2 = "dset2" ! Dataset name character(LEN=5), parameter :: dsetname3 = "dset3" ! Dataset name -integer(HID_T) :: file_id ! File identifier +integer(HID_T) :: file_id ! File identifier integer(HSIZE_T), dimension(1) :: dims = (/DIM1/) ! Dataset dimensions integer :: rank = 1 ! Dataset rank integer, dimension(DIM1) :: buf1 ! Data buffer @@ -72,7 +72,7 @@ end do ! ! Initialize FORTRAN predefined datatypes. ! -call h5open_f(errcode) +call h5open_f(errcode) ! ! Create a new file using default properties. @@ -80,16 +80,16 @@ call h5open_f(errcode) call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode) !------------------------------------------------------------------------- -! H5T_NATIVE_INTEGER +! H5T_NATIVE_INTEGER !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname1, rank, dims, H5T_NATIVE_INTEGER, buf1, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname1, H5T_NATIVE_INTEGER, bufr1, dims, errcode) @@ -105,16 +105,16 @@ do i = 1, DIM1 end do !------------------------------------------------------------------------- -! H5T_NATIVE_REAL +! H5T_NATIVE_REAL !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname2, rank, dims, H5T_NATIVE_REAL, buf2, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname2, H5T_NATIVE_REAL, bufr2, dims, errcode) @@ -130,16 +130,16 @@ do i = 1, DIM1 end do !------------------------------------------------------------------------- -! H5T_NATIVE_DOUBLE +! H5T_NATIVE_DOUBLE !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname3, rank, dims, H5T_NATIVE_DOUBLE, buf3, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname3, H5T_NATIVE_DOUBLE, bufr3, dims, errcode) @@ -169,14 +169,14 @@ call passed() ! end function. ! end subroutine test_dataset1D - + !------------------------------------------------------------------------- -! test_dataset2D +! test_dataset2D !------------------------------------------------------------------------- subroutine test_dataset2D() -use H5LT ! module of H5LT +use H5LT ! module of H5LT use HDF5 ! module of HDF5 library implicit none @@ -189,7 +189,7 @@ character(LEN=5), parameter :: dsetname1 = "dset1" ! Dataset name character(LEN=5), parameter :: dsetname2 = "dset2" ! Dataset name character(LEN=5), parameter :: dsetname3 = "dset3" ! Dataset name character(LEN=5), parameter :: dsetname4 = "dset4" ! Dataset name -integer(HID_T) :: file_id ! File identifier +integer(HID_T) :: file_id ! File identifier integer(HSIZE_T), dimension(2) :: dims = (/4,6/) ! Dataset dimensions integer :: rank = 2 ! Dataset rank integer, dimension(DIM1*DIM2) :: buf ! Data buffer @@ -222,12 +222,12 @@ do i = 1, dims(1) buf4(i,j) = (i-1)*dims(2) + j; end do end do - + ! ! Initialize FORTRAN predefined datatypes. ! -call h5open_f(errcode) +call h5open_f(errcode) ! ! Create a new file using default properties. @@ -239,12 +239,12 @@ call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode) !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname1, rank, dims, H5T_NATIVE_INTEGER, buf, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname1, H5T_NATIVE_INTEGER, bufr, dims, errcode) @@ -264,12 +264,12 @@ end do !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname2, rank, dims, H5T_NATIVE_INTEGER, buf2, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname2, H5T_NATIVE_INTEGER, buf2r, dims, errcode) @@ -291,12 +291,12 @@ end do !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname3, rank, dims, H5T_NATIVE_REAL, buf3, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname3, H5T_NATIVE_REAL, buf3r, dims, errcode) @@ -318,12 +318,12 @@ end do !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname4, rank, dims, H5T_NATIVE_DOUBLE, buf4, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname4, H5T_NATIVE_DOUBLE, buf4r, dims, errcode) @@ -354,7 +354,7 @@ call passed() ! ! end function. ! -end subroutine test_dataset2D +end subroutine test_dataset2D !------------------------------------------------------------------------- @@ -364,7 +364,7 @@ end subroutine test_dataset2D subroutine test_dataset3D() -use H5LT ! module of H5LT +use H5LT ! module of H5LT use HDF5 ! module of HDF5 library implicit none @@ -377,7 +377,7 @@ character(LEN=5), parameter :: dsetname1 = "dset1" ! Dataset name character(LEN=5), parameter :: dsetname2 = "dset2" ! Dataset name character(LEN=5), parameter :: dsetname3 = "dset3" ! Dataset name character(LEN=5), parameter :: dsetname4 = "dset4" ! Dataset name -integer(HID_T) :: file_id ! File identifier +integer(HID_T) :: file_id ! File identifier integer(HSIZE_T), dimension(3) :: dims = (/DIM1,DIM2,DIM3/) ! Dataset dimensions integer, dimension(DIM1*DIM2*DIM3) :: buf ! Data buffer integer, dimension(DIM1*DIM2*DIM3) :: bufr ! Data buffer @@ -418,7 +418,7 @@ end do ! ! Initialize FORTRAN predefined datatypes. ! -call h5open_f(errcode) +call h5open_f(errcode) ! ! Create a new file using default properties. @@ -430,12 +430,12 @@ call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode) !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname1, rank, dims, H5T_NATIVE_INTEGER, buf, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname1, H5T_NATIVE_INTEGER, bufr, dims, errcode) @@ -455,12 +455,12 @@ end do !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname2, rank, dims, H5T_NATIVE_INTEGER, buf2, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname2, H5T_NATIVE_INTEGER, buf2r, dims, errcode) @@ -484,12 +484,12 @@ end do !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname3, rank, dims, H5T_NATIVE_REAL, buf3, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname3, H5T_NATIVE_REAL, buf3r, dims, errcode) @@ -513,12 +513,12 @@ end do !------------------------------------------------------------------------- ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_f(file_id, dsetname4, rank, dims, H5T_NATIVE_DOUBLE, buf4, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_f(file_id, dsetname4, H5T_NATIVE_DOUBLE, buf4r, dims, errcode) @@ -561,13 +561,13 @@ end subroutine test_dataset3D subroutine test_datasets() -use H5LT ! module of H5LT +use H5LT ! module of H5LT use HDF5 ! module of HDF5 library implicit none character(len=9), parameter :: filename = "dsetf4.h5"! File name -integer(HID_T) :: file_id ! File identifier +integer(HID_T) :: file_id ! File identifier integer :: errcode ! Error flag integer, parameter :: DIM1 = 10; ! Dimension of array character(LEN=5), parameter :: dsetname1 = "dset1" ! Dataset name @@ -594,7 +594,7 @@ integer(SIZE_T) :: type_size ! ! Initialize FORTRAN predefined datatypes. ! -call h5open_f(errcode) +call h5open_f(errcode) ! ! Create a new file using default properties. @@ -613,18 +613,18 @@ do i = 1, DIM1 end do !------------------------------------------------------------------------- -! int +! int !------------------------------------------------------------------------- call test_begin(' Make/Read datasets (integer) ') ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_int_f(file_id, dsetname2, rank, dims, buf2, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_int_f(file_id, dsetname2, bufr2, dims, errcode) @@ -642,19 +642,19 @@ end do call passed() !------------------------------------------------------------------------- -! real +! real !------------------------------------------------------------------------- call test_begin(' Make/Read datasets (float) ') ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_float_f(file_id, dsetname3, rank, dims, buf3, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_float_f(file_id, dsetname3, bufr3, dims, errcode) @@ -672,19 +672,19 @@ end do call passed() !------------------------------------------------------------------------- -! double +! double !------------------------------------------------------------------------- call test_begin(' Make/Read datasets (double) ') ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_double_f(file_id, dsetname4, rank, dims, buf4, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_double_f(file_id, dsetname4, bufr4, dims, errcode) @@ -704,7 +704,7 @@ call passed() call test_begin(' Get dataset dimensions ') !------------------------------------------------------------------------- -! h5ltget_dataset_ndims_f +! h5ltget_dataset_ndims_f !------------------------------------------------------------------------- call h5ltget_dataset_ndims_f(file_id, dsetname4, rankr, errcode) @@ -742,22 +742,22 @@ call passed() ! end function. ! end subroutine test_datasets - - + + !------------------------------------------------------------------------- -! test_attributes +! test_attributes !------------------------------------------------------------------------- subroutine test_attributes() -use H5LT ! module of H5LT +use H5LT ! module of H5LT use HDF5 ! module of HDF5 library implicit none character(len=9), parameter :: filename = "dsetf4.h5"! File name -integer(HID_T) :: file_id ! File identifier +integer(HID_T) :: file_id ! File identifier integer, parameter :: DIM1 = 10; ! Dimension of array character(LEN=5), parameter :: attrname1 = "attr1" ! Attribute name character(LEN=5), parameter :: attrname2 = "attr2" ! Attribute name @@ -786,13 +786,13 @@ integer, dimension(DIM1) :: buf ! Data buffer ! ! Initialize FORTRAN predefined datatypes. ! -call h5open_f(errcode) +call h5open_f(errcode) ! ! Create a new file using default properties. ! call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode) ! -! make a dataset. +! make a dataset. ! call h5ltmake_dataset_int_f(file_id, dsetname1, rank, dims, buf, errcode) @@ -817,12 +817,12 @@ call test_begin(' Set/Get attributes int ') ! -! write attribute. +! write attribute. ! call h5ltset_attribute_int_f(file_id,dsetname1,attrname2,buf2,size,errcode) ! -! read attribute. +! read attribute. ! call h5ltget_attribute_int_f(file_id,dsetname1,attrname2,bufr2,errcode) @@ -847,12 +847,12 @@ call test_begin(' Set/Get attributes float ') ! -! write attribute. +! write attribute. ! call h5ltset_attribute_float_f(file_id,dsetname1,attrname3,buf3,size,errcode) ! -! read attribute. +! read attribute. ! call h5ltget_attribute_float_f(file_id,dsetname1,attrname3,bufr3,errcode) @@ -878,12 +878,12 @@ call test_begin(' Set/Get attributes double ') ! -! write attribute. +! write attribute. ! call h5ltset_attribute_double_f(file_id,dsetname1,attrname4,buf4,size,errcode) ! -! read attribute. +! read attribute. ! call h5ltget_attribute_double_f(file_id,dsetname1,attrname4,bufr4,errcode) @@ -908,7 +908,7 @@ call passed() call test_begin(' Get attribute rank ') -call h5ltget_attribute_ndims_f(file_id,dsetname1,attrname2,rankr,errcode) +call h5ltget_attribute_ndims_f(file_id,dsetname1,attrname2,rankr,errcode) if ( rankr .ne. 1 ) then print *, 'h5ltget_attribute_ndims_f return error' @@ -937,17 +937,17 @@ end subroutine test_attributes !------------------------------------------------------------------------- -! test_begin +! test_begin !------------------------------------------------------------------------- subroutine test_begin(string) character(LEN=*), intent(IN) :: string write(*, fmt = '(14a)', advance = 'no') string -write(*, fmt = '(40x,a)', advance = 'no') ' ' +write(*, fmt = '(40x,a)', advance = 'no') ' ' end subroutine test_begin !------------------------------------------------------------------------- -! passed +! passed !------------------------------------------------------------------------- subroutine passed() diff --git a/hl/fortran/test/tsttable.f90 b/hl/fortran/test/tsttable.f90 index c9c6b33..a6ce27f 100755 --- a/hl/fortran/test/tsttable.f90 +++ b/hl/fortran/test/tsttable.f90 @@ -1,4 +1,4 @@ -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * ! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * @@ -11,10 +11,10 @@ ! 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. * -! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! ! -! This file contains the FORTRAN90 tests for H5LT +! This file contains the FORTRAN90 tests for H5LT ! program table_test @@ -22,23 +22,23 @@ program table_test call test_table1() -end program table_test +end program table_test !------------------------------------------------------------------------- -! test_table1 +! test_table1 !------------------------------------------------------------------------- subroutine test_table1() -use H5TB ! module of H5TB +use H5TB ! module of H5TB use HDF5 ! module of HDF5 library implicit none character(len=8), parameter :: filename = "f1tab.h5" ! File name character(LEN=5), parameter :: dsetname1 = "dset1" ! Dataset name -integer(HID_T) :: file_id ! File identifier +integer(HID_T) :: file_id ! File identifier integer(HSIZE_T), parameter :: nfields = 4; ! nfields integer(HSIZE_T), parameter :: nrecords = 5; ! nrecords character(LEN=6), dimension(nfields) :: field_names ! field names @@ -49,7 +49,7 @@ integer, parameter :: compress = 0 ! compress integer :: errcode ! Error flag integer :: i ! general purpose integer integer(SIZE_T) :: type_size ! Size of the datatype -integer(SIZE_T) :: type_sizec ! Size of the character datatype +integer(SIZE_T) :: type_sizec ! Size of the character datatype integer(SIZE_T) :: type_sizei ! Size of the integer datatype integer(SIZE_T) :: type_sized ! Size of the double precision datatype integer(SIZE_T) :: type_sizer ! Size of the real datatype @@ -84,7 +84,7 @@ end do ! ! Initialize FORTRAN predefined datatypes. ! -call h5open_f(errcode) +call h5open_f(errcode) ! ! Create a new file using default properties. @@ -142,9 +142,9 @@ call test_begin(' Make table ') call h5tbmake_table_f(dsetname1,& - file_id,& + file_id,& dsetname1,& - nfields,& + nfields,& nrecords,& type_size,& field_names,& @@ -163,7 +163,7 @@ call passed() call test_begin(' Read/Write field by name ') call h5tbwrite_field_name_f(file_id,dsetname1,field_names(1),start,nrecords,type_sizec,& - bufs,errcode) + bufs,errcode) call h5tbwrite_field_name_f(file_id,dsetname1,field_names(2),start,nrecords,type_sizei,& bufi,errcode) @@ -236,7 +236,7 @@ do i = 1, nrecords endif end do - + call passed() @@ -247,7 +247,7 @@ call passed() call test_begin(' Read/Write field by index ') call h5tbwrite_field_index_f(file_id,dsetname1,1,start,nrecords,type_sizec,& - bufs,errcode) + bufs,errcode) call h5tbwrite_field_index_f(file_id,dsetname1,2,start,nrecords,type_sizei,& bufi,errcode) @@ -320,12 +320,12 @@ do i = 1, nrecords endif end do - + call passed() !------------------------------------------------------------------------- -! Insert field +! Insert field ! we insert a field callsed "field5" with the same type and buffer as field 4 (Real) !------------------------------------------------------------------------- @@ -362,12 +362,12 @@ call passed() !------------------------------------------------------------------------- -! Gets the number of records and fields +! Gets the number of records and fields !------------------------------------------------------------------------- call test_begin(' Get table info ') -call h5tbget_table_info_f(file_id,dsetname1,nfieldsr,nrecordsr,errcode ) +call h5tbget_table_info_f(file_id,dsetname1,nfieldsr,nrecordsr,errcode ) if ( nfieldsr .ne. nfields .and. nrecordsr .ne. nrecords ) then print *, 'h5tbget_table_info_f return error' @@ -384,7 +384,7 @@ call passed() !call test_begin(' Get fields info ') !call h5tbget_field_info_f(file_id,dsetname1,nfields,field_namesr,field_sizesr,& -! field_offsetr,type_sizeout,errcode ) +! field_offsetr,type_sizeout,errcode ) !call passed() @@ -416,17 +416,17 @@ end subroutine test_table1 !------------------------------------------------------------------------- -! test_begin +! test_begin !------------------------------------------------------------------------- subroutine test_begin(string) character(LEN=*), intent(IN) :: string write(*, fmt = '(14a)', advance = 'no') string -write(*, fmt = '(40x,a)', advance = 'no') ' ' +write(*, fmt = '(40x,a)', advance = 'no') ' ' end subroutine test_begin !------------------------------------------------------------------------- -! passed +! passed !------------------------------------------------------------------------- subroutine passed() diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index d760675..2fec7e0 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -575,62 +575,62 @@ herr_t H5IMlink_palette( hid_t loc_id, { if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0) goto out; - + if((attr_type = H5Aget_type(attr_id)) < 0) goto out; - + if((attr_class = H5Tget_class(attr_type)) < 0) goto out; - + /* Get and save the old reference(s) */ if((attr_space_id = H5Aget_space(attr_id)) < 0) goto out; - + n_refs = H5Sget_simple_extent_npoints(attr_space_id); - + dim_ref = n_refs + 1; - + refbuf = malloc( sizeof(hobj_ref_t) * (int)dim_ref ); - + if ( H5Aread( attr_id, attr_type, refbuf ) < 0) goto out; - + /* The attribute must be deleted, in order to the new one can reflect the changes*/ if(H5Adelete(image_id, "PALETTE") < 0) goto out; - + /* Create a new reference for this palette. */ if ( H5Rcreate( &ref, loc_id, pal_name, H5R_OBJECT, -1 ) < 0) goto out; - + refbuf[n_refs] = ref; - + /* Create the data space for the new references */ if(H5Sclose(attr_space_id) < 0) goto out; - + if((attr_space_id = H5Screate_simple(1, &dim_ref, NULL)) < 0) goto out; - + /* Create the attribute again with the changes of space */ if(H5Aclose(attr_id) < 0) goto out; if((attr_id = H5Acreate2(image_id, "PALETTE", attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; - + /* Write the attribute with the new references */ if(H5Awrite(attr_id, attr_type, refbuf) < 0) goto out; - + /* close */ if(H5Sclose(attr_space_id) < 0) goto out; if(H5Aclose(attr_id) < 0) goto out; - + free( refbuf ); - + } /* ok_pal == 1 */ /* Close the image dataset. */ @@ -869,51 +869,51 @@ herr_t H5IMget_palette_info( hid_t loc_id, hid_t pal_id; hid_t pal_space_id; hsize_t pal_maxdims[2]; - + /* Open the dataset. */ if((image_id = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0) return -1; - + /* Try to find the attribute "PALETTE" on the >>image<< dataset */ has_pal = H5IM_find_palette(image_id); - + if(has_pal == 1) { if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0) goto out; - + if((attr_type = H5Aget_type(attr_id)) < 0) goto out; - + if((attr_class = H5Tget_class(attr_type)) < 0) goto out; - + /* Get the reference(s) */ if((attr_space_id = H5Aget_space(attr_id)) < 0) goto out; - + n_refs = H5Sget_simple_extent_npoints(attr_space_id); - + dim_ref = n_refs; - + refbuf = malloc( sizeof(hobj_ref_t) * (int)dim_ref ); - + if ( H5Aread( attr_id, attr_type, refbuf ) < 0) goto out; - + /* Get the actual palette */ if ( (pal_id = H5Rdereference( image_id, H5R_OBJECT, &refbuf[pal_number] )) < 0) goto out; - + if ( (pal_space_id = H5Dget_space( pal_id )) < 0) goto out; - + if ( H5Sget_simple_extent_ndims( pal_space_id ) < 0) goto out; - + if ( H5Sget_simple_extent_dims( pal_space_id, pal_dims, pal_maxdims ) < 0) goto out; - + /* close */ if (H5Dclose(pal_id)<0) goto out; @@ -926,23 +926,23 @@ herr_t H5IMget_palette_info( hid_t loc_id, if ( H5Aclose( attr_id ) < 0) goto out; free( refbuf ); - - + + } - + /* Close the image dataset. */ if ( H5Dclose( image_id ) < 0) return -1; - + return 0; - + out: H5Dclose( image_id ); H5Sclose( attr_space_id ); H5Tclose( attr_type ); H5Aclose( attr_id ); return -1; - + } @@ -993,30 +993,30 @@ herr_t H5IMget_palette( hid_t loc_id, { if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0) goto out; - + if((attr_type = H5Aget_type(attr_id)) < 0) goto out; - + if((attr_class = H5Tget_class(attr_type)) < 0) goto out; - + /* Get the reference(s) */ if((attr_space_id = H5Aget_space(attr_id)) < 0) goto out; - + n_refs = H5Sget_simple_extent_npoints(attr_space_id); - + dim_ref = n_refs; - + refbuf = malloc( sizeof(hobj_ref_t) * (int)dim_ref ); - + if ( H5Aread( attr_id, attr_type, refbuf ) < 0) goto out; - + /* Get the palette id */ if ( (pal_id = H5Rdereference( image_id, H5R_OBJECT, &refbuf[pal_number] )) < 0) goto out; - + /* Read the palette dataset */ if ( H5Dread( pal_id, H5Dget_type(pal_id), H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data ) < 0) goto out; diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c index f46b9ea..9e9eec2 100644 --- a/hl/src/H5LTanalyze.c +++ b/hl/src/H5LTanalyze.c @@ -849,7 +849,7 @@ hbool_t first_quote = 1; /* For Lex and Yacc */ /*int input_len; char *myinput;*/ - + #define TAG_STRING 1 #line 834 "H5LTanalyze.c" @@ -1288,17 +1288,17 @@ YY_RULE_SETUP case 40: YY_RULE_SETUP #line 121 "H5LTanalyze.l" -{return token(H5T_STR_NULLTERM_TOKEN);} +{return token(H5T_STR_NULLTERM_TOKEN);} YY_BREAK case 41: YY_RULE_SETUP #line 122 "H5LTanalyze.l" -{return token(H5T_STR_NULLPAD_TOKEN);} +{return token(H5T_STR_NULLPAD_TOKEN);} YY_BREAK case 42: YY_RULE_SETUP #line 123 "H5LTanalyze.l" -{return token(H5T_STR_SPACEPAD_TOKEN);} +{return token(H5T_STR_SPACEPAD_TOKEN);} YY_BREAK case 43: YY_RULE_SETUP @@ -1363,12 +1363,12 @@ YY_RULE_SETUP case 55: YY_RULE_SETUP #line 139 "H5LTanalyze.l" -{ - if( is_str_size || (is_enum && is_enum_memb) || +{ + if( is_str_size || (is_enum && is_enum_memb) || is_opq_size || (asindex>-1 && arr_stack[asindex].is_dim) || (csindex>-1 && cmpd_stack[csindex].is_field) ) { H5LTyylval.ival = atoi(yytext); - return NUMBER; + return NUMBER; } else REJECT; } @@ -1378,7 +1378,7 @@ YY_RULE_SETUP #line 149 "H5LTanalyze.l" { /*if it's first quote, and is a compound field name or an enum symbol*/ - if((is_opq_tag || is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) + if((is_opq_tag || is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) && first_quote) { first_quote = 0; BEGIN TAG_STRING; @@ -2323,8 +2323,8 @@ int main() int my_yyinput(char *buf, int max_size) { int ret; - - memcpy(buf, myinput, input_len); + + memcpy(buf, myinput, input_len); ret = input_len; return ret; } diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c index 35c4670..9f67175 100644 --- a/hl/src/H5LTparse.c +++ b/hl/src/H5LTparse.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char const +static char const yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $"; #endif #include <stdlib.h> @@ -92,7 +92,7 @@ struct arr_info { }; /*stack for nested array type*/ struct arr_info arr_stack[STACK_SIZE]; -int asindex = -1; /*pointer to the top of array stack*/ +int asindex = -1; /*pointer to the top of array stack*/ hbool_t is_str_size = 0; /*flag to lexer for string size*/ hbool_t is_str_pad = 0; /*flag to lexer for string padding*/ @@ -100,7 +100,7 @@ H5T_pad_t str_pad; /*variable for string padding*/ H5T_cset_t str_cset; /*variable for string character set*/ hbool_t is_variable = 0; /*variable for variable-length string*/ size_t str_size; /*variable for string size*/ - + hid_t enum_id; /*type ID*/ hbool_t is_enum = 0; /*flag to lexer for enum type*/ hbool_t is_enum_memb = 0; /*flag to lexer for enum member*/ @@ -823,9 +823,9 @@ case 46: break; case 47: #line 156 "H5LTparse.y" -{ yyval.ival = cmpd_stack[csindex].id; +{ yyval.ival = cmpd_stack[csindex].id; cmpd_stack[csindex].id = 0; - cmpd_stack[csindex].first_memb = 1; + cmpd_stack[csindex].first_memb = 1; csindex--; } break; @@ -835,7 +835,7 @@ case 50: break; case 51: #line 167 "H5LTparse.y" -{ +{ size_t origin_size, new_size; hid_t dtype_id = cmpd_stack[csindex].id; @@ -849,7 +849,7 @@ case 51: cmpd_stack[csindex].first_memb = 0; } else { origin_size = H5Tget_size(dtype_id); - + if(yyvsp[-1].ival == 0) { new_size = origin_size + H5Tget_size(yyvsp[-6].ival); H5Tset_size(dtype_id, new_size); @@ -860,10 +860,10 @@ case 51: H5Tinsert(dtype_id, yyvsp[-3].sval, yyvsp[-1].ival, yyvsp[-6].ival); } } - + cmpd_stack[csindex].is_field = 0; H5Tclose(yyvsp[-6].ival); - + new_size = H5Tget_size(dtype_id); } break; @@ -887,7 +887,7 @@ case 56: break; case 57: #line 213 "H5LTparse.y" -{ +{ yyval.ival = H5Tarray_create2(yyvsp[-1].ival, arr_stack[asindex].ndims, arr_stack[asindex].dims); arr_stack[asindex].ndims = 0; asindex--; @@ -901,9 +901,9 @@ break; case 61: #line 224 "H5LTparse.y" { unsigned ndims = arr_stack[asindex].ndims; - arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; + arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; arr_stack[asindex].ndims++; - arr_stack[asindex].is_dim = 0; + arr_stack[asindex].is_dim = 0; } break; case 64: @@ -916,10 +916,10 @@ case 65: break; case 66: #line 241 "H5LTparse.y" -{ +{ size_t size = (size_t)yylval.ival; yyval.ival = H5Tcreate(H5T_OPAQUE, size); - is_opq_size = 0; + is_opq_size = 0; } break; case 67: @@ -928,7 +928,7 @@ case 67: break; case 68: #line 247 "H5LTparse.y" -{ +{ H5Tset_tag(yyvsp[-6].ival, yylval.sval); is_opq_tag = 0; } @@ -943,12 +943,12 @@ case 72: break; case 73: #line 260 "H5LTparse.y" -{ +{ if(yyvsp[-1].ival == H5T_VARIABLE_TOKEN) is_variable = 1; - else + else str_size = yylval.ival; - is_str_size = 0; + is_str_size = 0; } break; case 74: @@ -964,7 +964,7 @@ case 74: break; case 75: #line 277 "H5LTparse.y" -{ +{ if(yyvsp[-1].ival == H5T_CSET_ASCII_TOKEN) str_cset = H5T_CSET_ASCII; else if(yyvsp[-1].ival == H5T_CSET_UTF8_TOKEN) @@ -982,7 +982,7 @@ case 76: break; case 77: #line 291 "H5LTparse.y" -{ +{ hid_t str_id = yyvsp[-1].ival; /*set string size*/ @@ -991,12 +991,12 @@ case 77: is_variable = 0; } else H5Tset_size(str_id, str_size); - + /*set string padding and character set*/ H5Tset_strpad(str_id, str_pad); H5Tset_cset(str_id, str_cset); - yyval.ival = str_id; + yyval.ival = str_id; } break; case 78: @@ -1043,7 +1043,7 @@ case 91: #line 330 "H5LTparse.y" { is_enum_memb = 1; /*indicate member of enum*/ - enum_memb_symbol = strdup(yylval.sval); + enum_memb_symbol = strdup(yylval.sval); } break; case 92: @@ -1056,7 +1056,7 @@ case 92: long_long llong_val=(long_long)yylval.ival; hid_t super = H5Tget_super(enum_id); hid_t native = H5Tget_native_type(super, H5T_DIR_ASCEND); - + if(is_enum && is_enum_memb) { /*if it's an enum member*/ /*To handle machines of different endianness*/ if(H5Tequal(native, H5T_NATIVE_SCHAR) || H5Tequal(native, H5T_NATIVE_UCHAR)) @@ -1070,7 +1070,7 @@ case 92: else if(H5Tequal(native, H5T_NATIVE_LLONG) || H5Tequal(native, H5T_NATIVE_ULLONG)) H5Tenum_insert(enum_id, enum_memb_symbol, &llong_val); - is_enum_memb = 0; + is_enum_memb = 0; if(enum_memb_symbol) free(enum_memb_symbol); } diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c index 2119cca..bb2cf1e 100644 --- a/hl/src/H5PT.c +++ b/hl/src/H5PT.c @@ -215,8 +215,8 @@ out: * Modifications: * * John Mainzer -- 4/23/08 - * Added error check on malloc of table, initialized fields - * in table to keep lower level code from choking on bogus + * Added error check on malloc of table, initialized fields + * in table to keep lower level code from choking on bogus * data in error cases. * *------------------------------------------------------------------------- diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c index e80f86c..bbe9be5 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -61,7 +61,7 @@ static hid_t H5TB_create_type(hid_t loc_id, * * Date: January 17, 2001 * - * Comments: + * Comments: * * Modifications: * @@ -113,7 +113,7 @@ herr_t H5TBmake_table( const char *table_title, } /* Create a simple data space with unlimited size */ - if((sid = H5Screate_simple( 1, dims, maxdims )) < 0) + if((sid = H5Screate_simple( 1, dims, maxdims )) < 0) return -1; /* Modify dataset creation properties, i.e. enable chunking */ @@ -2306,7 +2306,7 @@ herr_t H5TBinsert_field( hid_t loc_id, if(inserted ) idx = i - 1; - if(i == position ) { + if(i == position ) { /* Get the new member size */ new_member_size = H5Tget_size( field_type ); @@ -2854,7 +2854,7 @@ herr_t H5TBdelete_field( hid_t loc_id, * We have to read field by field of the old dataset and save it into the new one *------------------------------------------------------------------------- */ - for ( i = 0; i < nfields; i++) { + for ( i = 0; i < nfields; i++) { /* Get the member name */ member_name = H5Tget_member_name(type_id1, (unsigned)i); @@ -3437,20 +3437,20 @@ int H5TB_find_field( const char *field, const char *field_list ) { const char *start = field_list; const char *end; - - while ( (end = strstr( start, "," )) != 0 ) + + while ( (end = strstr( start, "," )) != 0 ) { size_t count = end - start; if(strncmp(start, field, count) == 0 && count == strlen(field) ) return 1; start = end + 1; } - + if(strcmp( start, field ) == 0 ) return 1; - + return -1; - + } diff --git a/hl/test/test_image.c b/hl/test/test_image.c index 9645bad..2a365e2 100644 --- a/hl/test/test_image.c +++ b/hl/test/test_image.c @@ -68,15 +68,15 @@ unsigned char *image_data = NULL; int main(void) { int nerrors=0; - + nerrors += test_simple()<0 ?1:0; nerrors += test_data()<0 ?1:0; nerrors += test_generate()<0 ?1:0; - + if (nerrors) goto error; printf("All image tests passed.\n"); return 0; - + error: printf("***** %d IMAGE TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S"); return 1; @@ -96,21 +96,21 @@ static int test_simple(void) int i, j, n, space; char interlace[20]; hssize_t npals; - + /* 8-bit image */ unsigned char buf1 [ WIDTH*HEIGHT ]; unsigned char pal[ PAL_ENTRIES * 3 ]; /* palette array */ hsize_t pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */ - + /* 24-bit image */ unsigned char buf2 [ WIDTH*HEIGHT*3 ]; - + /* read data */ unsigned char buf1_out [ WIDTH*HEIGHT ]; unsigned char buf2_out [ WIDTH*HEIGHT*3 ]; unsigned char pal_out[ PAL_ENTRIES * 3 ]; /* palette array */ hsize_t pal_dims_out[2]; /* palette dimensions */ - + /* create an image */ space = WIDTH*HEIGHT / PAL_ENTRIES; for (i=0, j=0, n=0; i < WIDTH*HEIGHT; i++, j++ ) @@ -121,10 +121,10 @@ static int test_simple(void) n++; j=0; } - + } - - + + /* create an image */ space = WIDTH*HEIGHT / 256; for (i=0, j=0, n=0; i < WIDTH*HEIGHT*3; i+=3, j++ ) @@ -141,9 +141,9 @@ static int test_simple(void) j=0; } } - + /*------------------------------------------------------------------------- - * define a palette, blue to red tones + * define a palette, blue to red tones *------------------------------------------------------------------------- */ for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++) @@ -152,140 +152,140 @@ static int test_simple(void) pal[i+1]=0; /* green */ pal[i+2]=255-n; /* blue */ } - + /* Create a new HDF5 file using default properties. */ fid = H5Fcreate(FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT ); - + /*------------------------------------------------------------------------- * Indexed image test *------------------------------------------------------------------------- */ - + TESTING("indexed image"); - + /* Write image */ if ( H5IMmake_image_8bit( fid, IMAGE1_NAME, width, height, buf1 ) < 0 ) goto out; - + /* Make a palette */ if ( H5IMmake_palette( fid, PAL_NAME, pal_dims, pal ) < 0 ) goto out; - + /* Attach a palette to the image dataset */ if ( H5IMlink_palette( fid, IMAGE1_NAME, PAL_NAME ) < 0 ) goto out; - + /* Read image */ if ( H5IMget_image_info( fid, IMAGE1_NAME, &width, &height, &planes, interlace, &npals ) < 0 ) goto out; - + if ( H5IMread_image( fid, IMAGE1_NAME, buf1_out ) < 0 ) goto out; - - for (i = 0; i < height*width*planes; i++) + + for (i = 0; i < height*width*planes; i++) { - if ( buf1[i] != buf1_out[i] ) + if ( buf1[i] != buf1_out[i] ) goto out; - + } - - + + PASSED(); - + /*------------------------------------------------------------------------- * True color image test *------------------------------------------------------------------------- */ - + TESTING("true color image"); - + /* Write image */ if ( H5IMmake_image_24bit( fid, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", buf2 ) ) goto out; - + /* Read image */ if ( H5IMget_image_info( fid, IMAGE2_NAME, &width, &height, &planes, interlace, &npals ) < 0 ) goto out; - + if ( H5IMread_image( fid, IMAGE2_NAME, buf2_out ) < 0 ) goto out; - - for (i = 0; i < height*width*planes; i++) + + for (i = 0; i < height*width*planes; i++) { - if ( buf2[i] != buf2_out[i] ) + if ( buf2[i] != buf2_out[i] ) goto out; } - - + + PASSED(); - + /*------------------------------------------------------------------------- * H5IMget_npalettes test *------------------------------------------------------------------------- */ - + TESTING("pallete functions"); - + if ( H5IMget_npalettes( fid, IMAGE1_NAME, &npals ) < 0 ) goto out; - + /*------------------------------------------------------------------------- * H5IMget_palette_info test *------------------------------------------------------------------------- */ - + if ( H5IMget_palette_info( fid, IMAGE1_NAME, 0, pal_dims_out ) < 0 ) goto out; - - for (i = 0; i < 2; i++) + + for (i = 0; i < 2; i++) { - if ( pal_dims[i] != pal_dims_out[i] ) + if ( pal_dims[i] != pal_dims_out[i] ) goto out; } - + /*------------------------------------------------------------------------- * H5IMget_palette test *------------------------------------------------------------------------- */ - + if ( H5IMget_palette( fid, IMAGE1_NAME, 0, pal_out ) < 0 ) goto out; - - for (i = 0; i < PAL_ENTRIES * 3; i++) + + for (i = 0; i < PAL_ENTRIES * 3; i++) { - if ( pal[i] != pal_out[i] ) + if ( pal[i] != pal_out[i] ) goto out; } - + /*------------------------------------------------------------------------- * H5IMis_image test *------------------------------------------------------------------------- */ - + if ( H5IMis_image( fid, IMAGE1_NAME ) < 0 ) goto out; - + if ( H5IMis_image( fid, IMAGE2_NAME ) < 0 ) goto out; - + /*------------------------------------------------------------------------- * H5IMis_palette test *------------------------------------------------------------------------- */ - + if ( H5IMis_palette( fid, PAL_NAME ) < 0 ) goto out; - + /*------------------------------------------------------------------------- * end tests *------------------------------------------------------------------------- */ - + /* Close the file. */ - if(H5Fclose( fid ) < 0) + if(H5Fclose( fid ) < 0) goto out; - - + + PASSED(); return 0; @@ -314,60 +314,60 @@ static int test_data(void) unsigned char pal[256*3]; /* buffer to hold an HDF5 palette */ rgb_t rgb[256]; /* buffer to hold a .pal file palette */ int i, n; - + /* create a file using default properties */ if ((fid=H5Fcreate(FILE2,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0) goto out; - + printf("Testing read ascii image data and generate images\n"); - + /*------------------------------------------------------------------------- * read 8bit image data *------------------------------------------------------------------------- */ - + TESTING2("make indexed image"); - + /* read first data file */ if (read_data(DATA_FILE1,&width,&height)<0) goto out; - + /* make an image */ if (H5IMmake_image_8bit(fid,IMAGE1_NAME,width,height,image_data)<0) goto out; - + PASSED(); - - + + TESTING2("attaching palettes"); - + /*------------------------------------------------------------------------- * palette #1. rainbow palette. data is contained in "pal_rgb.h" *------------------------------------------------------------------------- */ - + /* initialize the palette data */ pal_dims[0] = 256; pal_dims[1] = 3; - + /* make a palette */ if (H5IMmake_palette(fid,PAL1_NAME,pal_dims,pal_rgb)<0) goto out; - + /* attach a palette to the image dataset */ if (H5IMlink_palette(fid,IMAGE1_NAME,PAL1_NAME)<0) goto out; - + /*------------------------------------------------------------------------- * palette #2. sepia palette. * read a PAL file and attach the palette to the HDF5 file *------------------------------------------------------------------------- */ - + /* read a PAL file */ if (read_palette(PAL2_FILE, rgb, sizeof(rgb))<0) goto out; - + /* transfer to the HDF5 buffer */ for ( i=0, n=0; i<256*3; i+=3, n++) { @@ -375,25 +375,25 @@ static int test_data(void) pal[i+1]=rgb[n].g; pal[i+2]=rgb[n].b; } - + /* make a palette */ if (H5IMmake_palette(fid,PAL2_NAME,pal_dims,pal)<0) goto out; - + /* attach the palette to the image dataset */ if (H5IMlink_palette(fid,IMAGE1_NAME,PAL2_NAME)<0) goto out; - + /*------------------------------------------------------------------------- * palette #3. earth palette. * read a PAL file and attach the palette to the HDF5 file *------------------------------------------------------------------------- */ - + /* read a PAL file */ if (read_palette(PAL3_FILE, rgb, sizeof(rgb))<0) goto out; - + /* transfer to the HDF5 buffer */ for ( i=0, n=0; i<256*3; i+=3, n++) { @@ -401,18 +401,18 @@ static int test_data(void) pal[i+1]=rgb[n].g; pal[i+2]=rgb[n].b; } - + /* make a palette */ if (H5IMmake_palette(fid,PAL3_NAME,pal_dims,pal)<0) goto out; - + /* attach the palette to the image dataset */ if (H5IMlink_palette(fid,IMAGE1_NAME,PAL3_NAME)<0) goto out; - + PASSED(); - - + + /*------------------------------------------------------------------------- * palette #4. blue-red * make a palette whith blue to red colors @@ -424,60 +424,60 @@ static int test_data(void) pal[i+1]=0; pal[i+2]=255-n; } - + /* make a palette */ if (H5IMmake_palette(fid,PAL4_NAME,pal_dims,pal)<0) goto out; - + /* attach the palette to the image dataset */ if (H5IMlink_palette(fid,IMAGE1_NAME,PAL4_NAME)<0) goto out; - - + + /*------------------------------------------------------------------------- * true color image example with pixel interlace *------------------------------------------------------------------------- */ - + TESTING2("make true color image with pixel interlace"); - + /* read second data file */ if ((read_data(DATA_FILE2,&width,&height))<0) goto out; - + /* make image */ if ((H5IMmake_image_24bit(fid,IMAGE2_NAME,width,height,"INTERLACE_PIXEL",image_data))<0) goto out; - + PASSED(); - + /*------------------------------------------------------------------------- * True color image example with plane interlace *------------------------------------------------------------------------- */ - + TESTING2("make true color image with plane interlace"); - + /* read third data file */ if ((read_data(DATA_FILE3,&width,&height))<0) goto out; - + /* make image */ if ((H5IMmake_image_24bit(fid,IMAGE3_NAME,width,height,"INTERLACE_PLANE",image_data))<0) goto out; - + PASSED(); - - + + /*------------------------------------------------------------------------- * close *------------------------------------------------------------------------- */ if (H5Fclose(fid)<0) goto out; - + return 0; - + /* error zone, gracefully close */ out: H5E_BEGIN_TRY { @@ -512,13 +512,13 @@ static int test_generate(void) char *srcdir = getenv("srcdir"); /* the source directory */ char data_file[512]=""; /* buffer to hold name of existing data file */ int i; - + /* create a file using default properties */ if ((fid=H5Fcreate(FILE3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0) goto out; - + printf("Testing read and process data and make indexed images\n"); - + /*------------------------------------------------------------------------- * compose the name of the file to open, using the srcdir, if appropriate *------------------------------------------------------------------------- @@ -529,12 +529,12 @@ static int test_generate(void) strcat(data_file, "/"); } strcat(data_file,DATA_FILE4); - + /*------------------------------------------------------------------------- * read data; the file data format is described below *------------------------------------------------------------------------- */ - + f = fopen( data_file, "r" ) ; if ( f == NULL ) { @@ -581,44 +581,44 @@ static int test_generate(void) fscanf( f, "%d %d %d", &imax, &jmax, &kmax ); fscanf( f, "%f %f %f", &valex, &xmin, &xmax ); - + data = (float*) malloc ( imax * jmax * kmax * sizeof( float )); image_data = (unsigned char*) malloc ( imax * jmax * kmax * sizeof( unsigned char )); - + for ( i = 0; i < imax * jmax * kmax; i++ ) { fscanf( f, "%f ", &value ); data[i] = value; } fclose( f ); - + /*------------------------------------------------------------------------- * transform the data from floating point to unsigned char * we are processing all the data here *------------------------------------------------------------------------- */ - + TESTING2("make indexed image from all the data"); - + for ( i = 0; i < imax * jmax * kmax; i++ ) { image_data[i] = (unsigned char)(( 255 * (data[i] - xmin ) ) / (xmax - xmin )); } - + /* Make the image */ if ((H5IMmake_image_8bit(fid,"All data",(hsize_t)imax,(hsize_t)jmax,image_data))<0) goto out; - + PASSED(); - + /*------------------------------------------------------------------------- * transform the data from floating point to unsigned char * here we just process the land data *------------------------------------------------------------------------- */ - + TESTING2("make indexed image from land data"); - + for ( i = 0; i < imax * jmax * kmax; i++ ) { if ( data[i] < 0 ) @@ -626,21 +626,21 @@ static int test_generate(void) else image_data[i] = (unsigned char)(( 255 * (data[i] ) ) / xmax ); } - + /* make the image */ if ((H5IMmake_image_8bit(fid,"Land data",(hsize_t)imax,(hsize_t)jmax,image_data))<0) goto out; - + PASSED(); - + /*------------------------------------------------------------------------- * transform the data from floating point to unsigned char * here we just process the sea data *------------------------------------------------------------------------- */ - + TESTING2("make indexed image from sea data"); - + for ( i = 0; i < imax * jmax * kmax; i++ ) { if ( data[i] > 0 ) @@ -648,24 +648,24 @@ static int test_generate(void) else image_data[i] = (unsigned char)(( 255 * (data[i] - xmin ) ) / xmin ); } - + /* make the image */ if ((H5IMmake_image_8bit(fid,"Sea data",(hsize_t)imax,(hsize_t)jmax,image_data))<0) goto out; - + PASSED(); - + /*------------------------------------------------------------------------- * make a palette and attach it to the datasets *------------------------------------------------------------------------- */ - + TESTING2("attaching palettes"); - + /* make a palette */ if ((H5IMmake_palette(fid,PAL1_NAME,pal_dims,pal_rgb))<0) goto out; - + /* attach the palette to the image datasets */ if ((H5IMlink_palette(fid,"All data",PAL1_NAME))<0) goto out; @@ -673,19 +673,19 @@ static int test_generate(void) goto out; if ((H5IMlink_palette(fid,"Sea data",PAL1_NAME))<0) goto out; - + PASSED(); - - + + /*------------------------------------------------------------------------- * close *------------------------------------------------------------------------- */ if (H5Fclose(fid)<0) goto out; - + return 0; - + /* error zone, gracefully close */ out: H5E_BEGIN_TRY { @@ -724,7 +724,7 @@ static int read_data( const char* fname, /*IN*/ int w, h; char *srcdir = getenv("srcdir"); /* the source directory */ char data_file[512]=""; /* buffer to hold name of existing data file */ - + /*------------------------------------------------------------------------- * compose the name of the file to open, using "srcdir", if appropriate *------------------------------------------------------------------------- @@ -736,46 +736,46 @@ static int read_data( const char* fname, /*IN*/ strcat(data_file, "/"); } strcat(data_file,fname); - + /*------------------------------------------------------------------------- * read *------------------------------------------------------------------------- */ - + f = fopen(data_file, "r"); if ( f == NULL ) { printf( "Could not open file %s. Try set $srcdir \n", data_file ); return -1; } - + fscanf( f, "%s", str ); fscanf( f, "%d", &color_planes ); fscanf( f, "%s", str ); fscanf( f, "%d", &h); fscanf( f, "%s", str ); fscanf( f, "%d", &w); - + *width = (hsize_t)w; *height = (hsize_t)h; - + if ( image_data ) { free( image_data ); image_data=NULL; } - + image_data = (unsigned char*) malloc (w * h * color_planes * sizeof( unsigned char )); - + for (i = 0; i < h * w * color_planes ; i++) { fscanf( f, "%d",&n ); image_data[i] = (unsigned char)n; } fclose(f); - + return 1; - + } diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c index 7b594ca..7a612a8 100644 --- a/hl/test/test_packet.c +++ b/hl/test/test_packet.c @@ -820,7 +820,7 @@ test_compress(void) err = H5PTclose(table); if( err < 0) TEST_ERROR; - /* Open the packet table as a regular dataset and make sure that the + /* Open the packet table as a regular dataset and make sure that the * compression filter is set. */ dset_id = H5Dopen2(fid1, "Compressed Test Dataset", H5P_DEFAULT); @@ -850,7 +850,7 @@ test_compress(void) err = H5PTclose(table); if( err < 0) TEST_ERROR; - /* Open the packet table as a regular dataset and make sure that the + /* Open the packet table as a regular dataset and make sure that the * compression filter is not set. */ dset_id = H5Dopen2(fid1, "Uncompressed Dataset", H5P_DEFAULT); @@ -887,7 +887,7 @@ error: H5Tclose(part_t); H5PTclose(table); H5Fclose(fid1); - } H5E_END_TRY + } H5E_END_TRY H5_FAILED(); return -1; } diff --git a/hl/test/test_table.c b/hl/test/test_table.c index 16172c4..1b36b15 100644 --- a/hl/test/test_table.c +++ b/hl/test/test_table.c @@ -591,7 +591,7 @@ int test_table(hid_t fid, int write) wbufd[i].pressure = wbuf[i].pressure; wbufd[i].temperature = wbuf[i].temperature; strcpy(wbufd[i].name, wbuf[i].name ); - + } @@ -935,8 +935,8 @@ int test_table(hid_t fid, int write) goto out; { - - + + /* compare the read values with the initial values */ for( i = 0; i < NRECORDS; i++ ) { @@ -1098,7 +1098,7 @@ int test_table(hid_t fid, int write) } } - + PASSED(); diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c index 24aaf31..c7e4ab6 100644 --- a/hl/tools/gif2h5/gif2hdf.c +++ b/hl/tools/gif2h5/gif2hdf.c @@ -53,7 +53,7 @@ main(int argv , char *argc[]) { print_version("gif2h5"); exit(EXIT_SUCCESS); - + } if (argv < 3) { @@ -120,7 +120,7 @@ main(int argv , char *argc[]) if (gifImageDesc.Image != NULL) free(gifImageDesc.Image); - + if (GifMemoryStruct.GifImageDesc[i] != NULL) { free(GifMemoryStruct.GifImageDesc[i]); diff --git a/hl/tools/gif2h5/h52gifgentst.c b/hl/tools/gif2h5/h52gifgentst.c index e0a50a1..eb83335 100644 --- a/hl/tools/gif2h5/h52gifgentst.c +++ b/hl/tools/gif2h5/h52gifgentst.c @@ -45,7 +45,7 @@ *------------------------------------------------------------------------- */ -int main(void) +int main(void) { hid_t fid; int i, j, n, space; @@ -55,7 +55,7 @@ int main(void) hsize_t width = WIDTH; hsize_t height = HEIGHT; - + /* create a file */ if ((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) return 1; @@ -70,7 +70,7 @@ int main(void) n++; j=0; } - + } /* make the image */ @@ -78,7 +78,7 @@ int main(void) return 1; /*------------------------------------------------------------------------- - * define a palette, blue to red tones + * define a palette, blue to red tones *------------------------------------------------------------------------- */ for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++) @@ -87,18 +87,18 @@ int main(void) pal[i+1]=0; /* green */ pal[i+2]=255-n; /* blue */ } - + /* make a palette */ if (H5IMmake_palette( fid, PAL_NAME, pal_dims, pal )<0) return 1; - + /* attach the palette to the image */ if (H5IMlink_palette( fid, IMAGE1_NAME, PAL_NAME )<0) return 1; - + if(H5Fclose(fid)<0) return 1; - + return 0; } diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c index 7def4f0..9c252e1 100644 --- a/hl/tools/gif2h5/hdf2gif.c +++ b/hl/tools/gif2h5/hdf2gif.c @@ -38,7 +38,7 @@ usage(void) fprintf(stdout, " h52gif -V \n"); fprintf(stdout, " Print HDF5 library version and exit\n"); printf("h52gif expects *at least* one h5_image.\n"); - + } FILE *fpGif = NULL; @@ -69,16 +69,16 @@ int main(int argc , char **argv) int bool_is_image = 0; /* 0 = false , 1 = true */ char *image_name = NULL; int idx; - + if ( argv[1] && (strcmp("-V",argv[1])==0) ) { print_version("gif2h5"); exit(EXIT_SUCCESS); - + } - if (argc < 4) + if (argc < 4) { /* they didn't supply at least one image -- bail */ usage(); @@ -89,14 +89,14 @@ int main(int argc , char **argv) GIFName = argv[2]; /* get the options */ - while (arg_index++ < argc - 1) + while (arg_index++ < argc - 1) { if (!strcmp(argv[arg_index] , "-i")) { bool_is_image = 1; continue; } - if (bool_is_image) + if (bool_is_image) { /* allocate space to store the image name */ size_t len = strlen(argv[arg_index]); @@ -118,7 +118,7 @@ int main(int argc , char **argv) b = (BYTE *) &idx; EndianOrder = (b[0] ? 1:0); - if (!(fpGif = fopen(GIFName , "wb"))) + if (!(fpGif = fopen(GIFName , "wb"))) { printf("Error opening gif file for output. Aborting.\n"); goto out; @@ -132,19 +132,19 @@ int main(int argc , char **argv) hssize_t npals; hsize_t pal_dims[2]; unsigned char *pal; - - if ((fid = H5Fopen(HDFName , H5F_ACC_RDONLY , H5P_DEFAULT)) < 0) + + if ((fid = H5Fopen(HDFName , H5F_ACC_RDONLY , H5P_DEFAULT)) < 0) { fprintf(stderr , "Unable to open HDF file for input. Aborting.\n"); goto out; } - + /* read image */ if ( H5IMget_image_info( fid, image_name, &width, &height, &planes, interlace, &npals ) < 0 ) goto out; Image = (BYTE*) malloc( (size_t) width * (size_t) height ); - + if ( H5IMread_image( fid, image_name, Image ) < 0 ) goto out; @@ -154,7 +154,7 @@ int main(int argc , char **argv) goto out; pal = (BYTE*) malloc( (size_t) pal_dims[0] * (size_t) pal_dims[1] ); - + if ( H5IMget_palette( fid, image_name, 0, pal ) < 0 ) goto out; @@ -169,9 +169,9 @@ int main(int argc , char **argv) free(pal); } - + H5Fclose(fid); - + RWidth = (int)width; RHeight = (int)height; @@ -185,17 +185,17 @@ int main(int argc , char **argv) * palette * 2. Check for palettes in any of the other images. */ - if (!npals) + if (!npals) { numcols = 256; - for (i = 0 ; i < numcols ; i++) + for (i = 0 ; i < numcols ; i++) { Red[i] = 255 - i; Green[i] = 255 - i; Blue[i] = 255 - i; } - } - else + } + else { for (i = 0 ; i < numcols ; i++) { @@ -205,7 +205,7 @@ int main(int argc , char **argv) } } - for (i = 0; i < numcols; i++) + for (i = 0; i < numcols; i++) { pc2nc[i] = r1[i] = g1[i] = b1[i] = 0; } @@ -213,16 +213,16 @@ int main(int argc , char **argv) /* compute number of unique colors */ nc = 0; - for (i = 0; i < numcols; i++) + for (i = 0; i < numcols; i++) { /* see if color #i is already used */ - for (j = 0; j < i; j++) + for (j = 0; j < i; j++) { if (Red[i] == Red[j] && Green[i] == Green[j] && Blue[i] == Blue[j]) break; } - - if (j==i) + + if (j==i) { /* wasn't found */ pc2nc[i] = nc; @@ -230,15 +230,15 @@ int main(int argc , char **argv) g1[nc] = Green[i]; b1[nc] = Blue[i]; nc++; - } - else + } + else { pc2nc[i] = pc2nc[j]; } } /* figure out 'BitsPerPixel' */ - for (i = 1; i < 8; i++) + for (i = 1; i < 8; i++) { if ((1<<i) >= nc) break; @@ -252,23 +252,23 @@ int main(int argc , char **argv) else InitCodeSize = BitsPerPixel; - if (!fpGif) + if (!fpGif) { fprintf(stderr, "WriteGIF: file not open for writing\n" ); goto out; } - + fwrite("GIF87a", sizeof( char ), 6, fpGif); /* the GIF magic number */ - + putword(RWidth, fpGif); /* screen descriptor */ putword(RHeight, fpGif); - + i = 0x00; /* No, there is no color map */ i |= (8-1)<<4; /* OR in the color resolution (hardwired 8) */ i |= (BitsPerPixel - 1); /* OR in the # of bits per pixel */ fputc(i,fpGif); - + fputc(Background,fpGif); /* background color */ fputc(0, fpGif); /* future expansion byte */ @@ -286,7 +286,7 @@ int main(int argc , char **argv) /* since we always have a local color palette ... */ fputc((0x80 | (BitsPerPixel - 1)) , fpGif); - for (i = 0; i < ColorMapSize; i++) + for (i = 0; i < ColorMapSize; i++) { /* write out Global colormap */ fputc(r1[i], fpGif); @@ -301,7 +301,7 @@ int main(int argc , char **argv) free(Image); } - if (fputc(';',fpGif) == EOF) + if (fputc(';',fpGif) == EOF) { /* Write GIF file terminator */ fprintf(stderr , "Error!"); diff --git a/hl/tools/gif2h5/writehdf.c b/hl/tools/gif2h5/writehdf.c index 7c2b063..a150b3c 100644 --- a/hl/tools/gif2h5/writehdf.c +++ b/hl/tools/gif2h5/writehdf.c @@ -83,7 +83,7 @@ WriteHDF(GIFTOMEM GifMemoryStruct, char *HDFName , char *GIFFileName) /* size of the palette is tablesize (rows) X 3 (columns) */ dims[0] = gifHead.TableSize; dims[1] = 3; - + /* make a palette */ if (H5IMmake_palette(file_id,PAL_NAME,dims,(unsigned char *)gifHead.HDFPalette)<0) return -1; @@ -102,11 +102,11 @@ WriteHDF(GIFTOMEM GifMemoryStruct, char *HDFName , char *GIFFileName) /* create the image name */ sprintf(ImageName , "Image%d" , i); - + /* write image */ if (H5IMmake_image_8bit(file_id,ImageName,dims[1],dims[0],(gifImageDesc->Image))<0) return -1; - + /* attach the palette to the image dataset */ if (has_pal) { diff --git a/hl/tools/h52jpeg/h52jpeg.c b/hl/tools/h52jpeg/h52jpeg.c index c4dacd1..80269ce 100644 --- a/hl/tools/h52jpeg/h52jpeg.c +++ b/hl/tools/h52jpeg/h52jpeg.c @@ -18,7 +18,7 @@ #include <stdio.h> #include <stdlib.h> -/* +/* * Include file for users of JPEG library. * system headers that define at least the typedefs FILE and size_t are needed before */ @@ -52,7 +52,7 @@ static struct long_options l_opts[] = { /* a structure that contains h52jpeg options */ -typedef struct +typedef struct { const char *file_name; const char *template_name; @@ -69,7 +69,7 @@ static int h52jpeg(h52jpeg_opt_t opt); static void make_jpeg_name( const char* template_name, const char* image_name, char* jpeg_name); static int do_object(hid_t fid, h52jpeg_opt_t opt, const char* image_name); static int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_name); -static void write_JPEG_file(char *filename, JSAMPLE *image_buffer, int image_height, int image_width, int planes); +static void write_JPEG_file(char *filename, JSAMPLE *image_buffer, int image_height, int image_width, int planes); static void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf, unsigned char* pbuf, unsigned char* tbuf); /*------------------------------------------------------------------------- @@ -77,7 +77,7 @@ static void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf, * * Purpose: h52jpeg main program * - * main reads command line options and calls h52jpeg + * main reads command line options and calls h52jpeg * * Programmer: Pedro Vicente, pvn@hdfgroup.org * @@ -94,11 +94,11 @@ int main(int argc, const char *argv[]) /* initialze options to 0 */ memset(&opt,0,sizeof(h52jpeg_opt_t)); - + /* parse command line options */ - while ((op = get_option(argc, argv, s_opts, l_opts)) != EOF) + while ((op = get_option(argc, argv, s_opts, l_opts)) != EOF) { - switch ((char)op) + switch ((char)op) { case 'h': @@ -111,32 +111,32 @@ int main(int argc, const char *argv[]) case 'v': opt.verbose = 1; - break; - + break; + case 'i': opt.image_name = opt_arg; break; - + case 'c': opt.convert_true = 1; - + break; case 'p': opt.idx_palette = atoi(opt_arg); break; - + } /* switch */ - - + + } /* while */ - + /* check for file names to be processed */ - if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) + if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) { opt.file_name = argv[ opt_ind ]; - opt.template_name = argv[ opt_ind + 1 ]; + opt.template_name = argv[ opt_ind + 1 ]; } - + else { usage(progname); @@ -145,8 +145,8 @@ int main(int argc, const char *argv[]) if ( h52jpeg(opt) < 0 ) return 1; - - + + return 0; } @@ -173,9 +173,9 @@ static void usage(const char *prog) printf(" -i, --image Image name (full path in HDF5 file)\n"); printf(" -c, --convert Convert image from graycolor to truecolor\n"); printf(" -p P, --palette=P Use HDF5 palette index P in conversion -c\n"); - + printf("\n"); - + printf(" P - is an integer, the palette index in the HDF5 image. Default is 0\n"); printf(" template - is a string used to name the jpeg file name; this name is made\n"); printf(" by concatenating this template with the HDF5 image name\n"); @@ -198,8 +198,8 @@ static void usage(const char *prog) printf("\n"); printf(" Exports the HDF5 image named <image> to a true color jpeg image, using\n"); printf(" the palette of index 1 in that image to do the conversion\n"); - - + + } /*------------------------------------------------------------------------- @@ -218,10 +218,10 @@ static int h52jpeg(h52jpeg_opt_t opt) hid_t fid; trav_table_t *travt = NULL; size_t i; - + /* open the HDF5 file */ - if (( fid = h5tools_fopen(opt.file_name, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) + if (( fid = h5tools_fopen(opt.file_name, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) { error_msg(progname, "cannot open file <%s>\n", opt.file_name ); return -1; @@ -231,81 +231,81 @@ static int h52jpeg(h52jpeg_opt_t opt) * object name was specified at command line *------------------------------------------------------------------------- */ - + if ( opt.image_name ) { /* read object, save jpeg image */ do_object(fid, opt, opt.image_name); - + } - + /*------------------------------------------------------------------------- * object name was not specified; traverse the file *------------------------------------------------------------------------- */ - + else - + { - + /* initialize traversal table */ trav_table_init(&travt); - + /* get the list of objects in the file */ if ( h5trav_gettable(fid, travt) < 0 ) goto out; - + /* search for images/datasets in file */ - for ( i = 0; i < travt->nobjs; i++) + for ( i = 0; i < travt->nobjs; i++) { - - switch ( travt->objs[i].type ) + + switch ( travt->objs[i].type ) { default: printf( "unknown object. Exiting ...\n" ); goto out; - + case H5TRAV_TYPE_GROUP: case H5TRAV_TYPE_NAMED_DATATYPE: case H5TRAV_TYPE_LINK: case H5TRAV_TYPE_UDLINK: - + break; - + case H5TRAV_TYPE_DATASET: /* read object, save jpeg image */ do_object(fid, opt, travt->objs[i].name); - break; /* H5TRAV_TYPE_DATASET */ - - } /* switch */ - - } /* i */ - - + break; /* H5TRAV_TYPE_DATASET */ + + } /* switch */ + + } /* i */ + + /* HDfree table */ trav_table_free(travt); - + } /* opt.image_name */ - - + + /* close */ if ( H5Fclose(fid) < 0 ) return -1; - + return 0; - + out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Fclose(fid); - + } H5E_END_TRY; trav_table_free(travt); - + return -1; } @@ -329,29 +329,29 @@ int do_object(hid_t fid, h52jpeg_opt_t opt, const char* object_name) { int done=0; /* return value from do_image */ char jpeg_name[1024]; - + /* build the jpeg file name */ make_jpeg_name( opt.template_name, object_name, jpeg_name); - + if ( opt.verbose) { printf("%s ...", object_name ); } - + /*------------------------------------------------------------------------- * HDF5 Image *------------------------------------------------------------------------- */ - + if ( H5IMis_image( fid, object_name ) ) { /* read image, save jpeg image */ done = do_image(fid, opt, object_name, jpeg_name); } - - + + if ( opt.verbose) - { + { if ( done ) { printf("saved to %s\n", jpeg_name ); @@ -360,12 +360,12 @@ int do_object(hid_t fid, h52jpeg_opt_t opt, const char* object_name) { printf("\n"); } - + } - + return 0; - + } @@ -394,22 +394,22 @@ int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_na const char* name; int done; unsigned char* ibuf=NULL; - + name = image_name; - - done = 0; - + + done = 0; + if ( H5IMget_image_info( fid, name, &width, &height, &planes, interlace, &npals ) < 0 ) goto out; - - if (NULL == (ibuf = HDmalloc( (int)width * (int)height * (int)planes ))) + + if (NULL == (ibuf = HDmalloc( (int)width * (int)height * (int)planes ))) goto out; - + if ( H5IMread_image( fid, name, ibuf ) < 0 ) { goto out; } - + /*------------------------------------------------------------------------- * no conversion to true color requested or true color image, just save what we found * this will result either in @@ -422,12 +422,12 @@ int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_na if ( planes == 3 || !opt.convert_true ) { /* write the jpeg file */ - write_JPEG_file (jpeg_name, - ibuf, - (int) height, - (int) width, - (int) planes); - + write_JPEG_file (jpeg_name, + ibuf, + (int) height, + (int) width, + (int) planes); + done = 1; } /*------------------------------------------------------------------------- @@ -444,12 +444,12 @@ int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_na unsigned char *pbuf=NULL;/* palette array */ unsigned char *tbuf=NULL;/* true color array */ int ipal; /* palette to use */ - + if ( H5IMget_npalettes( fid, name, &npals ) < 0 ) { goto out; } - + /*------------------------------------------------------------------------- * there are palettes *------------------------------------------------------------------------- @@ -463,68 +463,68 @@ int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_na if ( opt.idx_palette >= npals ) { ipal = 0; - + if ( opt.verbose ) - { - printf("palette index <%d> does not exist. Using default...", + { + printf("palette index <%d> does not exist. Using default...", opt.idx_palette ); } } - - + + if ( H5IMget_palette_info( fid, name, ipal, pdims ) < 0 ) goto out; - - if (NULL == (pbuf = HDmalloc( (size_t)pdims[0] * (size_t)pdims[1] ))) + + if (NULL == (pbuf = HDmalloc( (size_t)pdims[0] * (size_t)pdims[1] ))) goto out; - - if (NULL == (tbuf = HDmalloc( (int)width * (int)height * 3 ))) + + if (NULL == (tbuf = HDmalloc( (int)width * (int)height * 3 ))) goto out; - + if ( H5IMget_palette( fid, name, ipal, pbuf ) < 0 ) goto out; - + /* convert indexed image to true color image */ convert_to_true(width, height, ibuf, pbuf, tbuf); - + /* write the jpeg file */ - write_JPEG_file (jpeg_name, - tbuf, - (int) height, - (int) width, - 3); - + write_JPEG_file (jpeg_name, + tbuf, + (int) height, + (int) width, + 3); + done = 1; - + HDfree( pbuf ); HDfree( tbuf ); pbuf = NULL; - tbuf = NULL; + tbuf = NULL; } /*------------------------------------------------------------------------- * there are no palettes *------------------------------------------------------------------------- */ else - { + { done = 0; if ( opt.verbose ) - { + { printf("image <%s> has no palette...", name ); } } /* no palettes */ - + } /* conversion to truecolor */ - + HDfree( ibuf ); ibuf = NULL; - + return done; - + out: - + return -1; - + } /*------------------------------------------------------------------------- @@ -533,7 +533,7 @@ out: * Parameters: template name (IN), image name (IN), jpeg name (IN/OUT) * * Purpose: build a name for the jpeg image file upon a template name - * and the HDF5 image name. Replace the special characters + * and the HDF5 image name. Replace the special characters * '%', '@', '$', '/', ':', '&', ' ', and '*' with '_' * * Return: void @@ -550,7 +550,7 @@ void make_jpeg_name( const char* template_name, const char* image_name, char* jp HDstrcat( jpeg_name, image_name ); HDstrcat( jpeg_name, ".jpeg" ); len = HDstrlen( jpeg_name); - + /* HDF5 path names might contain '/', replace with '_' */ for (j = 0; j < len; j++) { @@ -563,11 +563,11 @@ void make_jpeg_name( const char* template_name, const char* image_name, char* jp (jpeg_name[j] == '&') || (jpeg_name[j] == ' ') || (jpeg_name[j] == '*') ) - { - jpeg_name[j] = '_'; + { + jpeg_name[j] = '_'; } } - + } /*------------------------------------------------------------------------- @@ -589,8 +589,8 @@ static void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf, unsigned char* pbuf, unsigned char* tbuf) { hsize_t i, j; - - for ( i = 0, j = 0; i < width * height; i++, j += 3) + + for ( i = 0, j = 0; i < width * height; i++, j += 3) { unsigned char idx; unsigned char r; @@ -609,10 +609,10 @@ void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf, unsign tbuf[j] = r; tbuf[j+1] = g; tbuf[j+2] = b; - + } - - + + } @@ -633,12 +633,12 @@ void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf, unsign *------------------------------------------------------------------------- */ -static +static void write_JPEG_file(char *filename, /* JPEG file name */ JSAMPLE *image_buffer, /* Points to large array of R,G,B-order data */ int image_height, /* Number of rows in image */ int image_width, /* Number of columns in image */ - int planes) /* # of color components per pixel */ + int planes) /* # of color components per pixel */ { /* This struct contains the JPEG compression parameters and pointers to * working space (which is allocated as needed by the JPEG library). @@ -660,9 +660,9 @@ void write_JPEG_file(char *filename, /* JPEG file name */ FILE * outfile; /* target file */ JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */ int row_stride; /* physical row width in image buffer */ - + /* Step 1: allocate and initialize JPEG compression object */ - + /* We have to set up the error handler first, in case the initialization * step fails. (Unlikely, but it could happen if you are out of memory.) * This routine fills in the contents of struct jerr, and returns jerr's @@ -671,10 +671,10 @@ void write_JPEG_file(char *filename, /* JPEG file name */ cinfo.err = jpeg_std_error(&jerr); /* Now we can initialize the JPEG compression object. */ jpeg_create_compress(&cinfo); - + /* Step 2: specify data destination (eg, a file) */ /* Note: steps 2 and 3 can be done in either order. */ - + /* Here we use the library-supplied code to send compressed data to a * stdio stream. You can also write your own code to do something else. * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that @@ -685,22 +685,22 @@ void write_JPEG_file(char *filename, /* JPEG file name */ exit(1); } jpeg_stdio_dest(&cinfo, outfile); - + /* Step 3: set parameters for compression */ - + /* First we supply a description of the input image. * Four fields of the cinfo struct must be filled in: */ cinfo.image_width = image_width; /* image width and height, in pixels */ cinfo.image_height = image_height; cinfo.input_components = planes; /* # of color components per pixel */ - + /* colorspace of input image */ if (planes == 3) - cinfo.in_color_space = JCS_RGB; + cinfo.in_color_space = JCS_RGB; else if (planes == 1) - cinfo.in_color_space = JCS_GRAYSCALE; - + cinfo.in_color_space = JCS_GRAYSCALE; + /* Now use the library's routine to set default compression parameters. * (You must set at least cinfo.in_color_space before calling this, * since the defaults depend on the source color space.) @@ -710,24 +710,24 @@ void write_JPEG_file(char *filename, /* JPEG file name */ * Here we just illustrate the use of quality (quantization table) scaling: */ jpeg_set_quality(&cinfo, 100, TRUE /* limit to baseline-JPEG values */); - + /* Step 4: Start compressor */ - + /* TRUE ensures that we will write a complete interchange-JPEG file. * Pass TRUE unless you are very sure of what you're doing. */ jpeg_start_compress(&cinfo, TRUE); - + /* Step 5: while (scan lines remain to be written) */ /* jpeg_write_scanlines(...); */ - + /* Here we use the library's state variable cinfo.next_scanline as the * loop counter, so that we don't have to keep track ourselves. * To keep things simple, we pass one scanline per call; you can pass * more if you wish, though. */ row_stride = image_width * planes; /* JSAMPLEs per row in image_buffer */ - + while (cinfo.next_scanline < cinfo.image_height) { /* jpeg_write_scanlines expects an array of pointers to scanlines. * Here the array is only one element long, but you could pass @@ -736,18 +736,18 @@ void write_JPEG_file(char *filename, /* JPEG file name */ row_pointer[0] = & image_buffer[cinfo.next_scanline * row_stride]; (void) jpeg_write_scanlines(&cinfo, row_pointer, 1); } - + /* Step 6: Finish compression */ - + jpeg_finish_compress(&cinfo); /* After finish_compress, we can close the output file. */ fclose(outfile); - + /* Step 7: release JPEG compression object */ - + /* This is an important step since it will release a good deal of memory. */ jpeg_destroy_compress(&cinfo); - + /* And we're done! */ } diff --git a/hl/tools/h52jpeg/h52jpegtst.c b/hl/tools/h52jpeg/h52jpegtst.c index 08ad7d4..e043277 100644 --- a/hl/tools/h52jpeg/h52jpegtst.c +++ b/hl/tools/h52jpeg/h52jpegtst.c @@ -45,20 +45,20 @@ unsigned char *gbuf = NULL; /* global buffer for image data */ int main( void ) { hid_t fid; /* HDF5 file identifier */ - + /* create a new HDF5 file using default properties. */ - if (( fid = H5Fcreate( "h52jpegtst.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT )) < 0 ) + if (( fid = H5Fcreate( "h52jpegtst.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT )) < 0 ) return 1; - + /* make images */ if ( make_images( fid ) < 0 ) goto out; - + /* close the file. */ H5Fclose( fid ); - + return 0; - + out: printf("Error on return function...Exiting\n"); H5Fclose( fid ); @@ -68,7 +68,7 @@ out: /*------------------------------------------------------------------------- * Function: make_images * - * Purpose: generate images + * Purpose: generate images * *------------------------------------------------------------------------- */ @@ -81,24 +81,24 @@ static int make_images( hid_t fid ) hsize_t pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */ unsigned char pal[ PAL_ENTRIES * 3 ]; /* palette array */ int i, n; - + /*------------------------------------------------------------------------- - * indexed image with 1 palette + * indexed image with 1 palette *------------------------------------------------------------------------- */ - + /* read first data file */ if ( read_data( "image8.txt", &width, &height ) < 0 ) goto out; - + /* make the image */ if ( H5IMmake_image_8bit( fid, IM_1PAL, width, height, gbuf ) < 0 ) goto out; - + /* make a palette */ if ( H5IMmake_palette( fid, PAL1, pal_dims, pal_rgb ) < 0 ) goto out; - + /* attach the 1st palette to the image */ if ( H5IMlink_palette( fid, IM_1PAL, PAL1 ) < 0 ) { @@ -119,7 +119,7 @@ static int make_images( hid_t fid ) { goto out; } - + /*------------------------------------------------------------------------- * define another palette, green tones *------------------------------------------------------------------------- @@ -134,12 +134,12 @@ static int make_images( hid_t fid ) /* save the palette */ if ( H5IMmake_palette( fid, PAL2, pal_dims, pal ) < 0 ) goto out; - + /* attach the palette to the image */ if ( H5IMlink_palette( fid, IM_2PAL, PAL2 ) < 0 ) { goto out; - } + } /*------------------------------------------------------------------------- * make another image, in a group and no palette @@ -155,23 +155,23 @@ static int make_images( hid_t fid ) H5Gclose(gid); - + /*------------------------------------------------------------------------- * true color image with pixel interlace in RGB type *------------------------------------------------------------------------- */ - + /* read second data file */ if ( read_data( "image24pixel.txt", &width, &height ) < 0 ) goto out; - + /* make dataset */ if ( H5IMmake_image_24bit( fid, "img24", width, height, "INTERLACE_PIXEL", gbuf ) < 0 ) goto out; - + return 0; - -out: + +out: printf("Error on return function...Exiting\n"); return -1; } @@ -208,7 +208,7 @@ static int read_data( const char* fname, /*IN*/ int w, h; char *srcdir = getenv("srcdir"); /* the source directory */ char data_file[512]=""; /* buffer to hold name of existing data file */ - + /*------------------------------------------------------------------------- * compose the name of the file to open, using "srcdir", if appropriate *------------------------------------------------------------------------- @@ -220,46 +220,46 @@ static int read_data( const char* fname, /*IN*/ strcat(data_file, "/"); } strcat(data_file,fname); - + /*------------------------------------------------------------------------- * read *------------------------------------------------------------------------- */ - + f = fopen(data_file, "r"); if ( f == NULL ) { printf( "Could not open file %s. Try set $srcdir \n", data_file ); return -1; } - + fscanf( f, "%s", str ); fscanf( f, "%d", &color_planes ); fscanf( f, "%s", str ); fscanf( f, "%d", &h); fscanf( f, "%s", str ); fscanf( f, "%d", &w); - + *width = (hsize_t)w; *height = (hsize_t)h; - + if ( gbuf ) { free( gbuf ); gbuf=NULL; } - + gbuf = (unsigned char*) malloc (w * h * color_planes * sizeof( unsigned char )); - + for (i = 0; i < h * w * color_planes ; i++) { fscanf( f, "%d",&n ); gbuf[i] = (unsigned char)n; } fclose(f); - + return 1; - + } diff --git a/hl/tools/h52jpeg/h52jpegtst.h b/hl/tools/h52jpeg/h52jpegtst.h index 749e571..6931cb7 100644 --- a/hl/tools/h52jpeg/h52jpegtst.h +++ b/hl/tools/h52jpeg/h52jpegtst.h @@ -276,7 +276,7 @@ const unsigned char pal_rgb[PAL_ENTRIES*3] = {0,0,0, 131,0,0, 127,0,0 }; - + #endif /* _PAL_RGB_H */ |