diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-04-20 16:47:47 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-04-20 16:47:47 (GMT) |
| commit | f7a982a64eabcdbe8844b3b4c1bff6c0c368ec16 (patch) | |
| tree | 17110c7012a2e859c694dde5775e0a9e9dda1c31 /fortran/src | |
| parent | f95bf64c531c5e4c859d0562d8111539b87d2fb6 (diff) | |
| download | hdf5-f7a982a64eabcdbe8844b3b4c1bff6c0c368ec16.zip hdf5-f7a982a64eabcdbe8844b3b4c1bff6c0c368ec16.tar.gz hdf5-f7a982a64eabcdbe8844b3b4c1bff6c0c368ec16.tar.bz2 | |
[svn-r16801] merge changes from the trunk into the branch
svn merge -r 16781:16797 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
fixes problems with H5D_chunch_cache_* variable lengths
platforms tested: smirom: ifort, pgf90
jam : f95
Diffstat (limited to 'fortran/src')
| -rw-r--r-- | fortran/src/H5Pff.f90 | 6 | ||||
| -rw-r--r-- | fortran/src/H5f90global.f90 | 15 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90 index 499ae3f..c35c383 100644 --- a/fortran/src/H5Pff.f90 +++ b/fortran/src/H5Pff.f90 @@ -7042,9 +7042,9 @@ ! Once set, these values will override the values in the file access ! property list. Each of these values can be individually unset ! (or not set at all) by passing the macros: -! H5D_CHUNK_CACHE_NSLOTS_DEFAULT, -! H5D_CHUNK_CACHE_NBYTES_DEFAULT, and/or -! H5D_CHUNK_CACHE_W0_DEFAULT +! H5D_CHUNK_CACHE_NSLOTS_DFLT_F, +! H5D_CHUNK_CACHE_NBYTES_DFLT_F, and/or +! H5D_CHUNK_CACHE_W0_DFLT_F ! as appropriate. ! ! The RDCC_W0 value should be between 0 and 1 inclusive and diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index fd234c7..e037d12 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -348,9 +348,12 @@ 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 +! shortened "_DEFAULT" to "_DFLT" to satisfy the limit of 31 +! characters for variable names in Fortran. + + INTEGER :: H5D_CHUNK_CACHE_NSLOTS_DFLT_F + INTEGER :: H5D_CHUNK_CACHE_NBYTES_DFLT_F + INTEGER :: H5D_CHUNK_CACHE_W0_DFLT_F EQUIVALENCE(H5D_flags(1), H5D_COMPACT_F) EQUIVALENCE(H5D_flags(2), H5D_CONTIGUOUS_F) @@ -376,9 +379,9 @@ MODULE H5GLOBAL EQUIVALENCE(H5D_flags(18), H5D_FILL_VALUE_DEFAULT_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) + EQUIVALENCE(H5D_flags(20), H5D_CHUNK_CACHE_NSLOTS_DFLT_F) + EQUIVALENCE(H5D_flags(21), H5D_CHUNK_CACHE_NBYTES_DFLT_F) + EQUIVALENCE(H5D_flags(22), H5D_CHUNK_CACHE_W0_DFLT_F) ! ! H5FD flags declaration diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 9dcc4a5..5b80fa0 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -389,7 +389,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 1 +LT_VERS_REVISION = 29 LT_VERS_AGE = 0 # Include src directory in both Fortran and C flags (C compiler is used |