diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2024-02-15 22:51:33 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-15 22:51:33 (GMT) |
commit | 413d10f6e3d4db5341413ba7cd4f819eb5156a51 (patch) | |
tree | 8741384bb37a09d0e8d31116c64d9065a0b046f3 /HDF5Examples/FORTRAN | |
parent | 987a734e759c82c65a661ae6090b2252d63a7aec (diff) | |
parent | 424cb6ecd35bc262120e250ee25706c3d3c3c15d (diff) | |
download | hdf5-413d10f6e3d4db5341413ba7cd4f819eb5156a51.zip hdf5-413d10f6e3d4db5341413ba7cd4f819eb5156a51.tar.gz hdf5-413d10f6e3d4db5341413ba7cd4f819eb5156a51.tar.bz2 |
Merge pull request #4019 from lrknox/1_14_dev_sync2_lrk
* Update upload- artifact to match download version (#3929)
* Reorg and update options for doc and cmake config (#3934)
* Add binary build for linux S3 (#3936)
* Clean up Doxygen for szip functions and constants (#3943)
* Replace off_t with HDoff_t internally (#3944)
off_t is a 32-bit signed value on Windows, so we should use HDoff_t
(which is __int64 on Windows) internally instead.
Also defines HDftell on Windows to be _ftelli64().
* Fix chid_t to hid_t (#3948)
* Fortran API work. (#3941)
* - Added Fortran APIs:
H5FGET_INTENT_F, H5SSELECT_ITER_CREATE_F, H5SSEL_ITER_GET_SEQ_LIST_F,
H5SSELECT_ITER_CLOSE_F, H5S_mp_H5SSELECT_ITER_RESET_F
- Added Fortran Parameters:
H5S_SEL_ITER_GET_SEQ_LIST_SORTED_F, H5S_SEL_ITER_SHARE_WITH_DATASPACE_F
- Added tests for new APIs
- Removed H5F C wrapper stubs
- Documentation misc. cleanup.
* Add the user test program in HDFFV-9174 for committed types. (#3937)
Add the user test program for committed types in HDFFV-9174
* Remove cached datatype conversion path table entries on file close (#3942)
* fixed BIND name (#3957)
* update H5Ssel_iter_reset_f test
* Change 'extensible' to 'fixed' in H5FA code (#3964)
* RF: move codespell configuration into .codespellrc so could be used locally as well (#3958)
* Add RELEASE.txt note for the fix for issue #1256 (#3955)
* Fix doxygen errors (#3962)
* Add API support for Fortran MPI_F08 module definitions. (#3959)
* revert to using c-stub for _F08 MPI APIs
* use mpi compiler wrappers for cmake and nvhpc
* Added a GitHub Codespaces configuration. (#3966)
* Fixed XL and gfortran errors (#3968)
* h5 compiler wrappers now pass all arguments passed to it to the compile line (#3954)
* The issue was that the "allargs" variable was not being used in the final command of the compiler wrapper. Any entries containing an escaped quote (\", \') or other non-matching argument (*) would not be passed to the compile line. I have fixed this problem by ensuring all arguments passed to the compiler wrapper are now included in the compile line.
* Add binary testing to CI testing (#3971)
* Replace 'T2' with ' ' to avoid failure to match expected output due to (#3975)
* Clarify vlen string datatype message (#3950)
* append '-WF,' when passing C preprocessor directives to the xlf compiler (#3976)
* Create CITATION.cff (#3927)
Add citation source based on http://web.archive.org/web/20230610185232/https://portal.hdfgroup.org/display/knowledge/How+do+I+properly+cite+HDF5%The space difference in the Fortran examples must be fixed to match the expected output for compression filter examples.
* corrected warning: implicit conversion changes signedness (#3982)
* Skip mac bintest until more reliable (#3983)
* Make platform specific test presets for windows and macs (#3988)
* chore: fix typo (#3989)
* Add a missing left parenthesis in RELEASE.txt. (#3990)
* Remove ADB signature from RELEASE.txt. (#3986)
* Bump the github-actions group with 6 updates (#3981)
* Sync API tests with vol-tests (#3940)
* Fix for github issue #2414: segfault when copying dataset with attrib… (#3967)
* Fix for github issue #2414: segfault when copying dataset with attributes.
This also fixes github issue #3241: segfault when copying dataset.
Need to set the location via H5T_set_loc() of the src datatype
when copying dense attributes.
Otherwise the vlen callbacks are not set up therefore causing seg fault
when doing H5T_convert() -> H5T__conv_vlen().
* Fix broken links caused by examples relocation. (#3995)
* Add abi-complience check and upload to releases (#3996)
* Fix h5watch test failures to ignore system warnings on ppc64le. (#3997)
* Remove oneapi/clang compiler printf() type warning. (#3994)
* Updated information about obtaining the HDF5 source code to use the repos. (#3972)
* Fix overwritten preset names (#4000)
* Fix incompatible pointer type warnings in object reference examples (#3999)
* Fix build issue and some warnings in H5_api_dataset_test.c (#3998)
* Modern C++ dtor declarations (#1830)
* C++ dtor modernization
- Replaced a bunch of empty dtors with `= default`
- Removed deprecated `throw()`. In C++11, dtors are `noexcept` by default.
* remove incorrect check for environ (#4002)
* Add a missing file into Makefile.am for MinGW Autotools build error. (#4004)
* Issue #1824: Replaced most remaining sprintf with safer snprint (#4003)
* Add hl and cpp ABI reports to daily build (#4006)
* Don't add files and directories with names that begin with ., or that match *autom4te* to release tar & zip files. (#4009)
* Fix some output issues with ph5diff (#4008)
* Update install texts (#4010)
* Add C in project line for CMake to fix #4012. (#4014)
* separate out individual checks for string removal (#4015)
* Add compound subset ops on attributes to API tests (#4005)
---------
Diffstat (limited to 'HDF5Examples/FORTRAN')
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90 | 12 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90 | 12 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90 | 14 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90 | 16 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90 | 16 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst | 2 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst | 2 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst | 2 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst | 2 | ||||
-rw-r--r-- | HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst | 2 |
10 files changed, 45 insertions, 35 deletions
diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90 index b0464a3..cab742b 100644 --- a/HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90 +++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90 @@ -120,15 +120,17 @@ PROGRAM main ! nelmts = 0 CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, MaxChrLen, name, filter_id, hdferr) - WRITE(*,'("Filter type is: ")', ADVANCE='NO') + WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:" IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_DEFLATE_F")') + WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SHUFFLE_F")') + WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_FLETCHER32_F")') + WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SZIP_F")') + WRITE(*,'(A)') "H5Z_FILTER_SZIP_F" + ELSE + WRITE(*,'(A)') "UNKNOWN" ENDIF ! ! Read the data using the default properties. diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90 index b46e3fc..7e7b6b5 100644 --- a/HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90 +++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90 @@ -118,15 +118,17 @@ PROGRAM main ! nelmts = 1 CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, MaxChrLen, name, filter_id, hdferr) - WRITE(*,'("Filter type is: ")', ADVANCE='NO') + WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:" IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_DEFLATE_F")') + WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SHUFFLE_F")') + WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_FLETCHER32_F")') + WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SZIP_F")') + WRITE(*,'(A)') "H5Z_FILTER_SZIP_F" + ELSE + WRITE(*,'(A)') "UNKNOWN" ENDIF ! ! Read the data using the default properties. diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90 index 27e4d52..636898c 100644 --- a/HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90 +++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90 @@ -125,17 +125,19 @@ PROGRAM main ! first filter because we know that we only added one filter. ! CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, INT(MaxChrLen, SIZE_T), name, filter_id, hdferr) - WRITE(*,'("Filter type is: ")', ADVANCE='NO') + WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:" IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_DEFLATE_F")') + WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SHUFFLE_F")') + WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_FLETCHER32_F")') + WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SZIP_F")') + WRITE(*,'(A)') "H5Z_FILTER_SZIP_F" ELSE IF(filter_id.EQ.H5Z_FILTER_NBIT_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_NBIT_F")') + WRITE(*,'(A)') "H5Z_FILTER_NBIT_F" + ELSE + WRITE(*,'(A)') "UNKNOWN" ENDIF ! ! Read the data using the default properties. diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90 index 120e896..e3bcc9f 100644 --- a/HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90 +++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90 @@ -133,19 +133,21 @@ PROGRAM main ! nelmts = 1 CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, INT(MaxChrLen, SIZE_T), name, filter_id, hdferr) - WRITE(*,'("Filter type is: ")', ADVANCE='NO') + WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:" IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_DEFLATE_F")') + WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SHUFFLE_F")') + WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_FLETCHER32_F")') + WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SZIP_F")') + WRITE(*,'(A)') "H5Z_FILTER_SZIP_F" ELSE IF(filter_id.EQ.H5Z_FILTER_NBIT_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_NBIT_F")') + WRITE(*,'(A)') "H5Z_FILTER_NBIT_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SCALEOFFSET_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SCALEOFFSET_F")') + WRITE(*,'(A)') "H5Z_FILTER_SCALEOFFSET_F" + ELSE + WRITE(*,'(A)') "UNKNOWN" ENDIF ! ! Read the data using the default properties. diff --git a/HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90 b/HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90 index f66036e..fdd6ecf 100644 --- a/HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90 +++ b/HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90 @@ -119,20 +119,22 @@ PROGRAM main nelmts = 1 CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, INT(MaxChrLen,SIZE_T), name, filter_id, hdferr) - WRITE(*,'("Filter type is: ")', ADVANCE='NO') + WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:" IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_DEFLATE_F")') + WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SHUFFLE_F")') + WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F" ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_FLETCHER32_F")') + WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F" ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN - WRITE(*,'(T2,"H5Z_FILTER_SZIP_F")') + WRITE(*,'(A)') "H5Z_FILTER_SZIP_F" ! DEFINED ONLY IN F2003 hdf5 branch ! ELSE IF(filter_id.EQ.H5Z_FILTER_NBIT_F)THEN -! WRITE(*,'(T2,"H5Z_FILTER_NBIT_F")') +! WRITE(*,'(" H5Z_FILTER_NBIT_F")') ! ELSE IF(filter_id.EQ.H5Z_FILTER_SCALEOFFSET_F)THEN -! WRITE(*,'(T2,"H5Z_FILTER_SCALEOFFSET_F")') +! WRITE(*,'(" H5Z_FILTER_SCALEOFFSET_F")') + ELSE + WRITE(*,'(A)') "UNKNOWN" ENDIF ! ! Read the data using the default properties. diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst index 01ed866..d2690e3 100644 --- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst +++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst @@ -1,2 +1,2 @@ -Filter type is: H5Z_FILTER_FLETCHER32_F +Filter type is: H5Z_FILTER_FLETCHER32_F Maximum value in DS1 is: 1984 diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst index 9efcd78a..6fbaba1 100644 --- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst +++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst @@ -1,2 +1,2 @@ -Filter type is: H5Z_FILTER_DEFLATE_F +Filter type is: H5Z_FILTER_DEFLATE_F Maximum value in DS1 is: 1890 diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst index 90f7a67..49c46ba 100644 --- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst +++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst @@ -1,2 +1,2 @@ -Filter type is: H5Z_FILTER_NBIT_F +Filter type is: H5Z_FILTER_NBIT_F Maximum value in DS1 is: 1890 diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst index ddf8b30..d3dad13 100644 --- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst +++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst @@ -1,5 +1,5 @@ Maximum value in write buffer is: 1890 Minimum value in write buffer is: -63 -Filter type is: H5Z_FILTER_SCALEOFFSET_F +Filter type is: H5Z_FILTER_SCALEOFFSET_F Maximum value in DS1 is: 1890 Minimum value in DS1 is: -63 diff --git a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst index 8f6ba90..bfd93d4 100644 --- a/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst +++ b/HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst @@ -1,2 +1,2 @@ -Filter type is: H5Z_FILTER_SZIP_F +Filter type is: H5Z_FILTER_SZIP_F Maximum value in DS1 is: 1890 |