mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-12 17:31:09 +08:00
HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
misc. clean-up
This commit is contained in:
parent
e6aa306354
commit
fe325fb554
@ -43,7 +43,7 @@ MODULE H5F
|
||||
IMPLICIT NONE
|
||||
|
||||
! Number of objects opened in H5open_f
|
||||
INTEGER(SIZE_T) :: H5OPEN_NUM_OPEN_OBJ
|
||||
INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ
|
||||
|
||||
CONTAINS
|
||||
!****s* H5F/h5fcreate_f
|
||||
@ -624,7 +624,7 @@ CONTAINS
|
||||
|
||||
! Don't include objects created by H5open in the H5F_OBJ_ALL_F count
|
||||
IF(file_id.EQ.INT(H5F_OBJ_ALL_F,HID_T))THEN
|
||||
obj_count = obj_count - H5OPEN_NUM_OPEN_OBJ
|
||||
obj_count = obj_count - H5OPEN_NUM_OBJ
|
||||
ENDIF
|
||||
|
||||
END SUBROUTINE h5fget_obj_count_f
|
||||
|
@ -169,10 +169,10 @@ CONTAINS
|
||||
! October 13, 2011
|
||||
! Fortran90 Interface:
|
||||
SUBROUTINE h5open_f(error)
|
||||
USE H5F, ONLY : h5fget_obj_count_f, H5OPEN_NUM_OPEN_OBJ
|
||||
USE H5F, ONLY : h5fget_obj_count_f, H5OPEN_NUM_OBJ
|
||||
IMPLICIT NONE
|
||||
INTEGER, INTENT(OUT) :: error
|
||||
INTEGER(SIZE_T) :: H5OPEN_NUM_OPEN_OBJ_LOC = 0
|
||||
INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ_LOC = 0
|
||||
!*****
|
||||
INTERFACE
|
||||
|
||||
@ -614,9 +614,9 @@ CONTAINS
|
||||
H5_SZIP_EC_OM_F = H5LIB_flags(1)
|
||||
H5_SZIP_NN_OM_F = H5LIB_flags(2)
|
||||
|
||||
CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, H5OPEN_NUM_OPEN_OBJ_LOC, error)
|
||||
CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, H5OPEN_NUM_OBJ_LOC, error)
|
||||
|
||||
H5OPEN_NUM_OPEN_OBJ = H5OPEN_NUM_OPEN_OBJ_LOC
|
||||
H5OPEN_NUM_OBJ = H5OPEN_NUM_OBJ_LOC
|
||||
|
||||
END SUBROUTINE h5open_f
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user