diff options
author | hdftest <hdftest@hdfgroup.org> | 2018-06-16 22:47:39 (GMT) |
---|---|---|
committer | hdftest <hdftest@hdfgroup.org> | 2018-06-16 22:47:39 (GMT) |
commit | 67d6f8d405b16c99590f112f429a352157be3554 (patch) | |
tree | 63b704912ac2dd93fcbd8214050ec8b59c63707f /fortran/src/H5Fff.F90 | |
parent | afe28b7607204a2e9e753bb663d09454057d8196 (diff) | |
parent | 87829e06189cd9b29583b5ca8065b52b1f4cd523 (diff) | |
download | hdf5-67d6f8d405b16c99590f112f429a352157be3554.zip hdf5-67d6f8d405b16c99590f112f429a352157be3554.tar.gz hdf5-67d6f8d405b16c99590f112f429a352157be3554.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '87829e06189cd9b29583b5ca8065b52b1f4cd523': (30 commits)
HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
Cleaned up H5Fmount/unmount code.
Normalization with vol_integration branch.
Add fortran MPI to test and example
Add mpi include folders for fortran C objects
Normalization with the vol_integration branch.
Fixed MANIFEST
Fix usage of compression lib in shared tests
Fix jni function call version
Fix the error found after earlier checkin.
H5O_info fixes for java and examples
Added a RELASE.txt entry for HDFFV-10505.
Changed 'deprecated' to indicate 'no longer supported' in the --enable-debug/production configure flags.
(1) Made the change according to the pull request feedback. (2) Removed the performance test form test/th5o.c: will decide on what needs to be done to show speedup via HDFFV-10463.
Normalize with vol_integration.
Removed unused H5MF functions and updated FUNC_ENTER macros and naming in H5MFsection.c.
Restored some unused #defines to the deprecated section of H5Dpublic.h.
Changes made based on feedback from pull request #1039.
...
Diffstat (limited to 'fortran/src/H5Fff.F90')
-rw-r--r-- | fortran/src/H5Fff.F90 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90 index a3bef37..358e421 100644 --- a/fortran/src/H5Fff.F90 +++ b/fortran/src/H5Fff.F90 @@ -42,6 +42,9 @@ MODULE H5F USE H5GLOBAL IMPLICIT NONE + ! Number of objects opened in H5open_f + INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ + CONTAINS !****s* H5F/h5fcreate_f ! @@ -616,9 +619,14 @@ CONTAINS INTEGER(SIZE_T), INTENT(OUT) :: obj_count END FUNCTION h5fget_obj_count_c END INTERFACE - + hdferr = h5fget_obj_count_c(file_id, obj_type, obj_count) + ! 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_OBJ + ENDIF + END SUBROUTINE h5fget_obj_count_f !****s* H5F/h5fget_obj_ids_f |