diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2020-02-28 23:11:06 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2020-02-28 23:11:06 (GMT) |
| commit | 78639fa32c30dea77c701f0ce94c34152bf40920 (patch) | |
| tree | a4cee65da6c002768cb78eb1afa7323844eebb85 | |
| parent | f1aca8780ea647e705760149ceb925e363c31763 (diff) | |
| parent | 276c4fdbcc1baf0748a617f10eb8aaaec2154151 (diff) | |
| download | hdf5-78639fa32c30dea77c701f0ce94c34152bf40920.zip hdf5-78639fa32c30dea77c701f0ce94c34152bf40920.tar.gz hdf5-78639fa32c30dea77c701f0ce94c34152bf40920.tar.bz2 | |
Merge pull request #2422 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10
* commit '276c4fdbcc1baf0748a617f10eb8aaaec2154151':
Fixed configure issue when building HDF5 with NAG Fortran 7.0.
Fixed issue building HDF5 with NAG Fortran 7.0.
| -rw-r--r-- | m4/aclocal_fc.f90 | 25 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 7 |
2 files changed, 26 insertions, 6 deletions
diff --git a/m4/aclocal_fc.f90 b/m4/aclocal_fc.f90 index 664a3c6..7e81a52 100644 --- a/m4/aclocal_fc.f90 +++ b/m4/aclocal_fc.f90 @@ -83,10 +83,11 @@ END PROGRAM PROG_FC_C_LONG_DOUBLE_EQ_C_DOUBLE !---- START ----- Determine the available KINDs for REALs and INTEGERs PROGRAM FC_AVAIL_KINDS IMPLICIT NONE - INTEGER :: ik, jk, k, max_decimal_prec - INTEGER :: num_rkinds = 1, num_ikinds = 1 + INTEGER :: ik, jk, k, kk, max_decimal_prec + INTEGER :: prev_rkind, num_rkinds = 1, num_ikinds = 1 INTEGER, DIMENSION(1:10) :: list_ikinds = -1 INTEGER, DIMENSION(1:10) :: list_rkinds = -1 + LOGICAL :: new_kind OPEN(8, FILE='pac_fconftest.out', FORM='formatted') @@ -113,14 +114,26 @@ PROGRAM FC_AVAIL_KINDS ! Find real KINDs list_rkinds(num_rkinds)=SELECTED_REAL_KIND(1) max_decimal_prec = 1 + prev_rkind=list_rkinds(num_rkinds) prec: DO ik = 2, 36 - exp: DO jk = 1, 17000 + exp: DO jk = 1, 700 k = SELECTED_REAL_KIND(ik,jk) IF(k.LT.0) EXIT exp - IF(k.GT.list_rkinds(num_rkinds))THEN - num_rkinds = num_rkinds + 1 - list_rkinds(num_rkinds) = k + IF(k.NE.prev_rkind)THEN + ! Check if we aleady have that kind + new_kind = .TRUE. + DO kk = 1, num_rkinds + IF(k.EQ.list_rkinds(kk))THEN + new_kind=.FALSE. + EXIT + ENDIF + ENDDO + IF(new_kind)THEN + num_rkinds = num_rkinds + 1 + list_rkinds(num_rkinds) = k + prev_rkind=list_rkinds(num_rkinds) + ENDIF ENDIF max_decimal_prec = ik ENDDO exp diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index d8b4eca..2c70751 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -410,6 +410,13 @@ Bug Fixes since HDF5-1.10.5 release (MSB - 2020/2/18, HDFFV-11029) + - Fixed configure issue when building HDF5 with NAG Fortran 7.0. + + HDF5 now accounts for the addition of half-precision floating-point + in NAG 7.0 with a KIND=16. + + (MSB - 2020/02/28, HDFFV-11033) + Tools ----- - h5repack was fixed to repack the reference attributes properly. |