Merge with develop (#2790)

10 files changed, 23 insertions, 239 deletions

diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c
index 4ecb09e..ad669d8 100644
--- a/testpar/t_bigio.c
+++ b/testpar/t_bigio.c
@@ -26,7 +26,7 @@ const char *FILENAME[3] = {"bigio_test.h5", "single_rank_independent_io.h5", NUL
 #define DATASET4             "DSET4"
 #define DXFER_COLLECTIVE_IO  0x1 /* Collective IO*/
 #define DXFER_INDEPENDENT_IO 0x2 /* Independent IO collectively */
-#define DXFER_BIGCOUNT       (1 < 29)
+#define DXFER_BIGCOUNT       (1 << 29)
 
 #define HYPER 1
 #define POINT 2
@@ -1165,9 +1165,16 @@ single_rank_independent_io(void)
 
         free(data);
         H5Sclose(fspace_id);
-        H5Pclose(fapl_id);
         H5Dclose(dset_id);
         H5Fclose(file_id);
+
+        H5E_BEGIN_TRY
+        {
+            H5Fdelete(FILENAME[1], fapl_id);
+        }
+        H5E_END_TRY;
+
+        H5Pclose(fapl_id);
     }
     MPI_Barrier(MPI_COMM_WORLD);
 }
@@ -1289,8 +1296,6 @@ coll_chunk1(void)
  * Programmer:    Unknown
  *        July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index ae47a6f..4d3aff5 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -475,10 +475,6 @@ static hbool_t trace_file_check(int metadata_write_strategy);
  *
  * Programmer:  JRM -- 4/17/06
  *
- * Modifications:
- *
- *              None.
- *
  *****************************************************************************/
 
 static void
@@ -507,10 +503,6 @@ print_stats(void)
  *
  * Programmer:    JRM -- 4/17/06
  *
- * Modifications:
- *
- *        None.
- *
  *****************************************************************************/
 
 static void
@@ -547,10 +539,6 @@ reset_stats(void)
  *
  * Programmer:    JRM -- 11/16/05
  *
- * Modifications:
- *
- *        None.
- *
  *****************************************************************************/
 
 static hbool_t
@@ -964,10 +952,6 @@ get_max_nerrors(void)
  *
  * Programmer:    JRM -- 12/22/05
  *
- * Modifications:
- *
- *         JRM -- 5/10/06
- *        Added mssg_tag_offset parameter and supporting code.
  *
  *****************************************************************************/
 
@@ -1043,11 +1027,6 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset)
  *
  * Programmer:    JRM -- 12/22/05
  *
- * Modifications:
- *
- *         JRM -- 5/10/06
- *        Added the add_req_to_tag parameter and supporting code.
- *
  *****************************************************************************/
 static hbool_t
 send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag)
@@ -1300,11 +1279,6 @@ reset_server_counters(void)
  *
  * Programmer:    JRM -- 12/22/05
  *
- * Modifications:
- *
- *         JRM -- 5/10/06
- *        Updated for sync message.
- *
  *****************************************************************************/
 static hbool_t
 server_main(void)
@@ -2876,13 +2850,6 @@ expunge_entry(H5F_t *file_ptr, int32_t idx)
  * Programmer:  John Mainzer
  *              01/04/06
  *
- * Modifications:
- *
- *              JRM -- 8/11/06
- *              Updated code to reflect the fact that entries can now be
- *              inserted pinned.  Note that since all inserts are dirty,
- *              any pins must be global pins.
- *
  *****************************************************************************/
 static void
 insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags)
@@ -3245,12 +3212,6 @@ lock_and_unlock_random_entry(H5F_t *file_ptr, int min_idx, int max_idx)
  * Programmer:  John Mainzer
  *              1/4/06
  *
- * Modifications:
- *
- *         JRM -- 7/11/06
- *         Modified asserts to handle the new local_len field in
- *         datum.
- *
  *****************************************************************************/
 static void
 lock_entry(H5F_t *file_ptr, int32_t idx)
@@ -4089,11 +4050,6 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl)
  *
  * Programmer:    JRM -- 1/12/06
  *
- * Modifications:
- *
- *        JRM -- 5/9/06
- *        Modified function to facilitate setting predefined seeds.
- *
  *****************************************************************************/
 static void
 setup_rand(void)
@@ -4617,11 +4573,6 @@ verify_total_writes(unsigned expected_total_writes)
  * Programmer:  John Mainzer
  *              1/4/06
  *
- * Modifications:
- *
- *         7/11/06
- *         Updated for the new local_len field in datum.
- *
  *****************************************************************************/
 static void
 unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags)
@@ -4692,11 +4643,6 @@ unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags)
  * Programmer:  John Mainzer
  *              4/12/06
  *
