Merge branch 'HDFGroup:develop' into develop

fortran/src/H5Pf.c

@@ -4606,8 +4606,8 @@ h5pset_fapl_mpio_c(hid_t_f *prp_id, void *comm, void *info)
     herr_t   ret;
     MPI_Comm c_comm;
     MPI_Info c_info;
-    c_comm = MPI_Comm_f2c(*((int *)comm));
-    c_info = MPI_Info_f2c(*((int *)info));
+    c_comm = MPI_Comm_f2c(*((MPI_Fint *)comm));
+    c_info = MPI_Info_f2c(*((MPI_Fint *)info));
 
     /*
      * Call H5Pset_mpi function.
@@ -4677,8 +4677,8 @@ h5pset_mpi_params_c(hid_t_f *prp_id, void *comm, void *info)
     herr_t   ret;
     MPI_Comm c_comm;
     MPI_Info c_info;
-    c_comm = MPI_Comm_f2c(*((int *)comm));
-    c_info = MPI_Info_f2c(*((int *)info));
+    c_comm = MPI_Comm_f2c(*((MPI_Fint *)comm));
+    c_info = MPI_Info_f2c(*((MPI_Fint *)info));
 
     /*
      * Call H5Pset_mpi_params.

fortran/test/tH5P_F03.F90

@@ -47,7 +47,7 @@ MODULE test_genprop_cls_cb1_mod
 
 CONTAINS
 
-  INTEGER FUNCTION test_genprop_cls_cb1_f(list_id, create_data ) bind(C)
+  INTEGER(KIND=C_INT) FUNCTION test_genprop_cls_cb1_f(list_id, create_data ) bind(C)
 
     IMPLICIT NONE
 

hl/src/H5TB.c

@@ -2025,7 +2025,7 @@ H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hi
         goto out;
 
     /* alloc fill value attribute buffer */
-    if (NULL == (tmp_fill_buf = (unsigned char *)malloc(total_size)))
+    if (NULL == (tmp_fill_buf = (unsigned char *)calloc(1, total_size)))
         goto out;
 
     /* get the fill value attributes */

hl/test/test_table.c

@@ -376,6 +376,8 @@ test_table(hid_t fid, int do_write)
     field_type[3] = H5T_NATIVE_DOUBLE;
     field_type[4] = H5T_NATIVE_INT;
 
+    memset(wbufd, 0, NRECORDS * sizeof(particle_t));
+
     /*-------------------------------------------------------------------------
      *
      * Functions tested:

m4/aclocal_fc.m4

@@ -390,7 +390,8 @@ AC_DEFUN([PAC_FIND_MPI_LOGICAL_KIND],[
 AC_REQUIRE([PAC_FC_AVAIL_KINDS])
 AC_MSG_CHECKING([default Fortran KIND of LOGICAL in MPI])
 AC_LANG_PUSH([Fortran])
-
+saved_FCFLAGS=$FCFLAGS
+FCFLAGS=""
 for kind in `echo $pac_validLogicalKinds | sed -e 's/,/ /g'`; do
         AC_COMPILE_IFELSE([
                 PROGRAM main
@@ -411,6 +412,7 @@ else
   AC_DEFINE_UNQUOTED([MPI_LOGICAL_KIND], [$PAC_MPI_LOGICAL_KIND], [Define MPI Fortran KIND of LOGICAL])
   AC_MSG_RESULT([$PAC_MPI_LOGICAL_KIND])
 fi
+FCFLAGS=$saved_FCFLAGS
 AC_LANG_POP([Fortran])
 ])
 

release_docs/RELEASE.txt

@@ -1772,6 +1772,9 @@ Known Problems
     implemented: (1) derived type argument passed by value (H5VLff.F90),
     and (2) support for REAL with KIND = 2 in intrinsic SPACING used in testing.
 
+    Fortran tests HDF5_1_8.F90 and HDF5_F03.F90 will fail with Cray compilers greater than
+    version 16.0 due to a compiler bug. The latest version verified as failing was version 17.0.
+
     Several tests currently fail on certain platforms:
         MPI_TEST-t_bigio fails with spectrum-mpi on ppc64le platforms.
 

src/H5Ppublic.h

@@ -46,56 +46,182 @@
  * The library's property list classes
  */
 
