diff options
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/fortran/examples/exlite.f90 | 18 | ||||
| -rwxr-xr-x | hl/fortran/src/H5IMfc.c | 58 | ||||
| -rwxr-xr-x | hl/fortran/src/H5IMff.f90 | 212 | ||||
| -rwxr-xr-x | hl/fortran/src/H5LTfc.c | 72 | ||||
| -rwxr-xr-x | hl/fortran/src/H5LTff.f90 | 1226 | ||||
| -rwxr-xr-x | hl/fortran/src/H5TBfc.c | 2 | ||||
| -rwxr-xr-x | hl/fortran/src/H5TBff.f90 | 642 | ||||
| -rwxr-xr-x | hl/fortran/test/tstimage.f90 | 90 | ||||
| -rw-r--r-- | hl/fortran/test/tstlite.f90 | 162 | ||||
| -rwxr-xr-x | hl/fortran/test/tsttable.f90 | 44 | ||||
| -rw-r--r-- | hl/src/H5DS.c | 82 | ||||
| -rw-r--r-- | hl/src/H5IM.c | 6 | ||||
| -rw-r--r-- | hl/src/H5LT.c | 2 | ||||
| -rw-r--r-- | hl/src/H5LTparse.c | 60 | ||||
| -rw-r--r-- | hl/src/H5PT.c | 4 | ||||
| -rw-r--r-- | hl/src/H5TB.c | 48 | ||||
| -rw-r--r-- | hl/test/gen_test_ds.c | 126 | ||||
| -rw-r--r-- | hl/test/test_ds.c | 488 | ||||
| -rw-r--r-- | hl/test/test_lite.c | 2 | ||||
| -rw-r--r-- | hl/test/test_table.c | 6 |
20 files changed, 1675 insertions, 1675 deletions
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/H5IMfc.c b/hl/fortran/src/H5IMfc.c index 7a54437..818096e 100755 --- a/hl/fortran/src/H5IMfc.c +++ b/hl/fortran/src/H5IMfc.c @@ -59,7 +59,7 @@ nh5immake_image_8bit_c (hid_t_f *loc_id, */ c_namelen = (int)*namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; /* @@ -68,15 +68,15 @@ nh5immake_image_8bit_c (hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5IMmake_image_8bitf(c_loc_id,c_name,w,h,buf); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; - + done: if(c_name!=NULL) free(c_name); - + return ret_value; @@ -118,7 +118,7 @@ nh5imread_image_c (hid_t_f *loc_id, */ c_namelen = (int)*namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; /* @@ -128,7 +128,7 @@ nh5imread_image_c (hid_t_f *loc_id, ret = H5IMread_imagef(c_loc_id,c_name,buf); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -184,12 +184,12 @@ nh5immake_image_24bit_c (hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_ilen = *ilen; c_il = (char *)HD5f2cstring(il, c_ilen); - if (c_il == NULL) + if (c_il == NULL) goto done; /* @@ -199,7 +199,7 @@ nh5immake_image_24bit_c (hid_t_f *loc_id, ret = H5IMmake_image_24bitf(c_loc_id,c_name,w,h,c_il,buf); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -259,7 +259,7 @@ nh5imget_image_info_c(hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; /* @@ -275,7 +275,7 @@ nh5imget_image_info_c(hid_t_f *loc_id, ret = H5IMget_image_info(c_loc_id,c_name,&c_width,&c_height,&c_planes,c_buf,&c_npals); - if (ret < 0) + if (ret < 0) goto done; *width = (hsize_t_f) c_width; @@ -287,13 +287,13 @@ nh5imget_image_info_c(hid_t_f *loc_id, * convert C name to FORTRAN and place it in the given buffer */ HD5packFstring(c_buf, _fcdtocp(interlace), (size_t)*ilen); - + ret_value = 0; done: if(c_name!=NULL) free(c_name); - if(c_buf!=NULL) + if(c_buf!=NULL) free(c_buf); return ret_value; @@ -389,13 +389,13 @@ nh5immake_palette_c (hid_t_f *loc_id, if(NULL == (c_name = (char *)HD5f2cstring(name, (int)*namelen))) HGOTO_DONE(FAIL) - for(i = 0; i < rank ; i++) + for(i = 0; i < rank ; i++) c_dims[i] = dims[i]; /* * call H5IMmake_palette function. */ - if(H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, buf) < 0) + if(H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, buf) < 0) HGOTO_DONE(FAIL) done: @@ -445,12 +445,12 @@ nh5imlink_palette_c (hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_namelenpal = *ilen; c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal); - if (c_namepal == NULL) + if (c_namepal == NULL) goto done; /* @@ -460,7 +460,7 @@ nh5imlink_palette_c (hid_t_f *loc_id, ret = H5IMlink_palette(c_loc_id,c_name,c_namepal); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -515,12 +515,12 @@ nh5imunlink_palette_c (hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_namelenpal = *ilen; c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal); - if (c_namepal == NULL) + if (c_namepal == NULL) goto done; /* @@ -530,7 +530,7 @@ nh5imunlink_palette_c (hid_t_f *loc_id, ret = H5IMunlink_palette(c_loc_id,c_name,c_namepal); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -583,7 +583,7 @@ nh5imget_npalettes_c(hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; /* @@ -595,7 +595,7 @@ nh5imget_npalettes_c(hid_t_f *loc_id, *npals = (hsize_t_f) c_npals; - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -649,7 +649,7 @@ nh5imget_palette_info_c(hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; /* @@ -658,11 +658,11 @@ nh5imget_palette_info_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5IMget_palette_info(c_loc_id,c_name,*pal_number,c_dims); - - if (ret < 0) + + if (ret < 0) goto done; - for (i = 0; i < 2 ; i++) + for (i = 0; i < 2 ; i++) { dims[i] = (hsize_t_f) c_dims[i]; } @@ -716,7 +716,7 @@ nh5imget_palette_c(hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; /* @@ -726,7 +726,7 @@ nh5imget_palette_c(hid_t_f *loc_id, ret = H5IMget_palettef(c_loc_id,c_name,*pal_number,buf); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; diff --git a/hl/fortran/src/H5IMff.f90 b/hl/fortran/src/H5IMff.f90 index 6e13c30..d78dc06 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/H5LTfc.c b/hl/fortran/src/H5LTfc.c index 039385a..0985aac 100755 --- a/hl/fortran/src/H5LTfc.c +++ b/hl/fortran/src/H5LTfc.c @@ -66,13 +66,13 @@ nh5ltmake_dataset_c (hid_t_f *loc_id, goto done; c_dims = malloc(sizeof(hsize_t) * (*rank )); - if (c_dims == NULL) + if (c_dims == NULL) goto done; /* * transpose dimension arrays because of C-FORTRAN storage order */ - for (i = 0; i < *rank ; i++) + for (i = 0; i < *rank ; i++) { c_dims[i] = dims[*rank - i - 1]; } @@ -85,7 +85,7 @@ nh5ltmake_dataset_c (hid_t_f *loc_id, ret = H5LTmake_dataset(c_loc_id, c_name, *rank, c_dims, c_type_id, buf ); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -732,7 +732,7 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id, else goto done; - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -788,12 +788,12 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(dsetname, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_attrnamelen = *attrnamelen; c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); - if (c_attrname == NULL) + if (c_attrname == NULL) goto done; /* @@ -804,7 +804,7 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id, ret = H5LTset_attribute_float(c_loc_id,c_name,c_attrname,buf,c_size); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -861,7 +861,7 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(dsetname, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_attrnamelen = *attrnamelen; @@ -877,7 +877,7 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id, ret = H5LTset_attribute_double(c_loc_id,c_name,c_attrname,buf,c_size); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -935,12 +935,12 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id, */ c_namelen = *namelen; c_name = (char *)HD5f2cstring(dsetname, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_attrnamelen = *attrnamelen; c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); - if (c_attrname == NULL) + if (c_attrname == NULL) goto done; c_buflen = *buflen; @@ -956,7 +956,7 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id, ret = H5LTset_attribute_string(c_loc_id,c_name,c_attrname,c_buf); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -1013,12 +1013,12 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id, */ c_namelen = (int)*namelen; c_name = (char *)HD5f2cstring(dsetname, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_attrnamelen = (int)*attrnamelen; c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); - if (c_attrname == NULL) + if (c_attrname == NULL) goto done; /* @@ -1035,7 +1035,7 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id, else goto done; - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -1091,12 +1091,12 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id, */ c_namelen = (int)*namelen; c_name = (char *)HD5f2cstring(dsetname, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_attrnamelen = (int)*attrnamelen; c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); - if (c_attrname == NULL) + if (c_attrname == NULL) goto done; /* @@ -1106,7 +1106,7 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id, ret = H5LTget_attribute_float(c_loc_id,c_name,c_attrname,buf); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -1160,12 +1160,12 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id, */ c_namelen = (int)*namelen; c_name = (char *)HD5f2cstring(dsetname, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_attrnamelen = (int)*attrnamelen; c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); - if (c_attrname == NULL) + if (c_attrname == NULL) goto done; /* @@ -1175,7 +1175,7 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id, ret = H5LTget_attribute_double(c_loc_id,c_name,c_attrname,buf); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -1230,12 +1230,12 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id, */ c_namelen = (int)*namelen; c_name = (char *)HD5f2cstring(dsetname, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_attrnamelen = (int)*attrnamelen; c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); - if (c_attrname == NULL) + if (c_attrname == NULL) goto done; /* @@ -1245,7 +1245,7 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id, ret = H5LTget_attribute_string(c_loc_id,c_name,c_attrname,buf); - if (ret < 0) + if (ret < 0) goto done; ret_value = 0; @@ -1299,7 +1299,7 @@ nh5ltget_dataset_ndims_c(hid_t_f *loc_id, */ c_namelen = (int)*namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; /* @@ -1309,7 +1309,7 @@ nh5ltget_dataset_ndims_c(hid_t_f *loc_id, ret = H5LTget_dataset_ndims(c_loc_id, c_name, &c_rank); - if (ret < 0) + if (ret < 0) goto done; *rank = (int_f)c_rank; @@ -1417,7 +1417,7 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id, */ c_namelen = (int)*namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; /* @@ -1437,10 +1437,10 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id, */ ret = H5LTget_dataset_ndims(c_loc_id, c_name, &c_rank); - if (ret < 0) + if (ret < 0) goto done; - for (i = 0; i < c_rank ; i++) + for (i = 0; i < c_rank ; i++) { dims[i] = (hsize_t_f) c_dims[c_rank - i - 1]; } @@ -1501,7 +1501,7 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id, c_attrnamelen = (int)*attrnamelen; c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); - if (c_attrname == NULL) + if (c_attrname == NULL) goto done; /* @@ -1511,7 +1511,7 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id, ret = H5LTget_attribute_ndims(c_loc_id,c_name,c_attrname,&c_rank); - if (ret < 0) + if (ret < 0) goto done; *rank = (int_f)c_rank; @@ -1575,12 +1575,12 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id, */ c_namelen = (int)*namelen; c_name = (char *)HD5f2cstring(name, c_namelen); - if (c_name == NULL) + if (c_name == NULL) goto done; c_attrnamelen = (int)*attrnamelen; c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen); - if (c_attrname == NULL) + if (c_attrname == NULL) goto done; /* @@ -1589,7 +1589,7 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id, c_loc_id = (hid_t)*loc_id; ret = H5LTget_attribute_info(c_loc_id,c_name,c_attrname,c_dims,&c_classtype,&c_type_size); - if (ret < 0) + if (ret < 0) goto done; *type_class = c_classtype; @@ -1600,10 +1600,10 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id, */ ret = H5LTget_attribute_ndims(c_loc_id,c_name,c_attrname,&c_rank); - if (ret < 0) + if (ret < 0) goto done; - for (i = 0; i < c_rank ; i++) + for (i = 0; i < c_rank ; i++) { dims[i] = (hsize_t_f) c_dims[c_rank - i - 1]; } diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90 index b622206..0c07449 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,13 +2448,13 @@ 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 integer :: buflen ! buffer length - + interface integer function h5ltmake_dataset_string_c(loc_id,namelen,dset_name,buflen,buf) use h5global @@ -2465,8 +2465,8 @@ subroutine h5ltmake_dataset_string_f(loc_id,& integer(hid_t), intent(in) :: loc_id ! file or group identifier integer :: namelen ! lenght of name buffer integer :: buflen ! lenght of data 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 @@ -2479,7 +2479,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 ! @@ -2493,13 +2493,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) @@ -2507,8 +2507,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 @@ -2522,7 +2522,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 @@ -2557,15 +2557,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) @@ -2573,8 +2573,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 @@ -2593,7 +2593,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 @@ -2623,15 +2623,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) @@ -2639,8 +2639,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 @@ -2659,7 +2659,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 @@ -2689,15 +2689,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) @@ -2705,8 +2705,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 @@ -2725,7 +2725,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 @@ -2756,14 +2756,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) @@ -2771,8 +2771,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 @@ -2792,7 +2792,7 @@ subroutine h5ltset_attribute_string_f(loc_id,& integer :: namelen ! lenght of name buffer integer :: attrlen ! lenght of attr name buffer integer :: buflen ! data buffer length - 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 @@ -2824,14 +2824,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) @@ -2839,8 +2839,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 @@ -2858,7 +2858,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 @@ -2888,14 +2888,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) @@ -2903,8 +2903,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 @@ -2922,7 +2922,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 @@ -2951,14 +2951,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) @@ -2966,8 +2966,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 @@ -2985,7 +2985,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 @@ -3014,14 +3014,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) @@ -3029,8 +3029,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 @@ -3048,7 +3048,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 @@ -3081,13 +3081,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) @@ -3095,9 +3095,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 @@ -3110,8 +3110,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 @@ -3124,7 +3124,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 @@ -3139,11 +3139,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) @@ -3151,8 +3151,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 @@ -3165,7 +3165,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 @@ -3192,15 +3192,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) @@ -3208,9 +3208,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 @@ -3225,10 +3225,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 @@ -3260,14 +3260,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) @@ -3275,10 +3275,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 @@ -3294,9 +3294,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 @@ -3324,16 +3324,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) @@ -3341,10 +3341,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 @@ -3362,11 +3362,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 @@ -3381,9 +3381,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 a09d73b..7139be3 100755 --- a/hl/fortran/src/H5TBfc.c +++ b/hl/fortran/src/H5TBfc.c @@ -123,7 +123,7 @@ nh5tbmake_table_c(int_f *namelen1, c_chunk_size, NULL, *compress, NULL) < 0) HGOTO_DONE(FAIL) -done: +done: if(c_name) HDfree(c_name); if(c_name1) diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90 index 03ecc6e..9acdcee 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 168bb99..504b8d7 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(HSIZE_T), dimension(3) :: dimsr ! Dataset dimensions integer, dimension(DIM1*DIM2*DIM3) :: buf ! Data buffer @@ -421,7 +421,7 @@ end do ! ! Initialize FORTRAN predefined datatypes. ! -call h5open_f(errcode) +call h5open_f(errcode) ! ! Create a new file using default properties. @@ -433,12 +433,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) @@ -458,12 +458,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) @@ -487,12 +487,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) @@ -516,12 +516,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) @@ -540,7 +540,7 @@ do i = 1, dims(1) end do end do -call h5ltget_dataset_info_f(file_id,dsetname4,dimsr,type_class,type_size,errcode ) +call h5ltget_dataset_info_f(file_id,dsetname4,dimsr,type_class,type_size,errcode ) ! ! compare dimensions @@ -576,13 +576,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 @@ -610,7 +610,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. @@ -629,18 +629,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) @@ -658,19 +658,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) @@ -688,19 +688,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) @@ -719,19 +719,19 @@ call passed() !------------------------------------------------------------------------- -! string +! string !------------------------------------------------------------------------- call test_begin(' Make/Read datasets (string) ') ! -! write dataset. +! write dataset. ! call h5ltmake_dataset_string_f(file_id, dsetname5, buf1, errcode) ! -! read dataset. +! read dataset. ! call h5ltread_dataset_string_f(file_id, dsetname5, buf1r, errcode) @@ -754,7 +754,7 @@ call passed() call test_begin(' Get dataset dimensions/info ') !------------------------------------------------------------------------- -! h5ltget_dataset_ndims_f +! h5ltget_dataset_ndims_f !------------------------------------------------------------------------- call h5ltget_dataset_ndims_f(file_id, dsetname4, rankr, errcode) @@ -780,7 +780,7 @@ endif !------------------------------------------------------------------------- -call h5ltget_dataset_info_f(file_id,dsetname4,dimsr,type_class,type_size,errcode ) +call h5ltget_dataset_info_f(file_id,dsetname4,dimsr,type_class,type_size,errcode ) ! ! compare dimensions @@ -811,22 +811,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 = "dsetf5.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 @@ -856,13 +856,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) @@ -887,12 +887,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) @@ -917,12 +917,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) @@ -948,12 +948,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) @@ -980,12 +980,12 @@ call test_begin(' Set/Get attributes string ') ! -! write attribute. +! write attribute. ! call h5ltset_attribute_string_f(file_id,dsetname1,attrname5,buf1,errcode) ! -! read attribute. +! read attribute. ! call h5ltget_attribute_string_f(file_id,dsetname1,attrname5,bufr1,errcode) @@ -1009,7 +1009,7 @@ call passed() call test_begin(' Get attribute rank/info ') -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' @@ -1017,7 +1017,7 @@ if ( rankr .ne. 1 ) then endif -call h5ltget_attribute_info_f(file_id,dsetname1,attrname2,dimsr,type_class,type_size,errcode) +call h5ltget_attribute_info_f(file_id,dsetname1,attrname2,dimsr,type_class,type_size,errcode) ! ! compare dimensions @@ -1051,17 +1051,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/H5DS.c b/hl/src/H5DS.c index e15c132..245a2c5 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -149,10 +149,10 @@ herr_t H5DSattach_scale(hid_t did, * parameter checking *------------------------------------------------------------------------- */ - + if ((is_scale = H5DSis_scale(did)) < 0) return FAIL; - + /* the dataset cannot be a DS dataset */ if ( is_scale == 1) return FAIL; @@ -473,7 +473,7 @@ herr_t H5DSattach_scale(hid_t did, if((tid = H5Aget_type(aid)) < 0) goto out; - + if((ntid = H5Tget_native_type(tid, H5T_DIR_DEFAULT)) < 0) goto out; @@ -656,10 +656,10 @@ herr_t H5DSdetach_scale(hid_t did, * parameter checking *------------------------------------------------------------------------- */ - + if ((is_scale = H5DSis_scale(did)) < 0) return FAIL; - + /* the dataset cannot be a DS dataset */ if ( is_scale == 1) return FAIL; @@ -770,7 +770,7 @@ herr_t H5DSdetach_scale(hid_t did, goto out; /* same object, reset */ - if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr) + if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr) { size_t len; @@ -778,13 +778,13 @@ herr_t H5DSdetach_scale(hid_t did, { ((hobj_ref_t *)buf[idx].p)[jj] = ((hobj_ref_t *)buf[idx].p)[jj+1]; } - + buf[idx].len--; len = buf[idx].len; buf[idx].p = realloc( buf[idx].p, len * sizeof(hobj_ref_t)); - + found_ds = 1; - + /* close the dereferenced dataset and break */ if (H5Dclose(dsid_j) < 0) goto out; @@ -831,7 +831,7 @@ herr_t H5DSdetach_scale(hid_t did, if((tid = H5Aget_type(aid)) < 0) goto out; - + if((ntid = H5Tget_native_type(tid, H5T_DIR_DEFAULT)) < 0) goto out; @@ -950,17 +950,17 @@ herr_t H5DSdetach_scale(hid_t did, if (H5Tclose(tid) < 0) goto out; - if (dsbuf) + if (dsbuf) { free(dsbuf); dsbuf=NULL; } - if (dsbufn) + if (dsbufn) { free(dsbufn); dsbufn=NULL; } - if (dims) + if (dims) { free(dims); dims=NULL; @@ -976,23 +976,23 @@ out: H5Aclose(aid); H5Tclose(ntid); H5Tclose(tid); - - if (dsbuf) + + if (dsbuf) { free(dsbuf); dsbuf=NULL; } - if (dsbufn) + if (dsbufn) { free(dsbufn); dsbufn=NULL; } - if (dims) + if (dims) { free(dims); dims=NULL; } - if (buf) + if (buf) { free(buf); buf=NULL; @@ -1056,10 +1056,10 @@ htri_t H5DSis_attached(hid_t did, * parameter checking *------------------------------------------------------------------------- */ - + if ((is_scale = H5DSis_scale(did)) < 0) return FAIL; - + /* the dataset cannot be a DS dataset */ if ( is_scale == 1) return FAIL; @@ -1202,10 +1202,10 @@ htri_t H5DSis_attached(hid_t did, if((tid = H5Aget_type(aid)) < 0) goto out; - + if((ntid = H5Tget_native_type(tid, H5T_DIR_DEFAULT)) < 0) goto out; - + /* get and save the old reference(s) */ if((sid = H5Aget_space(aid)) < 0) goto out; @@ -1313,8 +1313,8 @@ out: * * hid_t DID; IN: the dataset * unsigned int DIM; IN: the dimension of the dataset -* int *DS_IDX; IN/OUT: on input the dimension scale index to start iterating, -* on output the next index to visit. If NULL, start at +* int *DS_IDX; IN/OUT: on input the dimension scale index to start iterating, +* on output the next index to visit. If NULL, start at * the first position. * H5DS_iterate_t VISITOR; IN: the visitor function * void *VISITOR_DATA; IN: arbitrary data to pass to the visitor function. @@ -1455,7 +1455,7 @@ herr_t H5DSiterate_scales(hid_t did, if((ret_value=(visitor)(did,dim,scale_id,visitor_data))!=0) { /* break */ - + /* close the DS id */ if (H5Dclose(scale_id) < 0) goto out; @@ -1521,7 +1521,7 @@ out: *------------------------------------------------------------------------- */ -herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) +herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) { int has_labels; hid_t sid = -1; /* space ID */ @@ -1573,7 +1573,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) *------------------------------------------------------------------------- */ - if (has_labels == 0) + if (has_labels == 0) { dims[0] = rank; @@ -1626,7 +1626,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) *------------------------------------------------------------------------- */ - else + else { if ((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0) goto out; @@ -1659,7 +1659,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) buf[idx] = NULL; /* free all the ptr's from the H5Aread() */ - for (i = 0; i < (unsigned int) rank; i++) + for (i = 0; i < (unsigned int) rank; i++) { if (buf[i]) free((void *)buf[i]); @@ -1680,13 +1680,13 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) return SUCCEED; /* error zone */ -out: - if (buf) +out: + if (buf) { if (buf[idx]) /* check if we errored during H5Awrite */ buf[idx] = NULL; /* don't free label */ /* free all the ptr's from the H5Aread() */ - for (i = 0; i < (unsigned int) rank; i++) + for (i = 0; i < (unsigned int) rank; i++) { if (buf[i]) free((void *)buf[i]); @@ -1723,7 +1723,7 @@ out: * *------------------------------------------------------------------------- */ -ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) +ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) { int has_labels; hid_t sid = -1; /* space ID */ @@ -1772,12 +1772,12 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) return FAIL; /* return 0 and NULL for label if no label found */ - if (has_labels == 0) + if (has_labels == 0) { if (label) label[0] = 0; return 0; - } + } /*------------------------------------------------------------------------- * open the attribute and read label @@ -1808,7 +1808,7 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) copy_len = MIN(size-1, nbytes); /* copy all/some of the name */ - if (label) + if (label) { memcpy(label, buf[idx], copy_len); @@ -1817,7 +1817,7 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) } /* free all the ptr's from the H5Aread() */ - for (i = 0; i < rank; i++) + for (i = 0; i < rank; i++) { if (buf[i]) free(buf[i]); @@ -1837,11 +1837,11 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) return (ssize_t) nbytes; /* error zone */ -out: - if (buf) +out: + if (buf) { /* free all the ptr's from the H5Aread() */ - for (i = 0; i < rank; i++) + for (i = 0; i < rank; i++) { if (buf[i]) free(buf[i]); @@ -2261,7 +2261,7 @@ herr_t H5DS_is_reserved(hid_t did) /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Tclose(tid); H5Aclose(aid); diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index 361a65b..11f4014 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -165,8 +165,8 @@ herr_t H5IMmake_image_24bit( hid_t loc_id, * *------------------------------------------------------------------------- */ -static herr_t find_palette(hid_t loc_id, - const char *name, +static herr_t find_palette(hid_t loc_id, + const char *name, const H5A_info_t *ainfo, void *op_data) { @@ -248,7 +248,7 @@ herr_t H5IMget_image_info( hid_t loc_id, hid_t atid; H5T_class_t aclass; int has_pal; - int has_attr; + int has_attr; /*assume initially we have no palettes attached*/ *npals = 0; diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index d118942..22bb97f 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -1757,7 +1757,7 @@ out: sprintf(tmp_str, "\n%*s <empty>", indt + 4, ""); strcat(str, tmp_str); } /* end if */ - + /* Release resources */ if(name) { for(i = 0; i < nmembs; i++) diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c index 98dcbd5..41c4cec 100644 --- a/hl/src/H5LTparse.c +++ b/hl/src/H5LTparse.c @@ -17,7 +17,7 @@ * on jam. Do NOT modify it by hand. */ #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> @@ -91,7 +91,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*/ @@ -99,7 +99,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*/ @@ -822,9 +822,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; @@ -834,7 +834,7 @@ case 50: break; case 51: #line 167 "H5LTparse.y" -{ +{ size_t origin_size, new_size; hid_t dtype_id = cmpd_stack[csindex].id; @@ -848,7 +848,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); @@ -859,10 +859,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; @@ -886,7 +886,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--; @@ -900,9 +900,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: @@ -915,10 +915,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: @@ -927,7 +927,7 @@ case 67: break; case 68: #line 247 "H5LTparse.y" -{ +{ H5Tset_tag(yyvsp[-6].ival, yylval.sval); is_opq_tag = 0; } @@ -942,12 +942,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: @@ -963,7 +963,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) @@ -981,7 +981,7 @@ case 76: break; case 77: #line 291 "H5LTparse.y" -{ +{ hid_t str_id = yyvsp[-1].ival; /*set string size*/ @@ -990,12 +990,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: @@ -1042,7 +1042,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: @@ -1057,32 +1057,32 @@ case 92: hid_t native = H5Tget_native_type(super, H5T_DIR_ASCEND); H5T_order_t super_order = H5Tget_order(super); H5T_order_t native_order = H5Tget_order(native); - + 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)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &char_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &char_val, NULL, H5P_DEFAULT); H5Tenum_insert(enum_id, enum_memb_symbol, &char_val); } else if(H5Tequal(native, H5T_NATIVE_SHORT) || H5Tequal(native, H5T_NATIVE_USHORT)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &short_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &short_val, NULL, H5P_DEFAULT); H5Tenum_insert(enum_id, enum_memb_symbol, &short_val); } else if(H5Tequal(native, H5T_NATIVE_INT) || H5Tequal(native, H5T_NATIVE_UINT)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &int_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &int_val, NULL, H5P_DEFAULT); H5Tenum_insert(enum_id, enum_memb_symbol, &int_val); } else if(H5Tequal(native, H5T_NATIVE_LONG) || H5Tequal(native, H5T_NATIVE_ULONG)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &long_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &long_val, NULL, H5P_DEFAULT); H5Tenum_insert(enum_id, enum_memb_symbol, &long_val); } else if(H5Tequal(native, H5T_NATIVE_LLONG) || H5Tequal(native, H5T_NATIVE_ULLONG)) { if(super_order != native_order) - H5Tconvert(native, super, 1, &llong_val, NULL, H5P_DEFAULT); + H5Tconvert(native, super, 1, &llong_val, NULL, H5P_DEFAULT); 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 3d16db5..ff4347a 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 b9cb73c..6edc244 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -181,7 +181,7 @@ herr_t H5TBmake_table( const char *table_title, /* attach the FIELD_ name attribute */ for ( i = 0; i < nfields; i++) - { + { /* get the member name */ member_name = H5Tget_member_name( mem_type_id,(unsigned) i ); @@ -339,7 +339,7 @@ herr_t H5TBappend_records( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(mem_type_id); @@ -443,7 +443,7 @@ herr_t H5TBwrite_records( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(mem_type_id); @@ -607,7 +607,7 @@ herr_t H5TBwrite_fields_name( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Pclose(preserve_id); H5Dclose(did); @@ -766,7 +766,7 @@ herr_t H5TBwrite_fields_index( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Pclose(preserve_id); H5Dclose(did); @@ -856,7 +856,7 @@ herr_t H5TBread_table( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(mem_type_id); @@ -1091,7 +1091,7 @@ herr_t H5TBread_fields_name( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(mem_type_id); @@ -1247,7 +1247,7 @@ herr_t H5TBread_fields_index( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(read_type_id); @@ -1414,7 +1414,7 @@ out: if (tmp_buf !=NULL ) free( tmp_buf ); - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(tid); @@ -1574,7 +1574,7 @@ herr_t H5TBinsert_record( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Sclose(sid); @@ -1711,7 +1711,7 @@ herr_t H5TBadd_records_from( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did_1); H5Sclose(sid_1); @@ -2065,7 +2065,7 @@ herr_t H5TBcombine_tables( hid_t loc_id1, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did_1); H5Sclose(sid_1); @@ -2220,7 +2220,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 ); @@ -2502,7 +2502,7 @@ herr_t H5TBinsert_field( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did_1); H5Sclose(sid_1); @@ -2614,7 +2614,7 @@ herr_t H5TBdelete_field( hid_t loc_id, /* check out the field */ for ( i = 0; i < nfields; i++) - { + { /* get the member name */ member_name = H5Tget_member_name( tid_1,(unsigned) i ); @@ -2673,7 +2673,7 @@ herr_t H5TBdelete_field( hid_t loc_id, /* insert the old fields except the one to delete */ for ( i = 0; i < nfields; i++) - { + { /* get the member name */ member_name = H5Tget_member_name( tid_1, (unsigned) i ); @@ -2751,13 +2751,13 @@ 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(tid_1, (unsigned)i); /* skip the field to delete */ - if (H5TB_find_field(member_name, field_name) > 0) + if (H5TB_find_field(member_name, field_name) > 0) { free(member_name); continue; @@ -2951,7 +2951,7 @@ herr_t H5TBdelete_field( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did_1); H5Sclose(sid_1); @@ -3101,7 +3101,7 @@ out: * * Comments: * -* Modifications: +* Modifications: * May 08, 2003 * In version 2.0 of Table, the number of records is stored as an * attribute "NROWS" @@ -3178,7 +3178,7 @@ herr_t H5TBget_table_info ( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Sclose(sid); @@ -3284,7 +3284,7 @@ herr_t H5TBget_field_info( hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Tclose(tid); @@ -3455,7 +3455,7 @@ hid_t H5TB_create_type(hid_t loc_id, for ( i = 0; i < nfields; i++) { - if ((fnames[i] = (char*) malloc(sizeof(char)*HLTB_MAX_FIELD_LEN))==NULL) + if ((fnames[i] = (char*) malloc(sizeof(char)*HLTB_MAX_FIELD_LEN))==NULL) { free(fnames); return -1; @@ -3501,7 +3501,7 @@ hid_t H5TB_create_type(hid_t loc_id, /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Tclose(mtype_id); H5Tclose(nmtype_id); diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c index 573fe20..93bda2b 100644 --- a/hl/test/gen_test_ds.c +++ b/hl/test/gen_test_ds.c @@ -17,11 +17,11 @@ * Purpose: This program is run to generate an HDF5 data file with datasets * that use dimension scales. * - * Compile and run this program to generate the "test_ds_xx.h5" + * Compile and run this program to generate the "test_ds_xx.h5" * file, where xx is "le" on a little-endian machine and "be" * on a big-endian machine. * Move it to the test directory in the current branch. - * The test: test_foreign_scaleattached(const char *fileforeign) + * The test: test_foreign_scaleattached(const char *fileforeign) * in test_ds.c will read them. */ @@ -33,7 +33,7 @@ /* prototypes */ static hid_t open_test_file(const char *fileext); -herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx); +herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx); herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx); herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx); herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx); @@ -79,7 +79,7 @@ int main(int argc , char **argv) int nerrors=0; char filename[65]; - + if (argc < 2) { printf("Usage: gen_test [le | be]\n"); return 1; @@ -102,7 +102,7 @@ int main(int argc , char **argv) nerrors += test_duplicatelong_attachscales(filename) < 0 ? 1 : 0; nerrors += test_samelong_scalenames(filename) < 0 ? 1 : 0; nerrors += test_foreign_scaleattached(filename) < 0 ? 1 : 0; - + if(nerrors) goto error; printf("Dimension scales file generation passed.\n"); @@ -120,7 +120,7 @@ static hid_t open_test_file(const char *fileext) strcpy(filename, FILENAME); strcat(filename, fileext); strcat(filename, FILEEXT); - + return H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); } @@ -129,7 +129,7 @@ static hid_t open_test_file(const char *fileext) *------------------------------------------------------------------------- */ -herr_t create_long_dataset(hid_t fid, const char *name, const char *dsidx) +herr_t create_long_dataset(hid_t fid, const char *name, const char *dsidx) { int rank = 4; int rankds = 1; @@ -181,11 +181,11 @@ herr_t create_long_dataset(hid_t fid, const char *name, const char *dsidx) return SUCCEED; } -herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx) +herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx) { herr_t ret_value = FAIL; hid_t dsid = -1; - + if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) { if(H5DSis_attached(did, dsid, idx) == 0) { if(H5DSattach_scale(did, dsid, idx) >= 0) { @@ -205,7 +205,7 @@ herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int id return ret_value; } -herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx) +herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx) { herr_t ret_value = FAIL; hid_t dsid = -1; @@ -225,11 +225,11 @@ herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int id return ret_value; } -herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx) +herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx) { herr_t ret_value = FAIL; hid_t dsid = -1; - + if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) { if(H5DSis_attached(did, dsid, idx) == 1) { if(H5DSset_scale(dsid, scalename) >= 0) { @@ -245,7 +245,7 @@ herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *sc return ret_value; } -herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx) +herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx) { herr_t ret_value = FAIL; hid_t dsid = -1; @@ -282,12 +282,12 @@ static int test_long_attachscales(const char *filename) char scalename[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "al"); - + TESTING2("test_long_attachscales"); - + if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) goto out; - + /* make a dataset */ if(create_long_dataset(fid, dsname, "al") < 0) goto out; @@ -297,22 +297,22 @@ static int test_long_attachscales(const char *filename) strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM2) < 0) goto out; - + strcpy(scalename, DS_4_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM3) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -320,18 +320,18 @@ static int test_long_attachscales(const char *filename) goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -343,12 +343,12 @@ static int test_duplicatelong_attachscales(const char *filename) char scalename[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "al2"); - + TESTING2("test_duplicatelong_attachscales"); - + if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) goto out; - + /* make a dataset 2 */ if(create_long_dataset(fid, dsname, "al2") < 0) goto out; @@ -358,22 +358,22 @@ static int test_duplicatelong_attachscales(const char *filename) strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM2) < 0) goto out; - + strcpy(scalename, DS_4_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM3) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -381,18 +381,18 @@ static int test_duplicatelong_attachscales(const char *filename) goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -404,10 +404,10 @@ static int test_long_scalenames(const char *filename) { char name[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "al"); - + if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) goto out; - + TESTING2("set long scale/cmp scale name"); if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) { strcpy(scalename, DS_1_NAME); @@ -419,7 +419,7 @@ static int test_long_scalenames(const char *filename) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "al"); strcpy(name, SCALE_2_NAME); @@ -429,7 +429,7 @@ static int test_long_scalenames(const char *filename) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "al"); strcpy(name, SCALE_3_NAME); @@ -439,7 +439,7 @@ static int test_long_scalenames(const char *filename) { if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0) goto out; - + strcpy(scalename, DS_4_NAME); strcat(scalename, "al"); strcpy(name, SCALE_4_NAME); @@ -449,7 +449,7 @@ static int test_long_scalenames(const char *filename) { if(test_cmp_scalename(fid, did, scalename, name, DIM3) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -457,18 +457,18 @@ static int test_long_scalenames(const char *filename) { goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -481,10 +481,10 @@ static int test_samelong_scalenames(const char *filename) { strcpy(dsname, DATASET_NAME); strcat(dsname, "al2"); - + if((fid = open_test_file(filename)) < 0) goto out; - + TESTING2("set same long scale/cmp scale name"); if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) { strcpy(scalename, DS_1_NAME); @@ -496,7 +496,7 @@ static int test_samelong_scalenames(const char *filename) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "al"); strcpy(name, DS_2_NAME); @@ -506,7 +506,7 @@ static int test_samelong_scalenames(const char *filename) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "al"); strcpy(name, DS_3_NAME); @@ -516,7 +516,7 @@ static int test_samelong_scalenames(const char *filename) { if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0) goto out; - + strcpy(scalename, DS_4_NAME); strcat(scalename, "al"); strcpy(name, DS_4_NAME); @@ -526,7 +526,7 @@ static int test_samelong_scalenames(const char *filename) { if(test_cmp_scalename(fid, did, scalename, name, DIM3) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -534,18 +534,18 @@ static int test_samelong_scalenames(const char *filename) { goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -555,7 +555,7 @@ static int test_foreign_scaleattached(const char *filename) hid_t fid = -1; hid_t did = -1; hid_t dsid = -1; - + TESTING2("test_foreign_scaleattached"); if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) @@ -565,7 +565,7 @@ static int test_foreign_scaleattached(const char *filename) if((dsid = H5Dopen2(fid, "/ds_4_al", H5P_DEFAULT)) >= 0) { if(H5DSis_attached(did, dsid, 3) == 1) { ret_value = SUCCEED; - } + } if(H5Dclose(dsid) < 0) goto out; } @@ -574,22 +574,22 @@ static int test_foreign_scaleattached(const char *filename) } else goto out; - + if(ret_value == FAIL) goto out; - + PASSED(); - + H5Fclose(fid); return 0; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c index 32622ed..8576b2a 100644 --- a/hl/test/test_ds.c +++ b/hl/test/test_ds.c @@ -32,9 +32,9 @@ static int create_test_file(const char *fileext); static int open_test_file(const char *fileext); herr_t create_char_dataset(hid_t fid, const char *dsidx, int fulldims); herr_t create_short_dataset(hid_t fid, const char *dsidx, int fulldims); -herr_t create_int_dataset(hid_t fid, const char *dsidx, int fulldims); -herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldims); -herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims); +herr_t create_int_dataset(hid_t fid, const char *dsidx, int fulldims); +herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldims); +herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims); herr_t create_DS1_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf); herr_t create_DS2_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf); herr_t create_DS3_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf, char *s3_wbuf); @@ -168,8 +168,8 @@ int main(void) nerrors += test_samelong_scalenames("2") < 0 ? 1 : 0; nerrors += test_foreign_scaleattached(FOREIGN_FILE1) < 0 ? 1 : 0; nerrors += test_foreign_scaleattached(FOREIGN_FILE2) < 0 ? 1 : 0; - -/* the following tests have not been rewritten to match those above */ + +/* the following tests have not been rewritten to match those above */ nerrors += test_simple() < 0 ?1:0; nerrors += test_errors() < 0 ?1:0; nerrors += test_errors2() < 0 ?1:0; @@ -177,7 +177,7 @@ int main(void) nerrors += test_iterators() < 0 ?1:0; nerrors += test_types() < 0 ?1:0; nerrors += test_data() < 0 ?1:0; - + if(nerrors) goto error; printf("All dimension scales tests passed.\n"); @@ -224,7 +224,7 @@ static hid_t open_test_file(const char *fileext) strcpy(filename, FILENAME); strcat(filename, fileext); strcat(filename, FILEEXT); - + return H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT); } @@ -232,7 +232,7 @@ static hid_t open_test_file(const char *fileext) * create "data" dataset *------------------------------------------------------------------------- */ -herr_t create_char_dataset(hid_t fid, const char *dsidx, int fulldims) +herr_t create_char_dataset(hid_t fid, const char *dsidx, int fulldims) { int rank = 3; int rankds = 1; @@ -261,11 +261,11 @@ herr_t create_char_dataset(hid_t fid, const char *dsidx, int fulldims) /* make a DS dataset for the first dimension */ if(create_DS1_char_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0) return FAIL; - + /* make a DS dataset for the second dimension */ if(create_DS2_char_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0) return FAIL; - + /* make a DS dataset for the third dimension */ if(create_DS3_char_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0) return FAIL; @@ -273,10 +273,10 @@ herr_t create_char_dataset(hid_t fid, const char *dsidx, int fulldims) else { if(create_DS1_char_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0) return FAIL; - + if(create_DS2_char_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0) return FAIL; - + if(create_DS3_char_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) < 0) return FAIL; } @@ -286,7 +286,7 @@ herr_t create_char_dataset(hid_t fid, const char *dsidx, int fulldims) return SUCCEED; } -herr_t create_short_dataset(hid_t fid, const char *dsidx, int fulldims) +herr_t create_short_dataset(hid_t fid, const char *dsidx, int fulldims) { int rank = 3; int rankds = 1; @@ -316,11 +316,11 @@ herr_t create_short_dataset(hid_t fid, const char *dsidx, int fulldims) /* make a DS dataset for the first dimension */ if(create_DS1_short_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0) return FAIL; - + /* make a DS dataset for the second dimension */ if(create_DS2_short_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0) return FAIL; - + /* make a DS dataset for the third dimension */ if(create_DS3_short_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0) return FAIL; @@ -328,10 +328,10 @@ herr_t create_short_dataset(hid_t fid, const char *dsidx, int fulldims) else { if(create_DS1_short_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0) return FAIL; - + if(create_DS2_short_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0) return FAIL; - + if(create_DS3_short_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) < 0) return FAIL; } @@ -341,7 +341,7 @@ herr_t create_short_dataset(hid_t fid, const char *dsidx, int fulldims) return SUCCEED; } -herr_t create_int_dataset(hid_t fid, const char *dsidx, int fulldims) +herr_t create_int_dataset(hid_t fid, const char *dsidx, int fulldims) { int rank = RANK; int rankds = 1; @@ -365,7 +365,7 @@ herr_t create_int_dataset(hid_t fid, const char *dsidx, int fulldims) /* make a DS dataset for the first dimension */ if(create_DS1_int_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0) return FAIL; - + /* make a DS dataset for the second dimension */ if(create_DS2_int_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0) return FAIL; @@ -373,7 +373,7 @@ herr_t create_int_dataset(hid_t fid, const char *dsidx, int fulldims) else { if(create_DS1_int_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0) return FAIL; - + if(create_DS2_int_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0) return FAIL; } @@ -383,7 +383,7 @@ herr_t create_int_dataset(hid_t fid, const char *dsidx, int fulldims) return SUCCEED; } -herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldims) +herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int fulldims) { int rank = 4; int rankds = 1; @@ -420,15 +420,15 @@ herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int /* make a DS dataset for the first dimension */ if(create_DS1_long_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0) return FAIL; - + /* make a DS dataset for the second dimension */ if(create_DS2_long_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0) return FAIL; - + /* make a DS dataset for the third dimension */ if(create_DS3_long_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, NULL, NULL, NULL) < 0) return FAIL; - + /* make a DS dataset for the fourth dimension */ if(create_DS4_long_datasets(fid, dsidx, rankds, s4_dim, s4_wbuf, NULL, NULL, NULL, NULL) < 0) return FAIL; @@ -436,13 +436,13 @@ herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int else { if(create_DS1_long_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0) return FAIL; - + if(create_DS2_long_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0) return FAIL; - + if(create_DS3_long_datasets(fid, dsidx, rankds, s3_dim, s3_wbuf, s31_wbuf, s32_wbuf, s33_wbuf) < 0) return FAIL; - + if(create_DS4_long_datasets(fid, dsidx, rankds, s4_dim, s4_wbuf, s41_wbuf, s42_wbuf, s43_wbuf, s44_wbuf) < 0) return FAIL; } @@ -452,7 +452,7 @@ herr_t create_long_dataset(hid_t fid, const char *dsname, const char *dsidx, int return SUCCEED; } -herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims) +herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims) { int rank = RANK; int rankds = 1; @@ -476,7 +476,7 @@ herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims) /* make a DS dataset for the first dimension */ if(create_DS1_float_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, NULL) < 0) return FAIL; - + /* make a DS dataset for the second dimension */ if(create_DS2_float_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, NULL, NULL) < 0) return FAIL; @@ -484,7 +484,7 @@ herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims) else { if(create_DS1_float_datasets(fid, dsidx, rankds, s1_dim, s1_wbuf, s11_wbuf) < 0) return FAIL; - + if(create_DS2_float_datasets(fid, dsidx, rankds, s2_dim, s2_wbuf, s21_wbuf, s22_wbuf) < 0) return FAIL; } @@ -498,7 +498,7 @@ herr_t create_float_dataset(hid_t fid, const char *dsidx, int fulldims) * create 2 dimension scales datasets for first dimension *------------------------------------------------------------------------- */ -herr_t create_DS1_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf) +herr_t create_DS1_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf) { char name[32]; @@ -523,10 +523,10 @@ herr_t create_DS1_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_ * create 3 dimension scales datasets for second dimension *------------------------------------------------------------------------- */ -herr_t create_DS2_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf) +herr_t create_DS2_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf) { char name[32]; - + strcpy(name, DS_2_NAME); strcat(name, dsidx); /* make a DS dataset for the second dimension */ @@ -556,7 +556,7 @@ herr_t create_DS2_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_ * create 1 dimension scales datasets for third dimension of dataset *------------------------------------------------------------------------- */ -herr_t create_DS3_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf, char *s3_wbuf) +herr_t create_DS3_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, char *s_wbuf, char *s1_wbuf, char *s2_wbuf, char *s3_wbuf) { char name[32]; @@ -597,7 +597,7 @@ herr_t create_DS3_char_datasets(hid_t fid, const char *dsidx, int rankds, hsize_ * create 2 dimension scales datasets for first dimension *------------------------------------------------------------------------- */ -herr_t create_DS1_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf) +herr_t create_DS1_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf) { char name[32]; @@ -622,10 +622,10 @@ herr_t create_DS1_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize * create 3 dimension scales datasets for second dimension *------------------------------------------------------------------------- */ -herr_t create_DS2_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf, short *s2_wbuf) +herr_t create_DS2_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf, short *s2_wbuf) { char name[32]; - + strcpy(name, DS_2_NAME); strcat(name, dsidx); @@ -656,7 +656,7 @@ herr_t create_DS2_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize * create 1 dimension scales datasets for third dimension of dataset *------------------------------------------------------------------------- */ -herr_t create_DS3_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf, short *s2_wbuf, short *s3_wbuf) +herr_t create_DS3_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, short *s_wbuf, short *s1_wbuf, short *s2_wbuf, short *s3_wbuf) { char name[32]; @@ -698,7 +698,7 @@ herr_t create_DS3_short_datasets(hid_t fid, const char *dsidx, int rankds, hsize * create 2 dimension scales datasets for first dimension *------------------------------------------------------------------------- */ -herr_t create_DS1_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf) +herr_t create_DS1_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf) { char name[32]; @@ -724,10 +724,10 @@ herr_t create_DS1_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t * create 3 dimension scales datasets for second dimension *------------------------------------------------------------------------- */ -herr_t create_DS2_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf, int *s2_wbuf) +herr_t create_DS2_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf, int *s2_wbuf) { char name[32]; - + strcpy(name, DS_2_NAME); strcat(name, dsidx); @@ -758,7 +758,7 @@ herr_t create_DS2_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t * create 1 dimension scales datasets for third dimension of dataset *------------------------------------------------------------------------- */ -herr_t create_DS3_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf, int *s2_wbuf, int *s3_wbuf) +herr_t create_DS3_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, int *s_wbuf, int *s1_wbuf, int *s2_wbuf, int *s3_wbuf) { char name[32]; @@ -800,7 +800,7 @@ herr_t create_DS3_int_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t * create 2 dimension scales datasets for first dimension *------------------------------------------------------------------------- */ -herr_t create_DS1_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf) +herr_t create_DS1_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf) { char name[32]; @@ -826,10 +826,10 @@ herr_t create_DS1_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_ * create 3 dimension scales datasets for second dimension *------------------------------------------------------------------------- */ -herr_t create_DS2_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf) +herr_t create_DS2_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf) { char name[32]; - + strcpy(name, DS_2_NAME); strcat(name, dsidx); @@ -860,7 +860,7 @@ herr_t create_DS2_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_ * create 3 dimension scales datasets for third dimension of dataset *------------------------------------------------------------------------- */ -herr_t create_DS3_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf, long *s3_wbuf) +herr_t create_DS3_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf, long *s3_wbuf) { char name[32]; @@ -902,7 +902,7 @@ herr_t create_DS3_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_ * create 4 dimension scales datasets for third dimension of dataset *------------------------------------------------------------------------- */ -herr_t create_DS4_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf, long *s3_wbuf, long *s4_wbuf) +herr_t create_DS4_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, long *s_wbuf, long *s1_wbuf, long *s2_wbuf, long *s3_wbuf, long *s4_wbuf) { char name[32]; @@ -952,7 +952,7 @@ herr_t create_DS4_long_datasets(hid_t fid, const char *dsidx, int rankds, hsize_ * create 2 dimension scales datasets for first dimension *------------------------------------------------------------------------- */ -herr_t create_DS1_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf) +herr_t create_DS1_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf) { char name[32]; @@ -978,10 +978,10 @@ herr_t create_DS1_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize * create 3 dimension scales datasets for second dimension *------------------------------------------------------------------------- */ -herr_t create_DS2_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf, float *s2_wbuf) +herr_t create_DS2_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf, float *s2_wbuf) { char name[32]; - + strcpy(name, DS_2_NAME); strcat(name, dsidx); @@ -1012,7 +1012,7 @@ herr_t create_DS2_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize * create 3 dimension scales datasets for third dimension of dataset *------------------------------------------------------------------------- */ -herr_t create_DS3_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf, float *s2_wbuf, float *s3_wbuf) +herr_t create_DS3_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize_t *s_dim, float *s_wbuf, float *s1_wbuf, float *s2_wbuf, float *s3_wbuf) { char name[32]; @@ -1050,11 +1050,11 @@ herr_t create_DS3_float_datasets(hid_t fid, const char *dsidx, int rankds, hsize return SUCCEED; } -herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx) +herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx) { herr_t ret_value = FAIL; hid_t dsid = -1; - + if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) { if(H5DSis_attached(did, dsid, idx) == 0) { if(H5DSattach_scale(did, dsid, idx) >= 0) { @@ -1074,7 +1074,7 @@ herr_t test_attach_scale(hid_t fid, hid_t did, const char *name, unsigned int id return ret_value; } -herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx) +herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int idx) { herr_t ret_value = FAIL; hid_t dsid = -1; @@ -1094,11 +1094,11 @@ herr_t test_detach_scale(hid_t fid, hid_t did, const char *name, unsigned int id return ret_value; } -herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx) +herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx) { herr_t ret_value = FAIL; hid_t dsid = -1; - + if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) { if(H5DSis_attached(did, dsid, idx) == 1) { if(H5DSset_scale(dsid, scalename) >= 0) { @@ -1114,7 +1114,7 @@ herr_t test_set_scalename(hid_t fid, hid_t did, const char *name, const char *sc return ret_value; } -herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx) +herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *scalename, unsigned int idx) { herr_t ret_value = FAIL; hid_t dsid = -1; @@ -1151,12 +1151,12 @@ static int test_char_attachscales(const char *fileext) char scalename[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "ac"); - + TESTING2("test_char_attachscales"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + /* make a dataset */ if(create_char_dataset(fid, "ac", 0) < 0) goto out; @@ -1166,17 +1166,17 @@ static int test_char_attachscales(const char *fileext) strcat(scalename, "ac"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "ac"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "ac"); if(test_attach_scale(fid, did, scalename, DIM2) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1184,18 +1184,18 @@ static int test_char_attachscales(const char *fileext) goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1207,12 +1207,12 @@ static int test_short_attachscales(const char *fileext) char scalename[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "as"); - + TESTING2("test_short_attachscales"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + /* make a dataset */ if(create_short_dataset(fid, "as", 1) < 0) goto out; @@ -1222,47 +1222,47 @@ static int test_short_attachscales(const char *fileext) strcat(scalename, "as"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_11_NAME); strcat(scalename, "as"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "as"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_21_NAME); strcat(scalename, "as"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_22_NAME); strcat(scalename, "as"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "as"); if(test_attach_scale(fid, did, scalename, DIM2) < 0) goto out; - + strcpy(scalename, DS_31_NAME); strcat(scalename, "as"); if(test_attach_scale(fid, did, scalename, DIM2) < 0) goto out; - + strcpy(scalename, DS_32_NAME); strcat(scalename, "as"); if(test_attach_scale(fid, did, scalename, DIM2) < 0) goto out; - + strcpy(scalename, DS_33_NAME); strcat(scalename, "as"); if(test_attach_scale(fid, did, scalename, DIM2) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1270,18 +1270,18 @@ static int test_short_attachscales(const char *fileext) goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1293,12 +1293,12 @@ static int test_int_attachscales(const char *fileext) char scalename[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "a"); - + TESTING2("test_int_attachscales"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + /* make a dataset */ if(create_int_dataset(fid, "a", 1) < 0) goto out; @@ -1308,27 +1308,27 @@ static int test_int_attachscales(const char *fileext) strcat(scalename, "a"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_11_NAME); strcat(scalename, "a"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "a"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_21_NAME); strcat(scalename, "a"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_22_NAME); strcat(scalename, "a"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1336,18 +1336,18 @@ static int test_int_attachscales(const char *fileext) goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1359,12 +1359,12 @@ static int test_long_attachscales(const char *fileext) char scalename[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "al"); - + TESTING2("test_long_attachscales"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + /* make a dataset */ if(create_long_dataset(fid, dsname, "al", 0) < 0) goto out; @@ -1374,22 +1374,22 @@ static int test_long_attachscales(const char *fileext) strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM2) < 0) goto out; - + strcpy(scalename, DS_4_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM3) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1397,18 +1397,18 @@ static int test_long_attachscales(const char *fileext) goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1420,12 +1420,12 @@ static int test_duplicatelong_attachscales(const char *fileext) char scalename[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "al2"); - + TESTING2("test_duplicatelong_attachscales"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + /* make a dataset 2 */ if(create_long_dataset(fid, dsname, "al2", 0) < 0) goto out; @@ -1435,22 +1435,22 @@ static int test_duplicatelong_attachscales(const char *fileext) strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM2) < 0) goto out; - + strcpy(scalename, DS_4_NAME); strcat(scalename, "al"); if(test_attach_scale(fid, did, scalename, DIM3) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1458,18 +1458,18 @@ static int test_duplicatelong_attachscales(const char *fileext) goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1481,12 +1481,12 @@ static int test_float_attachscales(const char *fileext) char scalename[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "af"); - + TESTING2("test_float_attachscales"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + /* make a dataset */ if(create_float_dataset(fid, "af", 1) < 0) goto out; @@ -1496,27 +1496,27 @@ static int test_float_attachscales(const char *fileext) strcat(scalename, "af"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_11_NAME); strcat(scalename, "af"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "af"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_21_NAME); strcat(scalename, "af"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + strcpy(scalename, DS_22_NAME); strcat(scalename, "af"); if(test_attach_scale(fid, did, scalename, DIM1) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1524,18 +1524,18 @@ static int test_float_attachscales(const char *fileext) goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1548,25 +1548,25 @@ static int test_numberofscales(const char *fileext) char scalename[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "a"); - + TESTING2("test_numberofscales"); - + if((fid = open_test_file(fileext)) < 0) goto out; if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) { if((nscales = H5DSget_num_scales(did, 0)) < 0) goto out; - + if(nscales != 2) goto out; - + if((nscales = H5DSget_num_scales(did, 1)) < 0) goto out; - + if(nscales != 3) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1586,19 +1586,19 @@ static int test_numberofscales(const char *fileext) strcat(scalename, "b"); if(test_attach_scale(fid, did, scalename, DIM0) < 0) goto out; - + if((nscales = H5DSget_num_scales(did, 0)) < 0) goto out; - + if(nscales != 1) goto out; - + if((nscales = H5DSget_num_scales(did, 1)) < 0) goto out; - + if(nscales != 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1606,18 +1606,18 @@ static int test_numberofscales(const char *fileext) goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1629,10 +1629,10 @@ static int test_char_scalenames(const char *fileext) { char name[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "ac"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + TESTING2("set char scale/cmp scale name"); if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) { strcpy(scalename, DS_1_NAME); @@ -1644,7 +1644,7 @@ static int test_char_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "ac"); strcpy(name, SCALE_2_NAME); @@ -1654,7 +1654,7 @@ static int test_char_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "ac"); strcpy(name, SCALE_3_NAME); @@ -1664,7 +1664,7 @@ static int test_char_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1672,18 +1672,18 @@ static int test_char_scalenames(const char *fileext) { goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1695,10 +1695,10 @@ static int test_short_scalenames(const char *fileext) { char name[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "as"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + TESTING2("set short scale/cmp scale name"); if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) { strcpy(scalename, DS_1_NAME); @@ -1710,7 +1710,7 @@ static int test_short_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_11_NAME); strcat(scalename, "as"); strcpy(name, SCALE_11_NAME); @@ -1720,7 +1720,7 @@ static int test_short_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "as"); strcpy(name, SCALE_2_NAME); @@ -1730,7 +1730,7 @@ static int test_short_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_21_NAME); strcat(scalename, "as"); strcpy(name, SCALE_21_NAME); @@ -1740,7 +1740,7 @@ static int test_short_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_22_NAME); strcat(scalename, "as"); strcpy(name, SCALE_22_NAME); @@ -1750,7 +1750,7 @@ static int test_short_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "as"); strcpy(name, SCALE_3_NAME); @@ -1760,7 +1760,7 @@ static int test_short_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0) goto out; - + strcpy(scalename, DS_31_NAME); strcat(scalename, "as"); strcpy(name, SCALE_31_NAME); @@ -1770,7 +1770,7 @@ static int test_short_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0) goto out; - + strcpy(scalename, DS_32_NAME); strcat(scalename, "as"); strcpy(name, SCALE_32_NAME); @@ -1780,7 +1780,7 @@ static int test_short_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0) goto out; - + strcpy(scalename, DS_33_NAME); strcat(scalename, "as"); strcpy(name, SCALE_33_NAME); @@ -1790,7 +1790,7 @@ static int test_short_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1798,18 +1798,18 @@ static int test_short_scalenames(const char *fileext) { goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1821,10 +1821,10 @@ static int test_int_scalenames(const char *fileext) { char name[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "a"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + TESTING2("set int scale/cmp scale name"); if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) { strcpy(scalename, DS_1_NAME); @@ -1836,7 +1836,7 @@ static int test_int_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_11_NAME); strcat(scalename, "a"); strcpy(name, SCALE_11_NAME); @@ -1846,7 +1846,7 @@ static int test_int_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "a"); strcpy(name, SCALE_2_NAME); @@ -1856,7 +1856,7 @@ static int test_int_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_21_NAME); strcat(scalename, "a"); strcpy(name, SCALE_21_NAME); @@ -1866,7 +1866,7 @@ static int test_int_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_22_NAME); strcat(scalename, "a"); strcpy(name, SCALE_22_NAME); @@ -1884,18 +1884,18 @@ static int test_int_scalenames(const char *fileext) { goto out; PASSED(); - + H5Fclose(fid); return 0; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1907,10 +1907,10 @@ static int test_long_scalenames(const char *fileext) { char name[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "al"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + TESTING2("set long scale/cmp scale name"); if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) { strcpy(scalename, DS_1_NAME); @@ -1922,7 +1922,7 @@ static int test_long_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "al"); strcpy(name, SCALE_2_NAME); @@ -1932,7 +1932,7 @@ static int test_long_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "al"); strcpy(name, SCALE_3_NAME); @@ -1942,7 +1942,7 @@ static int test_long_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0) goto out; - + strcpy(scalename, DS_4_NAME); strcat(scalename, "al"); strcpy(name, SCALE_4_NAME); @@ -1952,7 +1952,7 @@ static int test_long_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM3) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -1960,18 +1960,18 @@ static int test_long_scalenames(const char *fileext) { goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -1983,10 +1983,10 @@ static int test_samelong_scalenames(const char *fileext) { char name[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "al2"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + TESTING2("set same long scale/cmp scale name"); if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) { strcpy(scalename, DS_1_NAME); @@ -1998,7 +1998,7 @@ static int test_samelong_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "al"); strcpy(name, DS_2_NAME); @@ -2008,7 +2008,7 @@ static int test_samelong_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_3_NAME); strcat(scalename, "al"); strcpy(name, DS_3_NAME); @@ -2018,7 +2018,7 @@ static int test_samelong_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM2) < 0) goto out; - + strcpy(scalename, DS_4_NAME); strcat(scalename, "al"); strcpy(name, DS_4_NAME); @@ -2028,7 +2028,7 @@ static int test_samelong_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM3) < 0) goto out; - + if(H5Dclose(did) < 0) goto out; } @@ -2036,18 +2036,18 @@ static int test_samelong_scalenames(const char *fileext) { goto out; PASSED(); - + H5Fclose(fid); return SUCCEED; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -2059,10 +2059,10 @@ static int test_float_scalenames(const char *fileext) { char name[32]; strcpy(dsname, DATASET_NAME); strcat(dsname, "af"); - + if((fid = open_test_file(fileext)) < 0) goto out; - + TESTING2("set float scale/cmp scale name"); if((did = H5Dopen2(fid, dsname, H5P_DEFAULT)) >= 0) { strcpy(scalename, DS_1_NAME); @@ -2074,7 +2074,7 @@ static int test_float_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_11_NAME); strcat(scalename, "af"); strcpy(name, SCALE_11_NAME); @@ -2084,7 +2084,7 @@ static int test_float_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM0) < 0) goto out; - + strcpy(scalename, DS_2_NAME); strcat(scalename, "af"); strcpy(name, SCALE_2_NAME); @@ -2094,7 +2094,7 @@ static int test_float_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_21_NAME); strcat(scalename, "af"); strcpy(name, SCALE_21_NAME); @@ -2104,7 +2104,7 @@ static int test_float_scalenames(const char *fileext) { if(test_cmp_scalename(fid, did, scalename, name, DIM1) < 0) goto out; - + strcpy(scalename, DS_22_NAME); strcat(scalename, "af"); strcpy(name, SCALE_22_NAME); @@ -2122,18 +2122,18 @@ static int test_float_scalenames(const char *fileext) { goto out; PASSED(); - + H5Fclose(fid); return 0; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -2152,7 +2152,7 @@ static int test_foreign_scaleattached(const char *fileforeign) strcat(filename,"/"); } strcat(filename, fileforeign); - + TESTING2("test_foreign_scaleattached"); if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) @@ -2162,7 +2162,7 @@ static int test_foreign_scaleattached(const char *fileforeign) if((dsid = H5Dopen2(fid, "/ds_4_al", H5P_DEFAULT)) >= 0) { if(H5DSis_attached(did, dsid, 3) == 1) { ret_value = SUCCEED; - } + } if(H5Dclose(dsid) < 0) goto out; } @@ -2171,23 +2171,23 @@ static int test_foreign_scaleattached(const char *fileforeign) } else goto out; - + if(ret_value == FAIL) goto out; - + PASSED(); - + H5Fclose(fid); return 0; - + out: H5E_BEGIN_TRY { H5Dclose(did); H5Fclose(fid); } H5E_END_TRY; - + H5_FAILED(); - + return FAIL; } @@ -2226,7 +2226,7 @@ static int test_simple(void) char *name_out=NULL; char snames[3]; int i, j; - + printf("Testing API functions\n"); /*------------------------------------------------------------------------- @@ -2391,7 +2391,7 @@ static int test_simple(void) if(H5Dclose(did) < 0) goto out; - + /*------------------------------------------------------------------------- * H5DSdetach_scale @@ -2984,7 +2984,7 @@ static int test_simple(void) PASSED(); - + /*------------------------------------------------------------------------- * H5DSset_label, H5DSget_label *------------------------------------------------------------------------- @@ -3406,7 +3406,7 @@ static int test_simple(void) /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Dclose(dsid); @@ -3544,7 +3544,7 @@ static herr_t read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Sclose(sid); H5Tclose(tid); @@ -3634,7 +3634,7 @@ static herr_t match_dim_scale(hid_t did, unsigned dim, hid_t dsid, void *visitor return ret; out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Sclose(sid); } H5E_END_TRY; @@ -3645,7 +3645,7 @@ out: /*------------------------------------------------------------------------- * Function: op_continue * - * Purpose: example operator function used by H5DSiterate_scales that continues + * Purpose: example operator function used by H5DSiterate_scales that continues * iteration and increments visitor_data (Note: int*) * * Return: @@ -3678,7 +3678,7 @@ static herr_t op_continue(hid_t dset, unsigned dim, hid_t scale_id, void *visito /*------------------------------------------------------------------------- * Function: op_stop * - * Purpose: example operator function used by H5DSiterate_scales that stops + * Purpose: example operator function used by H5DSiterate_scales that stops * iteration and increments visitor_data (Note: int*) * * Return: @@ -3698,7 +3698,7 @@ static herr_t op_stop(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_da dset = dset; dim = dim; scale_id = scale_id; - + if ( visitor_data != NULL ) { (*(int *)visitor_data)++; @@ -4073,7 +4073,7 @@ static int test_errors(void) /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Sclose(sid); H5Sclose(sidds); @@ -4265,7 +4265,7 @@ static int test_iterators(void) /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Gclose(gid); H5Dclose(did); @@ -4474,7 +4474,7 @@ static int test_rank(void) /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Dclose(dsid); @@ -4654,7 +4654,7 @@ static int test_types(void) /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Dclose(dsid); @@ -4734,7 +4734,7 @@ static int test_data(void) goto out; if(H5Pset_fill_value(dcpl, H5T_NATIVE_FLOAT, &fill) < 0) goto out; - + /* read ASCII bathymetry data and dimensions to create dataset */ if(read_data("dsdata.txt",2,dims,&vals) < 0) goto out; @@ -4813,7 +4813,7 @@ static int test_data(void) /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Dclose(dsid); @@ -4845,9 +4845,9 @@ out: *------------------------------------------------------------------------- */ -static int read_data( const char* fname, - int ndims, - hsize_t *dims, +static int read_data( const char* fname, + int ndims, + hsize_t *dims, float **buf ) { int i, n; @@ -4922,7 +4922,7 @@ static int test_errors2(void) int scale_idx; /* scale index */ int nscales; /* number of scales in DIM */ int count; /* visitor data */ - + printf("Testing parameter errors\n"); /*------------------------------------------------------------------------- @@ -4987,7 +4987,7 @@ static int test_errors2(void) if (H5Dclose(dsid) < 0) goto out; if (H5Dclose(did) < 0) - goto out; + goto out; PASSED(); @@ -5004,15 +5004,15 @@ static int test_errors2(void) if (H5DSset_label(did,0,"label") < 0) goto out; if (H5DSget_label(did,2,lbuf,sizeof(lbuf)) == SUCCEED) - goto out; + goto out; if ((label_len=H5DSget_label(did,0,NULL,0)) < 0) - goto out; + goto out; if ( label_len != strlen("label") ) goto out; if (H5DSget_label(did,0,lbuf,sizeof(lbuf)) < 0) goto out; if (H5Dclose(did) < 0) - goto out; + goto out; PASSED(); @@ -5049,10 +5049,10 @@ static int test_errors2(void) if (H5DSiterate_scales(did,2,NULL,op_continue,NULL)== SUCCEED) goto out; /* invalid DS_IDX */ - scale_idx = 2; + scale_idx = 2; if (H5DSiterate_scales(did,0,&scale_idx,op_continue,NULL)== SUCCEED) goto out; - + /* continue iteration */ scale_idx = 0; count = 0; @@ -5075,9 +5075,9 @@ static int test_errors2(void) goto out; } - + if (H5Dclose(did) < 0) - goto out; + goto out; /*------------------------------------------------------------------------- * close @@ -5092,7 +5092,7 @@ static int test_errors2(void) /* error zone */ out: - H5E_BEGIN_TRY + H5E_BEGIN_TRY { H5Dclose(did); H5Dclose(dsid); diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c index 9234344..2012e8f 100644 --- a/hl/test/test_lite.c +++ b/hl/test/test_lite.c @@ -1606,7 +1606,7 @@ out: free(line); if(fp) fclose(fp); - + H5_FAILED(); return -1; } diff --git a/hl/test/test_table.c b/hl/test/test_table.c index 433d49f..3438f15 100644 --- a/hl/test/test_table.c +++ b/hl/test/test_table.c @@ -135,7 +135,7 @@ static hid_t h5file_open(const char *fname, unsigned flags) strcat(data_file,fname); /* open */ - if ((fid = H5Fopen(data_file,flags,H5P_DEFAULT))<0) + if ((fid = H5Fopen(data_file,flags,H5P_DEFAULT))<0) { fprintf(stderr,"Error: Cannot open file <%s>\n",data_file ); exit(1); @@ -154,7 +154,7 @@ static int cmp_par(hsize_t i, hsize_t j, particle_t *rbuf, particle_t *wbuf ) rbuf[i].lati != wbuf[j].lati || rbuf[i].longi != wbuf[j].longi || rbuf[i].pressure != wbuf[j].pressure || - rbuf[i].temperature != wbuf[j].temperature ) + rbuf[i].temperature != wbuf[j].temperature ) { fprintf(stderr,"read and write buffers have differences\n"); fprintf(stderr,"%s %ld %f %f %d\n", @@ -459,7 +459,7 @@ static int test_table(hid_t fid, int do_write) * data= 0 1 2 3 4 5 6 7 *------------------------------------------------------------------------- */ - wstart=0; + wstart=0; wrecords=8; if (H5TBwrite_records(fid,"table2",wstart,wrecords,type_size_mem,field_offset, field_size,wbuf)<0) |