- * Modifications:
- *
- *         JRM -- 8/15/06
- *         Added assertion that entry is pinned on entry.
- *
  *****************************************************************************/
 static void
 unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t via_unprotect)
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index 65c892d..1e556d9 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -125,10 +125,6 @@ static hbool_t smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank,
  * Programmer:  John Mainzer
  *              1/25/17
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -390,13 +386,6 @@ construct_test_file(int test_file_index)
  * Programmer:  John Mainzer
  *              7/15/15
  *
- * Modifications:
- *
- *              Added min_dset and max_dset parameters and supporting
- *        code.  This allows the caller to specify a range of
- *        datasets to create.
- *                        JRM -- 8/20/15
- *
  *-------------------------------------------------------------------------
  */
 
@@ -723,11 +712,6 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
  * Programmer:  John Mainzer
  *              10/31/16
  *
- * Modifications:
- *
- *              None.
- *                        JRM -- 8/20/15
- *
  *-------------------------------------------------------------------------
  */
 #if 0
@@ -823,14 +807,6 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset)
  * Programmer:  John Mainzer
  *              7/14/15
  *
- * Modifications:
- *
- *              Modified function to handle parallel file creates / opens.
- *
- *                                                 JRM -- 2/1/17
- *
- *              Modified function to handle
- *
  *-------------------------------------------------------------------------
  */
 
@@ -1300,10 +1276,6 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
  * Programmer:  John Mainzer
  *              3/4/17
  *
- * Modifications:
- *
- *              None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -1689,10 +1661,6 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
  * Programmer:  John Mainzer
  *              3/6/17
  *
- * Modifications:
- *
- *              None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -1760,10 +1728,6 @@ par_delete_dataset(int dset_num, hid_t file_id, int mpi_rank)
  * Programmer:  John Mainzer
  *              3/8/17
  *
- * Modifications:
- *
- *              None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -1809,10 +1773,6 @@ par_insert_cache_image(int file_name_idx, int mpi_rank, int mpi_size)
  * Programmer:  John Mainzer
  *              3/6/17
  *
- * Modifications:
- *
- *              None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -2067,10 +2027,6 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
  * Programmer:  John Mainzer
  *              3/8/17
  *
- * Modifications:
- *
- *              None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -2181,10 +2137,6 @@ serial_insert_cache_image(int file_name_idx, int mpi_size)
  * Programmer:  John Mainzer
  *              3/6/17
  *
- * Modifications:
- *
- *              None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -2413,13 +2365,6 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
  * Programmer:  John Mainzer
  *              7/15/15
  *
- * Modifications:
- *
- *              Added min_dset and max_dset parameters and supporting
- *        code.  This allows the caller to specify a range of
- *        datasets to verify.
- *                        JRM -- 8/20/15
- *
  *-------------------------------------------------------------------------
  */
 
@@ -2677,10 +2622,6 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset)
  * Programmer:  John Mainzer
  *              3/11/17
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -2944,10 +2885,6 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
  * Programmer:  John Mainzer
  *              1/25/17
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -3614,8 +3551,6 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
  * Programmer:  John Mainzer
  *              1/25/17
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index c6ed9b1..5f853e3 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -46,8 +46,6 @@ static void coll_chunktest(const char *filename, int chunk_factor, int select_fa
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -97,8 +95,6 @@ coll_chunk1(void)
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -148,8 +144,6 @@ coll_chunk2(void)
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -202,8 +196,6 @@ coll_chunk3(void)
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -254,8 +246,6 @@ coll_chunk4(void)
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -308,8 +298,6 @@ coll_chunk5(void)
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -360,8 +348,6 @@ coll_chunk6(void)
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -412,8 +398,6 @@ coll_chunk7(void)
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -464,8 +448,6 @@ coll_chunk8(void)
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -516,8 +498,6 @@ coll_chunk9(void)
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
@@ -559,26 +539,16 @@ coll_chunk10(void)
  * Function:	coll_chunktest
  *
  * Purpose:     The real testing routine for regular selection of collective
-                chunking storage
-                testing both write and read,
-                If anything fails, it may be read or write. There is no
-                separation test between read and write.
+ *              chunking storage testing both write and read,
+ *              If anything fails, it may be read or write. There is no
+ *              separation test between read and write.
  *
  * Return:	Success:	0
- *
  *		Failure:	-1
  *
- * Modifications:
- *   Remove invalid temporary property checkings for API_LINK_HARD and
- *   API_LINK_TRUE cases.
- * Programmer: Jonathan Kim
- * Date: 2012-10-10
- *
  * Programmer:	Unknown
  *		July 12th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 5002fb8..34c4d97 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -3427,9 +3427,6 @@ actual_io_mode_tests(void)
  * Programmer: Jonathan Kim
  * Date: Aug, 2012
  */
-#ifdef LATER
-#define DSET_NOCOLCAUSE "nocolcause"
-#endif
 #define FILE_EXTERNAL "nocolcause_extern.data"
 static void
 test_no_collective_cause_mode(int selection_mode)
diff --git a/testpar/t_file.c b/testpar/t_file.c
index 99ad13c..90ae22d 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -95,19 +95,21 @@ test_split_comm_access(void)
         fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, acc_tpl);
         VRFY((fid >= 0), "H5Fcreate succeeded");
 
