diff options
| author | Matthew Larson <matthewjlar@gmail.com> | 2024-01-05 17:24:33 (GMT) |
|---|---|---|
| committer | Matthew Larson <matthewjlar@gmail.com> | 2024-03-08 22:39:25 (GMT) |
| commit | 1659792d85acb1805aad3c9f3d2b8b02ab6d1249 (patch) | |
| tree | c804d41afa77f665562c643365f26d9f8ff3739c /fortran | |
| parent | 84ead492c06022b813c4bfb5378a0e933352c8d2 (diff) | |
| download | hdf5-1659792d85acb1805aad3c9f3d2b8b02ab6d1249.zip hdf5-1659792d85acb1805aad3c9f3d2b8b02ab6d1249.tar.gz hdf5-1659792d85acb1805aad3c9f3d2b8b02ab6d1249.tar.bz2 | |
H5Fget_obj_ids/count no longer returns transient types
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/test/tH5F.F90 | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/fortran/test/tH5F.F90 b/fortran/test/tH5F.F90 index 569d459..2e38131 100644 --- a/fortran/test/tH5F.F90 +++ b/fortran/test/tH5F.F90 @@ -164,9 +164,9 @@ CONTAINS INTEGER(HID_T) :: file1_id, file2_id ! - ! Group identifier + ! Group identifiers ! - INTEGER(HID_T) :: gid + INTEGER(HID_T) :: gid, g1, g2, g3, g4 ! ! dataset identifier @@ -206,7 +206,6 @@ CONTAINS !number of objects INTEGER(SIZE_T) :: obj_count - INTEGER(HID_T) :: t1, t2, t3, t4 ! File numbers INTEGER :: file_num1 @@ -242,28 +241,28 @@ CONTAINS CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error) if(error .ne. 0) stop - ! Test object counts - CALL h5tcopy_f(H5T_NATIVE_CHARACTER, t1, error) - CALL check(" h5tcopy_f",error,total_error) - CALL h5tcopy_f(H5T_NATIVE_CHARACTER, t2, error) - CALL check(" h5tcopy_f",error,total_error) - CALL h5tcopy_f(H5T_NATIVE_CHARACTER, t3, error) - CALL check(" h5tcopy_f",error,total_error) - CALL h5tcopy_f(H5T_NATIVE_CHARACTER, t4, error) - CALL check(" h5tcopy_f",error,total_error) + ! + !Create first file "mount1.h5" using default properties. + ! + CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error) + CALL check("h5fcreate_f",error,total_error) + ! Test object counts CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count, error) CALL check(" h5fget_obj_count_f",error,total_error) - IF(obj_count.NE.4)THEN + IF(obj_count.NE.1)THEN total_error = total_error + 1 ENDIF - ! - !Create first file "mount1.h5" using default properties. - ! - CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error) - CALL check("h5fcreate_f",error,total_error) + CALL h5gcreate_f(file1_id, "/G1", g1, error) + CALL check(" h5gcopy_f",error, total_error) + CALL h5gcreate_f(file1_id, "/G2", g2, error) + CALL check(" h5gcopy_f",error, total_error) + CALL h5gcreate_f(file1_id, "/G3", g3, error) + CALL check(" h5gcopy_f",error, total_error) + CALL h5gcreate_f(file1_id, "/G4", g4, error) + CALL check(" h5gcopy_f",error, total_error) CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count, error) CALL check(" h5fget_obj_count_f",error,total_error) @@ -272,14 +271,14 @@ CONTAINS total_error = total_error + 1 ENDIF - CALL h5tclose_f(t1, error) - CALL check("h5tclose_f",error,total_error) - CALL h5tclose_f(t2, error) - CALL check("h5tclose_f",error,total_error) - CALL h5tclose_f(t3, error) - CALL check("h5tclose_f",error,total_error) - CALL h5tclose_f(t4, error) - CALL check("h5tclose_f",error,total_error) + CALL h5gclose_f(g1, error) + CALL check("h5gclose_f",error,total_error) + CALL h5gclose_f(g2, error) + CALL check("h5gclose_f",error,total_error) + CALL h5gclose_f(g3, error) + CALL check("h5gclose_f",error,total_error) + CALL h5gclose_f(g4, error) + CALL check("h5gclose_f",error,total_error) CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, obj_count, error) CALL check(" h5fget_obj_count_f",error,total_error) |