-#define H5P_ROOT             (H5OPEN H5P_CLS_ROOT_ID_g)
-#define H5P_OBJECT_CREATE    (H5OPEN H5P_CLS_OBJECT_CREATE_ID_g)
-#define H5P_FILE_CREATE      (H5OPEN H5P_CLS_FILE_CREATE_ID_g)
-#define H5P_FILE_ACCESS      (H5OPEN H5P_CLS_FILE_ACCESS_ID_g)
-#define H5P_DATASET_CREATE   (H5OPEN H5P_CLS_DATASET_CREATE_ID_g)
-#define H5P_DATASET_ACCESS   (H5OPEN H5P_CLS_DATASET_ACCESS_ID_g)
-#define H5P_DATASET_XFER     (H5OPEN H5P_CLS_DATASET_XFER_ID_g)
-#define H5P_FILE_MOUNT       (H5OPEN H5P_CLS_FILE_MOUNT_ID_g)
-#define H5P_GROUP_CREATE     (H5OPEN H5P_CLS_GROUP_CREATE_ID_g)
-#define H5P_GROUP_ACCESS     (H5OPEN H5P_CLS_GROUP_ACCESS_ID_g)
-#define H5P_DATATYPE_CREATE  (H5OPEN H5P_CLS_DATATYPE_CREATE_ID_g)
-#define H5P_DATATYPE_ACCESS  (H5OPEN H5P_CLS_DATATYPE_ACCESS_ID_g)
-#define H5P_MAP_CREATE       (H5OPEN H5P_CLS_MAP_CREATE_ID_g)
-#define H5P_MAP_ACCESS       (H5OPEN H5P_CLS_MAP_ACCESS_ID_g)
-#define H5P_STRING_CREATE    (H5OPEN H5P_CLS_STRING_CREATE_ID_g)
+/**
+ * Property list class root, is not user-accessible
+ */
+#define H5P_ROOT (H5OPEN H5P_CLS_ROOT_ID_g)
+/**
+ * Object creation property list class, is not user-accessible
+ */
+#define H5P_OBJECT_CREATE (H5OPEN H5P_CLS_OBJECT_CREATE_ID_g)
+/**
+ * File creation property list class
+ */
+#define H5P_FILE_CREATE (H5OPEN H5P_CLS_FILE_CREATE_ID_g)
+/**
+ * File access property list class
+ */
+#define H5P_FILE_ACCESS (H5OPEN H5P_CLS_FILE_ACCESS_ID_g)
+/**
+ * Dataset creation property list class
+ */
+#define H5P_DATASET_CREATE (H5OPEN H5P_CLS_DATASET_CREATE_ID_g)
+/**
+ * Dataset access property list class
+ */
+#define H5P_DATASET_ACCESS (H5OPEN H5P_CLS_DATASET_ACCESS_ID_g)
+/**
+ * Dataset transfer property list class
+ */
+#define H5P_DATASET_XFER (H5OPEN H5P_CLS_DATASET_XFER_ID_g)
+/**
+ * File mount property list class
+ */
+#define H5P_FILE_MOUNT (H5OPEN H5P_CLS_FILE_MOUNT_ID_g)
+/**
+ * Group creation property list class
+ */
+#define H5P_GROUP_CREATE (H5OPEN H5P_CLS_GROUP_CREATE_ID_g)
+/**
+ * Group access property list class
+ */
+#define H5P_GROUP_ACCESS (H5OPEN H5P_CLS_GROUP_ACCESS_ID_g)
+/**
+ * Datatype creation property list class
+ */
+#define H5P_DATATYPE_CREATE (H5OPEN H5P_CLS_DATATYPE_CREATE_ID_g)
+/**
+ * Datatype access property list class
+ */
+#define H5P_DATATYPE_ACCESS (H5OPEN H5P_CLS_DATATYPE_ACCESS_ID_g)
+/**
+ * Map creation property list class
+ */
+#define H5P_MAP_CREATE (H5OPEN H5P_CLS_MAP_CREATE_ID_g)
+/**
+ * Map access property list class
+ */
+#define H5P_MAP_ACCESS (H5OPEN H5P_CLS_MAP_ACCESS_ID_g)
+/**
+ * String creation property list class, is not user-accessible
+ */
+#define H5P_STRING_CREATE (H5OPEN H5P_CLS_STRING_CREATE_ID_g)
+/**
+ * Attribute creation property list class
+ */
 #define H5P_ATTRIBUTE_CREATE (H5OPEN H5P_CLS_ATTRIBUTE_CREATE_ID_g)