-        /* Release file-access template */
-        ret = H5Pclose(acc_tpl);
-        VRFY((ret >= 0), "");
-
         /* close the file */
         ret = H5Fclose(fid);
         VRFY((ret >= 0), "");
 
         /* delete the test file */
-        if (sub_mpi_rank == 0) {
-            mrc = MPI_File_delete(filename, info);
-            /*VRFY((mrc==MPI_SUCCESS), ""); */
+        H5E_BEGIN_TRY
+        {
+            ret = H5Fdelete(filename, acc_tpl);
         }
+        H5E_END_TRY;
+        VRFY((ret >= 0), "H5Fdelete succeeded");
+
+        /* Release file-access template */
+        ret = H5Pclose(acc_tpl);
+        VRFY((ret >= 0), "");
     }
     mrc = MPI_Comm_free(&comm);
     VRFY((mrc == MPI_SUCCESS), "MPI_Comm_free succeeded");
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index 0781594..8895c15 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -192,8 +192,6 @@ filter_read_internal(const char *filename, hid_t dcpl, hsize_t *dset_size)
  * Programmer:    Christian Chilan
  *              Tuesday, May 15, 2007
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
diff --git a/testpar/t_pread.c b/testpar/t_pread.c
index 9a2493d..d05ec46 100644
--- a/testpar/t_pread.c
+++ b/testpar/t_pread.c
@@ -77,8 +77,6 @@ static char *test_argv0 = NULL;
  * Programmer:  Richard Warren
  *              10/1/17
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -483,8 +481,6 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
  * Programmer:  Richard Warren
  *              10/1/17
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index cbae5e1..c11f95c 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -4305,7 +4305,8 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0) {
-        HDprintf("%d: Failed to turn off atexit processing. Continue.\n", mpi_rank);
+        if (MAINPROCESS)
+            HDprintf("%d: Failed to turn off atexit processing. Continue.\n", mpi_rank);
     };
     H5open();
     h5_show_hostname();
diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c
index 512aa5b..86cfe2f 100644
--- a/testpar/t_vfd.c
+++ b/testpar/t_vfd.c
@@ -117,10 +117,6 @@ static unsigned vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size
  * Programmer:  John Mainzer
  *              3/25/26
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -199,10 +195,6 @@ alloc_and_init_file_images(int mpi_size)
  * Programmer:  John Mainzer
  *              1/25/17
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -261,10 +253,6 @@ free_file_images(void)
  * Programmer:  John Mainzer
  *              3/25/26
  *
- * Modifications:
- *
- *              Updated for subfiling VFD                  9/29/30
- *
  *-------------------------------------------------------------------------
  */
 
@@ -535,10 +523,6 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
  * Programmer:  John Mainzer
  *              3/25/26
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -658,10 +642,6 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap
  * Programmer:  John Mainzer
  *              3/26/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -895,10 +875,6 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
  * Programmer:  John Mainzer
  *              3/26/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -1199,10 +1175,6 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
  * Programmer:  John Mainzer
  *              3/26/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -1559,10 +1531,6 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
  * Programmer:  John Mainzer
  *              3/26/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -1994,10 +1962,6 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
  * Programmer:  John Mainzer
  *              3/26/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -2240,10 +2204,6 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
  * Programmer:  John Mainzer
  *              3/26/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -2433,10 +2393,6 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
  * Programmer:  John Mainzer
  *              3/28/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -2689,10 +2645,6 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
  * Programmer:  John Mainzer
  *              3/31/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -2956,10 +2908,6 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
  * Programmer:  John Mainzer
  *              3/31/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -3261,10 +3209,6 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
  * Programmer:  John Mainzer
  *              3/31/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -3704,10 +3648,6 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
  * Programmer:  John Mainzer
  *              3/26/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -3965,10 +3905,6 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
  * Programmer:  John Mainzer
  *              10/10/21
  *
- * Modifications:
- *
- *        None.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -4190,8 +4126,6 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
  * Programmer:  John Mainzer
  *              3/2621/
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */