diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-04-17 19:09:35 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-04-17 19:09:35 (GMT) |
| commit | 3577791dcc55259829af881545db3482d6dc9405 (patch) | |
| tree | 859d733570b3beea0a019a6ca6d6031e29374a3f /fortran/src/H5f90global.f90 | |
| parent | ccb31223c4156ef0dbe025435ee859d9d76e64d8 (diff) | |
| download | hdf5-3577791dcc55259829af881545db3482d6dc9405.zip hdf5-3577791dcc55259829af881545db3482d6dc9405.tar.gz hdf5-3577791dcc55259829af881545db3482d6dc9405.tar.bz2 | |
[svn-r16782] Description:
Merged the changes from the trunk/fortran into the branch:
used:
svn merge -r 16362:16781 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
Platforms tested: smirom (pgf90, ifort)
linew
Diffstat (limited to 'fortran/src/H5f90global.f90')
| -rw-r--r-- | fortran/src/H5f90global.f90 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 2d50f4f..fd234c7 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -317,7 +317,7 @@ MODULE H5GLOBAL ! H5D flags declaration ! - INTEGER, PARAMETER :: H5D_FLAGS_LEN = 19 + INTEGER, PARAMETER :: H5D_FLAGS_LEN = 22 INTEGER H5D_flags(H5D_FLAGS_LEN) !DEC$if defined(BUILD_HDF5_DLL) !DEC$ATTRIBUTES DLLEXPORT :: /H5D_FLAGS/ @@ -348,6 +348,10 @@ MODULE H5GLOBAL INTEGER :: H5D_FILL_VALUE_DEFAULT_F INTEGER :: H5D_FILL_VALUE_USER_DEFINED_F + INTEGER :: H5D_CHUNK_CACHE_NSLOTS_DEFAULT_F + INTEGER :: H5D_CHUNK_CACHE_NBYTES_DEFAULT_F + INTEGER :: H5D_CHUNK_CACHE_W0_DEFAULT_F + EQUIVALENCE(H5D_flags(1), H5D_COMPACT_F) EQUIVALENCE(H5D_flags(2), H5D_CONTIGUOUS_F) EQUIVALENCE(H5D_flags(3), H5D_CHUNKED_F) @@ -370,7 +374,11 @@ MODULE H5GLOBAL EQUIVALENCE(H5D_flags(16), H5D_FILL_VALUE_ERROR_F) EQUIVALENCE(H5D_flags(17), H5D_FILL_VALUE_UNDEFINED_F) EQUIVALENCE(H5D_flags(18), H5D_FILL_VALUE_DEFAULT_F) - EQUIVALENCE(H5D_flags(19), H5D_FILL_VALUE_USER_DEFINED_F) + EQUIVALENCE(H5D_flags(19), H5D_FILL_VALUE_USER_DEFINED_F) + + EQUIVALENCE(H5D_flags(20), H5D_CHUNK_CACHE_NSLOTS_DEFAULT_F) + EQUIVALENCE(H5D_flags(21), H5D_CHUNK_CACHE_NBYTES_DEFAULT_F) + EQUIVALENCE(H5D_flags(22), H5D_CHUNK_CACHE_W0_DEFAULT_F) ! ! H5FD flags declaration |