+/**
+ * Attribute access property list class
+ */
 #define H5P_ATTRIBUTE_ACCESS (H5OPEN H5P_CLS_ATTRIBUTE_ACCESS_ID_g)
-#define H5P_OBJECT_COPY      (H5OPEN H5P_CLS_OBJECT_COPY_ID_g)
-#define H5P_LINK_CREATE      (H5OPEN H5P_CLS_LINK_CREATE_ID_g)
-#define H5P_LINK_ACCESS      (H5OPEN H5P_CLS_LINK_ACCESS_ID_g)
-#define H5P_VOL_INITIALIZE   (H5OPEN H5P_CLS_VOL_INITIALIZE_ID_g)
+/**
+ * Object copy property list class
+ */
+#define H5P_OBJECT_COPY (H5OPEN H5P_CLS_OBJECT_COPY_ID_g)
+/**
+ * Link creation property list class
+ */
+#define H5P_LINK_CREATE (H5OPEN H5P_CLS_LINK_CREATE_ID_g)
+/**
+ * Link access property list class
+ */
+#define H5P_LINK_ACCESS (H5OPEN H5P_CLS_LINK_ACCESS_ID_g)
+/**
+ * VOL initialization property list class
+ */
+#define H5P_VOL_INITIALIZE (H5OPEN H5P_CLS_VOL_INITIALIZE_ID_g)
+/**
+ * Reference access property list class
+ */
 #define H5P_REFERENCE_ACCESS (H5OPEN H5P_CLS_REFERENCE_ACCESS_ID_g)
 
 /*
  * The library's default property lists
  */
-#define H5P_FILE_CREATE_DEFAULT      (H5OPEN H5P_LST_FILE_CREATE_ID_g)
-#define H5P_FILE_ACCESS_DEFAULT      (H5OPEN H5P_LST_FILE_ACCESS_ID_g)
-#define H5P_DATASET_CREATE_DEFAULT   (H5OPEN H5P_LST_DATASET_CREATE_ID_g)
-#define H5P_DATASET_ACCESS_DEFAULT   (H5OPEN H5P_LST_DATASET_ACCESS_ID_g)
-#define H5P_DATASET_XFER_DEFAULT     (H5OPEN H5P_LST_DATASET_XFER_ID_g)
-#define H5P_FILE_MOUNT_DEFAULT       (H5OPEN H5P_LST_FILE_MOUNT_ID_g)
-#define H5P_GROUP_CREATE_DEFAULT     (H5OPEN H5P_LST_GROUP_CREATE_ID_g)
-#define H5P_GROUP_ACCESS_DEFAULT     (H5OPEN H5P_LST_GROUP_ACCESS_ID_g)
-#define H5P_DATATYPE_CREATE_DEFAULT  (H5OPEN H5P_LST_DATATYPE_CREATE_ID_g)
-#define H5P_DATATYPE_ACCESS_DEFAULT  (H5OPEN H5P_LST_DATATYPE_ACCESS_ID_g)
-#define H5P_MAP_CREATE_DEFAULT       (H5OPEN H5P_LST_MAP_CREATE_ID_g)
-#define H5P_MAP_ACCESS_DEFAULT       (H5OPEN H5P_LST_MAP_ACCESS_ID_g)
+/**
+ * File creation default property list
+ */
+#define H5P_FILE_CREATE_DEFAULT (H5OPEN H5P_LST_FILE_CREATE_ID_g)
+/**
+ * File access default property list
+ */
+#define H5P_FILE_ACCESS_DEFAULT (H5OPEN H5P_LST_FILE_ACCESS_ID_g)
+/**
+ * Dataset creation default property list
+ */
+#define H5P_DATASET_CREATE_DEFAULT (H5OPEN H5P_LST_DATASET_CREATE_ID_g)
+/**
+ * Dataset access default property list
+ */
+#define H5P_DATASET_ACCESS_DEFAULT (H5OPEN H5P_LST_DATASET_ACCESS_ID_g)
+/**
+ * Dataset transfer default property list
+ */
+#define H5P_DATASET_XFER_DEFAULT (H5OPEN H5P_LST_DATASET_XFER_ID_g)
+/**
+ * File mount default property list
+ */
+#define H5P_FILE_MOUNT_DEFAULT (H5OPEN H5P_LST_FILE_MOUNT_ID_g)
+/**
+ * Group creation default property list
+ */
+#define H5P_GROUP_CREATE_DEFAULT (H5OPEN H5P_LST_GROUP_CREATE_ID_g)
+/**
+ * Group access default property list
+ */
+#define H5P_GROUP_ACCESS_DEFAULT (H5OPEN H5P_LST_GROUP_ACCESS_ID_g)
+/**
+ * Datytype creation default property list
+ */
+#define H5P_DATATYPE_CREATE_DEFAULT (H5OPEN H5P_LST_DATATYPE_CREATE_ID_g)
+/**
+ * Datytype access default property list
+ */
+#define H5P_DATATYPE_ACCESS_DEFAULT (H5OPEN H5P_LST_DATATYPE_ACCESS_ID_g)
+/**
+ * Map creation default property list
+ */
+#define H5P_MAP_CREATE_DEFAULT (H5OPEN H5P_LST_MAP_CREATE_ID_g)
+/**
+ * Map access default property list
+ */
+#define H5P_MAP_ACCESS_DEFAULT (H5OPEN H5P_LST_MAP_ACCESS_ID_g)
+/**
+ * Attribute creation default property list
+ */
 #define H5P_ATTRIBUTE_CREATE_DEFAULT (H5OPEN H5P_LST_ATTRIBUTE_CREATE_ID_g)
