Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)

* commit '42106363903e7a7d4a0c2cd1b38aad9a54f2eeff':
  Fixed configure issue when building HDF5 with NAG Fortran 7.0.
  Fixed issue building HDF5 with NAG Fortran 7.0.
  revert type cast
  Merge pull request #2244 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop

3 files changed, 29 insertions, 9 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 884bc3ce..9d6a2b9 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -424,6 +424,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.
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index fe78317..8735cbb 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -526,7 +526,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
     * ==================================================*/
     irank = 0;
     for (i = 0; i < DIMSIZE; i++)
-        H5_CHECKED_ASSIGN(writedata[i], uint8_t, irank * DIMSIZE + i, int)
+        writedata[i] = irank * DIMSIZE + i;
     mpi_off = irank * DIMSIZE;
 
     /* Only one process writes */
@@ -597,7 +597,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
         return 1;
     };
     for (i = 0; i < DIMSIZE; i++) {
-        H5_CHECKED_ASSIGN(expect_val, uint8_t, irank * DIMSIZE + i, int);
+        expect_val = (uint8_t)(irank * DIMSIZE + i);
         if (readdata[i] != expect_val) {
             PRINTID;
             HDprintf("read data[%d:%d] got %02x, expect %02x\n", irank, i,
@@ -697,7 +697,7 @@ static int test_mpio_derived_dtype(char *filename) {
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
     retcode = 0;
     for (i = 0; i < 3; i++)
-        H5_CHECKED_ASSIGN(buf[i], int8_t, i + 1, int);
+        buf[i] = (char)(i + 1);
 
     if ((mpi_err = MPI_File_open(MPI_COMM_WORLD, filename,
             MPI_MODE_RDWR | MPI_MODE_CREATE, MPI_INFO_NULL, &fh))