From f7a982a64eabcdbe8844b3b4c1bff6c0c368ec16 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Mon, 20 Apr 2009 11:47:47 -0500 Subject: [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 --- fortran/src/H5Pff.f90 | 6 +++--- fortran/src/H5f90global.f90 | 15 +++++++++------ fortran/src/Makefile.in | 2 +- fortran/test/fortranlib_test_1_8.f90 | 2 ++ fortran/test/tH5P.f90 | 6 +++--- 5 files changed, 18 insertions(+), 13 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 diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90 index 49835b0..6158c16 100644 --- a/fortran/test/fortranlib_test_1_8.f90 +++ b/fortran/test/fortranlib_test_1_8.f90 @@ -92,6 +92,8 @@ PROGRAM fortranlibtest ' Testing dataspace encoding and decoding', & total_error) + + ! CALL test_hard_query(group_total_error) WRITE(*,*) diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90 index cfa6f9b..3063842 100644 --- a/fortran/test/tH5P.f90 +++ b/fortran/test/tH5P.f90 @@ -531,7 +531,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error) ! property will override this setting nslots_3 = nslots_2 * 2 - nbytes_3 = H5D_CHUNK_CACHE_NBYTES_DEFAULT_F + nbytes_3 = H5D_CHUNK_CACHE_NBYTES_DFLT_F w0_3 = w0_2 / 2 CALL H5Pset_chunk_cache_f(dapl1, nslots_3, nbytes_3, w0_3, error) @@ -628,8 +628,8 @@ SUBROUTINE test_chunk_cache(cleanup, total_error) ENDIF ! Test H5D_CHUNK_CACHE_NSLOTS_DEFAULT and H5D_CHUNK_CACHE_W0_DEFAULT - nslots_2 = H5D_CHUNK_CACHE_NSLOTS_DEFAULT_F - w0_2 = H5D_CHUNK_CACHE_W0_DEFAULT_F + nslots_2 = H5D_CHUNK_CACHE_NSLOTS_DFLT_F + w0_2 = H5D_CHUNK_CACHE_W0_DFLT_F CALL H5Pset_chunk_cache_f(dapl2, nslots_2, nbytes_2, w0_2, error) CALL check("H5Pset_chunk_cache_f", error, total_error) -- cgit v0.12