+/**
+ * Attribute access default property list
+ */
 #define H5P_ATTRIBUTE_ACCESS_DEFAULT (H5OPEN H5P_LST_ATTRIBUTE_ACCESS_ID_g)
-#define H5P_OBJECT_COPY_DEFAULT      (H5OPEN H5P_LST_OBJECT_COPY_ID_g)
-#define H5P_LINK_CREATE_DEFAULT      (H5OPEN H5P_LST_LINK_CREATE_ID_g)
-#define H5P_LINK_ACCESS_DEFAULT      (H5OPEN H5P_LST_LINK_ACCESS_ID_g)
-#define H5P_VOL_INITIALIZE_DEFAULT   (H5OPEN H5P_LST_VOL_INITIALIZE_ID_g)
+/**
+ * Object copy default property list
+ */
+#define H5P_OBJECT_COPY_DEFAULT (H5OPEN H5P_LST_OBJECT_COPY_ID_g)
+/**
+ * Link creation default property list
+ */
+#define H5P_LINK_CREATE_DEFAULT (H5OPEN H5P_LST_LINK_CREATE_ID_g)
+/**
+ * Link access default property list
+ */
+#define H5P_LINK_ACCESS_DEFAULT (H5OPEN H5P_LST_LINK_ACCESS_ID_g)
+/**
+ * VOL initialization default property list
+ */
+#define H5P_VOL_INITIALIZE_DEFAULT (H5OPEN H5P_LST_VOL_INITIALIZE_ID_g)
+/**
+ * Reference access default property list
+ */
 #define H5P_REFERENCE_ACCESS_DEFAULT (H5OPEN H5P_LST_REFERENCE_ACCESS_ID_g)
-
-/* Common creation order flags (for links in groups and attributes on objects) */
+/**
+ * Attribute creation order is tracked but not necessarily indexed
+ */
 #define H5P_CRT_ORDER_TRACKED 0x0001
+/**
+ * Attribute creation order is indexed (requires #H5P_CRT_ORDER_TRACKED)
+ */
 #define H5P_CRT_ORDER_INDEXED 0x0002
-
 /**
  * Default value of type \ref hid_t for all property list classes
  */