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/test | |
| 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/test')
| -rw-r--r-- | fortran/test/fortranlib_test_1_8.f90 | 2 | ||||
| -rw-r--r-- | fortran/test/tH5P.f90 | 6 |
2 files changed, 5 insertions, 3 deletions
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) |