Updated subfiling_VFD with Selection_io (#1352)

Merged selection_io branch into the subfiling branch.

18 files changed, 183 insertions, 183 deletions

diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index d5b9038..2be4ae4 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -33,7 +33,7 @@
 #include "mpi.h"
 
 /* For this test, we don't want to inherit the RANK definition
- * from testphdf5.h.  We'll define MAX_RANK to accomodate 3D arrays
+ * from testphdf5.h.  We'll define MAX_RANK to accommodate 3D arrays
  * and use that definition rather than RANK.
  */
 #ifndef MAX_RANK
@@ -3323,7 +3323,7 @@ none_selection_chunk(void)
  *                  Simple independent I/O. This tests that the defaults are properly set.
  *
  *              TEST_ACTUAL_IO_RESET:
- *                  Perfroms collective and then independent I/O wit hthe same dxpl to
+ *                  Performs collective and then independent I/O with hthe same dxpl to
  *                  make sure the peroperty is correctly reset to the default on each use.
  *                  Specifically, this test runs TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_MIX_DISAGREE
  *                  (The most complex case that works on all builds) and then performs
@@ -3332,7 +3332,7 @@ none_selection_chunk(void)
  *          Note: DIRECT_MULTI_CHUNK_MIX and DIRECT_MULTI_CHUNK_MIX_DISAGREE
  *          is not needed as they are covered by DIRECT_CHUNK_MIX and
  *          MULTI_CHUNK_MIX_DISAGREE cases. _DIRECT_ cases are only for testing
- *          path way to multi-chunk-io by H5FD_MPIO_CHUNK_MULTI_IO insted of num-threshold.
+ *          path way to multi-chunk-io by H5FD_MPIO_CHUNK_MULTI_IO instead of num-threshold.
  *
  * Modification:
  *  - Refctore to remove multi-chunk-without-opimization test and update for
@@ -3347,12 +3347,12 @@ none_selection_chunk(void)
 static void
 test_actual_io_mode(int selection_mode)
 {
-    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_write    = -1;
-    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_read     = -1;
-    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_expected = -1;
-    H5D_mpio_actual_io_mode_t        actual_io_mode_write           = -1;
-    H5D_mpio_actual_io_mode_t        actual_io_mode_read            = -1;
-    H5D_mpio_actual_io_mode_t        actual_io_mode_expected        = -1;
+    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_write    = H5D_MPIO_NO_CHUNK_OPTIMIZATION;
+    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_read     = H5D_MPIO_NO_CHUNK_OPTIMIZATION;
+    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_expected = H5D_MPIO_NO_CHUNK_OPTIMIZATION;
+    H5D_mpio_actual_io_mode_t        actual_io_mode_write           = H5D_MPIO_NO_COLLECTIVE;
+    H5D_mpio_actual_io_mode_t        actual_io_mode_read            = H5D_MPIO_NO_COLLECTIVE;
+    H5D_mpio_actual_io_mode_t        actual_io_mode_expected        = H5D_MPIO_NO_COLLECTIVE;
     const char *                     filename;
     const char *                     test_name;
     hbool_t                          direct_multi_chunk_io;
@@ -3520,7 +3520,7 @@ test_actual_io_mode(int selection_mode)
             break;
 
         /* RESET tests that the properties are properly reset to defaults each time I/O is
-         * performed. To acheive this, we have RESET perform collective I/O (which would change
+         * performed. To achieve this, we have RESET perform collective I/O (which would change
          * the values from the defaults) followed by independent I/O (which should report the
          * default values). RESET doesn't need to have a unique selection, so we reuse
          * MULTI_CHUMK_MIX_DISAGREE, which was chosen because it is a complex case that works
@@ -3536,7 +3536,7 @@ test_actual_io_mode(int selection_mode)
              * assgigned collective I/O, while each other process gets independent I/O.
              * Since the root process with only access the first chunk, it will report
              * collective I/O. The subsequent processes will access the first chunk
-             * collectively, and their other chunk indpendently, reporting mixed I/O.
+             * collectively, and their other chunk independently, reporting mixed I/O.
              */
 
             if (mpi_rank == 0) {
@@ -3605,8 +3605,8 @@ test_actual_io_mode(int selection_mode)
 
         default:
             test_name                      = "Undefined Selection Mode";
-            actual_chunk_opt_mode_expected = -1;
-            actual_io_mode_expected        = -1;
+            actual_chunk_opt_mode_expected = H5D_MPIO_NO_CHUNK_OPTIMIZATION;
+            actual_io_mode_expected        = H5D_MPIO_NO_COLLECTIVE;
             break;
     }
 
@@ -3651,7 +3651,7 @@ test_actual_io_mode(int selection_mode)
             ret = H5Pset_dxpl_mpio_chunk_opt_num(dxpl_write, (unsigned)mpi_size * 2);
             VRFY((ret >= 0), "H5Pset_dxpl_mpio_chunk_opt_num succeeded");
 
-            /* set this to manipulate testing senario about allocating processes
+            /* set this to manipulate testing scenario about allocating processes
              * to chunks */
             ret = H5Pset_dxpl_mpio_chunk_opt_ratio(dxpl_write, (unsigned)99);
             VRFY((ret >= 0), "H5Pset_dxpl_mpio_chunk_opt_ratio succeeded");
@@ -3675,12 +3675,12 @@ test_actual_io_mode(int selection_mode)
         H5Eprint2(H5E_DEFAULT, stdout);
     VRFY((ret >= 0), "H5Dwrite() dataset multichunk write succeeded");
 
-    /* Retreive Actual io valuess */
+    /* Retrieve Actual io values */
     ret = H5Pget_mpio_actual_io_mode(dxpl_write, &actual_io_mode_write);
-    VRFY((ret >= 0), "retriving actual io mode suceeded");
+    VRFY((ret >= 0), "retrieving actual io mode succeeded");
 
     ret = H5Pget_mpio_actual_chunk_opt_mode(dxpl_write, &actual_chunk_opt_mode_write);
-    VRFY((ret >= 0), "retriving actual chunk opt mode succeeded");
+    VRFY((ret >= 0), "retrieving actual chunk opt mode succeeded");
 
     /* Read */
     ret = H5Dread(dataset, data_type, mem_space, file_space, dxpl_read, buffer);
@@ -3688,12 +3688,12 @@ test_actual_io_mode(int selection_mode)
         H5Eprint2(H5E_DEFAULT, stdout);
     VRFY((ret >= 0), "H5Dread() dataset multichunk read succeeded");
 
-    /* Retreive Actual io values */
+    /* Retrieve Actual io values */
     ret = H5Pget_mpio_actual_io_mode(dxpl_read, &actual_io_mode_read);
-    VRFY((ret >= 0), "retriving actual io mode succeeded");
+    VRFY((ret >= 0), "retrieving actual io mode succeeded");
 
     ret = H5Pget_mpio_actual_chunk_opt_mode(dxpl_read, &actual_chunk_opt_mode_read);
-    VRFY((ret >= 0), "retriving actual chunk opt mode succeeded");
+    VRFY((ret >= 0), "retrieving actual chunk opt mode succeeded");
 
     /* Check write vs read */
     VRFY((actual_io_mode_read == actual_io_mode_write),
@@ -3714,7 +3714,7 @@ test_actual_io_mode(int selection_mode)
                   actual_io_mode_write);
     }
 
-    /* To test that the property is succesfully reset to the default, we perform some
+    /* To test that the property is successfully reset to the default, we perform some
      * independent I/O after the collective I/O
      */
     if (selection_mode == TEST_ACTUAL_IO_RESET) {
@@ -3731,9 +3731,9 @@ test_actual_io_mode(int selection_mode)
 
             /* Check Properties */
             ret = H5Pget_mpio_actual_io_mode(dxpl_write, &actual_io_mode_write);
-            VRFY((ret >= 0), "retriving actual io mode succeeded");
+            VRFY((ret >= 0), "retrieving actual io mode succeeded");
             ret = H5Pget_mpio_actual_chunk_opt_mode(dxpl_write, &actual_chunk_opt_mode_write);
-            VRFY((ret >= 0), "retriving actual chunk opt mode succeeded");
+            VRFY((ret >= 0), "retrieving actual chunk opt mode succeeded");
 
             VRFY(actual_chunk_opt_mode_write == H5D_MPIO_NO_CHUNK_OPTIMIZATION,
                  "actual_chunk_opt_mode has correct value for reset write (independent)");
@@ -3746,9 +3746,9 @@ test_actual_io_mode(int selection_mode)
 
             /* Check Properties */
             ret = H5Pget_mpio_actual_io_mode(dxpl_read, &actual_io_mode_read);
-            VRFY((ret >= 0), "retriving actual io mode succeeded");
+            VRFY((ret >= 0), "retrieving actual io mode succeeded");
             ret = H5Pget_mpio_actual_chunk_opt_mode(dxpl_read, &actual_chunk_opt_mode_read);
-            VRFY((ret >= 0), "retriving actual chunk opt mode succeeded");
+            VRFY((ret >= 0), "retrieving actual chunk opt mode succeeded");
 
             VRFY(actual_chunk_opt_mode_read == H5D_MPIO_NO_CHUNK_OPTIMIZATION,
                  "actual_chunk_opt_mode has correct value for reset read (independent)");
@@ -3794,11 +3794,11 @@ actual_io_mode_tests(void)
     test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_IND);
     test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_COL);
 
-    /* The Multi Chunk Mixed test requires atleast three processes. */
+    /* The Multi Chunk Mixed test requires at least three processes. */
     if (mpi_size > 2)
         test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX);
     else
-        HDfprintf(stdout, "Multi Chunk Mixed test requires 3 proceses minimum\n");
+        HDfprintf(stdout, "Multi Chunk Mixed test requires 3 processes minimum\n");
 
     test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX_DISAGREE);
 
@@ -3842,7 +3842,7 @@ actual_io_mode_tests(void)
  *         Test for Data Type Conversion as the cause of breaking collective I/O.
  *
  *       TEST_DATA_TRANSFORMS:
- *         Test for Data Transfrom feature as the cause of breaking collective I/O.
+ *         Test for Data Transform feature as the cause of breaking collective I/O.
  *
  *       TEST_NOT_SIMPLE_OR_SCALAR_DATASPACES:
  *         Test for NULL dataspace as the cause of breaking collective I/O.
@@ -4004,7 +4004,7 @@ test_no_collective_cause_mode(int selection_mode)
     }
 
     if (selection_mode & TEST_DATA_TRANSFORMS) {
-        test_name = "Broken Collective I/O - DATA Transfroms";
+        test_name = "Broken Collective I/O - DATA Transforms";
         no_collective_cause_local_expected |= H5D_MPIO_DATA_TRANSFORMS;
         no_collective_cause_global_expected |= H5D_MPIO_DATA_TRANSFORMS;
     }
@@ -4102,7 +4102,7 @@ test_no_collective_cause_mode(int selection_mode)
     /* Get the cause of broken collective I/O */
     ret = H5Pget_mpio_no_collective_cause(dxpl_write, &no_collective_cause_local_write,
                                           &no_collective_cause_global_write);
-    VRFY((ret >= 0), "retriving no collective cause succeeded");
+    VRFY((ret >= 0), "retrieving no collective cause succeeded");
 
     /*---------------------
      * Test Read access
@@ -4122,7 +4122,7 @@ test_no_collective_cause_mode(int selection_mode)
     /* Get the cause of broken collective I/O */
     ret = H5Pget_mpio_no_collective_cause(dxpl_read, &no_collective_cause_local_read,
                                           &no_collective_cause_global_read);
-    VRFY((ret >= 0), "retriving no collective cause succeeded");
+    VRFY((ret >= 0), "retrieving no collective cause succeeded");
 
     /* Check write vs read */
     VRFY((no_collective_cause_local_read == no_collective_cause_local_write),
@@ -4368,7 +4368,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
 
     /* Get the cause of broken collective I/O */
     ret = H5Pget_mpio_no_collective_cause (dxpl, &no_collective_cause_local_read, &no_collective_cause_global_read);
-    VRFY((ret >= 0), "retriving no collective cause succeeded" );
+    VRFY((ret >= 0), "retrieving no collective cause succeeded" );
 
     /* Test values */
     HDmemset (message, 0, sizeof (message));
@@ -4547,7 +4547,7 @@ dataset_atomicity(void)
     /* file locking allows only one file open (serial) for writing */
     if (MAINPROCESS) {
         fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT);
-        VRFY((fid >= 0), "H5Fopen succeeed");
+        VRFY((fid >= 0), "H5Fopen succeeded");
     }
 
     /* should fail */
diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c
index 4389ea5..c201352 100644
--- a/testpar/t_bigio.c
+++ b/testpar/t_bigio.c
@@ -1333,7 +1333,7 @@ coll_chunk2(void)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: one singular selection accross many chunks
+ *  Descriptions for the selection: one singular selection across many chunks
  *  Two dimensions, Num of chunks = 2* mpi_size
  *
  *  dim1       = space_dim1*mpi_size
@@ -1842,7 +1842,7 @@ main(int argc, char **argv)
     /* Set the bigio processing limit to be 'newsize' bytes */
     hsize_t oldsize = H5_mpi_set_bigio_count(newsize);
 
-    /* Having set the bigio handling to a size that is managable,
+    /* Having set the bigio handling to a size that is manageable,
      * we'll set our 'bigcount' variable to be 2X that limit so
      * that we try to ensure that our bigio handling is actually
      * envoked and tested.
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 8696092..8c96756 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -126,7 +126,7 @@ int total_writes = 0;
  *
  *    local_pinned:    Boolean flag that is set to true iff the entry
  *        has been pinned in the local cache, but probably not all
- *        caches.  Such pins will typically not be consistant across
+ *        caches.  Such pins will typically not be consistent across
  *        processes, and thus cannot be marked as dirty unless they
  *        happen to overlap some collective operation.
  *
@@ -205,7 +205,7 @@ struct datum data[NUM_DATA_ENTRIES];
  * even divisor of NUM_DATA_ENTRIES.  So far, all tests have been with
  * powers of 10 that meet these criteria.
  *
- * Further, this value must be consistant across all processes.
+ * Further, this value must be consistent across all processes.
  */
 
 #define STD_VIRT_NUM_DATA_ENTRIES     NUM_DATA_ENTRIES
@@ -252,7 +252,7 @@ int data_index[NUM_DATA_ENTRIES];
  *
  * Strangely, at least on Phoenix, the first solution runs faster by a
  * rather large margin.  However, I can imagine this changing with
- * different OS's and MPI implementatins.
+ * different OS's and MPI implementations.
  *
  * Thus I have left code supporting the second solution in place.
  *
@@ -1282,7 +1282,7 @@ reset_server_counters(void)
  * Function:    server_main()
  *
  * Purpose:    Main function for the server process.  This process exists
- *        to provide an independant view of the data array.
+ *        to provide an independent view of the data array.
  *
  *        The function handles request from the other processes in
  *        the test until the count of done messages received equals
@@ -3962,7 +3962,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
  * Purpose:    Verify that the indicated entries have been written exactly
  *        once each, and that the indicated total number of writes
  *        has been processed by the server process.  Flag an error if
- *        discrepency is noted.  Finally reset the counters maintained
+ *        discrepancy is noted.  Finally reset the counters maintained
  *        by the server process.
  *
  *        This function should only be called by the metadata cache
@@ -4050,7 +4050,7 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl)
 
     /* final barrier to ensure that all processes think that the server
      * counters have been reset before we leave the sync point.  This
-     * barrier is probaby not necessary at this point in time (5/9/10),
+     * barrier is probably not necessary at this point in time (5/9/10),
      * but I can think of at least one likely change to the metadata write
      * strategies that will require it -- hence its insertion now.
      */
@@ -4794,7 +4794,7 @@ server_smoke_check(void)
 
         if (!server_main()) {
 
-            /* some error occured in the server -- report failure */
+            /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
                 HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
@@ -5141,7 +5141,7 @@ smoke_check_1(int metadata_write_strategy)
 
         if (!server_main()) {
 
-            /* some error occured in the server -- report failure */
+            /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
                 HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
@@ -5305,7 +5305,7 @@ smoke_check_2(int metadata_write_strategy)
 
         if (!server_main()) {
 
-            /* some error occured in the server -- report failure */
+            /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
                 HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
@@ -5453,7 +5453,7 @@ smoke_check_2(int metadata_write_strategy)
  *
  * Purpose:    Third smoke check for the parallel cache.
  *
- *        Use random reads to vary the loads on the diffferent
+ *        Use random reads to vary the loads on the different
  *        processors.  Also force different cache size adjustments.
  *
  *        In this test, load process 0 heavily, and the other
@@ -5510,7 +5510,7 @@ smoke_check_3(int metadata_write_strategy)
 
         if (!server_main()) {
 
-            /* some error occured in the server -- report failure */
+            /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
                 HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
@@ -5738,7 +5738,7 @@ smoke_check_3(int metadata_write_strategy)
  *
  * Purpose:    Fourth smoke check for the parallel cache.
  *
- *        Use random reads to vary the loads on the diffferent
+ *        Use random reads to vary the loads on the different
  *        processors.  Also force different cache size adjustments.
  *
  *        In this test, load process 0 lightly, and the other
@@ -5795,7 +5795,7 @@ smoke_check_4(int metadata_write_strategy)
 
         if (!server_main()) {
 
-            /* some error occured in the server -- report failure */
+            /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
                 HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
@@ -6070,7 +6070,7 @@ smoke_check_5(int metadata_write_strategy)
 
         if (!server_main()) {
 
-            /* some error occured in the server -- report failure */
+            /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
                 HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
@@ -6355,7 +6355,7 @@ trace_file_check(int metadata_write_strategy)
 
         if (!server_main()) {
 
-            /* some error occured in the server -- report failure */
+            /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose)
                 HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
@@ -6660,7 +6660,7 @@ smoke_check_6(int metadata_write_strategy)
 
         if (!server_main()) {
 
-            /* some error occured in the server -- report failure */
+            /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
                 HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index 17fb992..feb4325 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -449,7 +449,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
             }
 
             /* set the dataset creation plist to specify that the raw data is
-             * to be partioned into 10X10 element chunks.
+             * to be partitioned into 10X10 element chunks.
              */
 
             if (pass) {
@@ -795,7 +795,7 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset)
  *        Set pass to FALSE and issue a suitable failure
  *        message if either the file contains a metadata cache image
  *        superblock extension and mdci_sbem_expected is TRUE, or
- *        vise versa.
+ *        vice versa.
  *
  *        If mdci_sbem_expected is TRUE, also verify that the metadata
  *        cache has been advised of this.
@@ -807,7 +807,7 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset)
  *        FAPL entry when opening the file, and verify that the
  *        metadata cache is notified.
  *
- *        If config_fsm is TRUE, setup the persistant free space
+ *        If config_fsm is TRUE, setup the persistent free space
  *        manager.  Note that this flag may only be set if
  *        create_file is also TRUE.
  *
@@ -884,7 +884,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     if (show_progress)
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
-    /* create a file access propertly list. */
+    /* create a file access property list. */
     if (pass) {
 
         fapl_id = H5Pcreate(H5P_FILE_ACCESS);
@@ -956,7 +956,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     if (show_progress)
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
-    /* setup the persistant free space manager if indicated */
+    /* setup the persistent free space manager if indicated */
     if ((pass) && (config_fsm)) {
 
         fcpl_id = H5Pcreate(H5P_FILE_CREATE);
@@ -1138,13 +1138,13 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
         if ((file_ptr->shared->page_buf) && ((!enable_page_buffer) || (l_facc_type == FACC_MPIO))) {
 
             pass         = FALSE;
-            failure_mssg = "page buffer unexepectedly enabled.";
+            failure_mssg = "page buffer unexpectedly enabled.";
         }
         else if ((file_ptr->shared->page_buf != NULL) &&
                  ((enable_page_buffer) || (l_facc_type != FACC_MPIO))) {
 
             pass         = FALSE;
-            failure_mssg = "page buffer unexepectedly disabled.";
+            failure_mssg = "page buffer unexpectedly disabled.";
         }
     }
 
@@ -1360,7 +1360,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* set the dataset creation plist to specify that the raw data is
-     * to be partioned into 1X10X10 element chunks.
+     * to be partitioned into 1X10X10 element chunks.
      */
 
     if (pass) {
@@ -2796,7 +2796,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
         /* Verify that all other processes receive the cache image block
          * from process 0.
          *
-         * Since we have alread verified that only process 0 has read the
+         * Since we have already verified that only process 0 has read the
          * image, it is sufficient to verify that the image was loaded on
          * all processes.
          */
@@ -3067,7 +3067,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
         /* Verify that all other processes receive the cache image block
          * from process 0.
          *
-         * Since we have alread verified that only process 0 has read the
+         * Since we have already verified that only process 0 has read the
          * image, it is sufficient to verify that the image was loaded on
          * all processes.
          */
@@ -3393,7 +3393,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
         /* Verify that all other processes receive the cache image block
          * from process 0.
          *
-         * Since we have alread verified that only process 0 has read the
+         * Since we have already verified that only process 0 has read the
          * image, it is sufficient to verify that the image was loaded on
          * all processes.
          */
@@ -3488,7 +3488,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
         /* Verify that all other processes receive the cache image block
          * from process 0.
          *
-         * Since we have alread verified that only process 0 has read the
+         * Since we have already verified that only process 0 has read the
          * image, it is sufficient to verify that the image was loaded on
          * all processes.
          */
@@ -3533,9 +3533,9 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Get the size of the file.  Verify that it is less
-     *     than 20 KB.  Without deletions and persistant free
+     *     than 20 KB.  Without deletions and persistent free
      *     space managers, size size is about 30 MB, so this
-     *     is sufficient to verify that the persistant free
+     *     is sufficient to verify that the persistent free
      *     space managers are more or less doing their job.
      *
      *     Note that this test will have to change if we use
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index 29341d7..20efaa1 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -155,7 +155,7 @@ coll_chunk2(void)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: one singular selection accross many chunks
+ *  Descriptions for the selection: one singular selection across many chunks
  *  Two dimensions, Num of chunks = 2* mpi_size
  *
  *  dim1       = SPACE_DIM1*mpi_size
@@ -209,7 +209,7 @@ coll_chunk3(void)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: one singular selection accross many chunks
+ *  Descriptions for the selection: one singular selection across many chunks
  *  Two dimensions, Num of chunks = 2* mpi_size
  *
  *  dim1       = SPACE_DIM1*mpi_size
@@ -261,7 +261,7 @@ coll_chunk4(void)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: one singular selection accross many chunks
+ *  Descriptions for the selection: one singular selection across many chunks
  *  Two dimensions, Num of chunks = 2* mpi_size
  *
  *  dim1       = SPACE_DIM1*mpi_size
@@ -315,7 +315,7 @@ coll_chunk5(void)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: one singular selection accross many chunks
+ *  Descriptions for the selection: one singular selection across many chunks
  *  Two dimensions, Num of chunks = 2* mpi_size
  *
  *  dim1       = SPACE_DIM1*mpi_size
@@ -367,7 +367,7 @@ coll_chunk6(void)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: one singular selection accross many chunks
+ *  Descriptions for the selection: one singular selection across many chunks
  *  Two dimensions, Num of chunks = 2* mpi_size
  *
  *  dim1       = SPACE_DIM1*mpi_size
@@ -419,7 +419,7 @@ coll_chunk7(void)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: one singular selection accross many chunks
+ *  Descriptions for the selection: one singular selection across many chunks
  *  Two dimensions, Num of chunks = 2* mpi_size
  *
  *  dim1       = SPACE_DIM1*mpi_size
@@ -471,7 +471,7 @@ coll_chunk8(void)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: one singular selection accross many chunks
+ *  Descriptions for the selection: one singular selection across many chunks
  *  Two dimensions, Num of chunks = 2* mpi_size
  *
  *  dim1       = SPACE_DIM1*mpi_size
@@ -523,7 +523,7 @@ coll_chunk9(void)
  */
 
 /* ------------------------------------------------------------------------
- *  Descriptions for the selection: one singular selection accross many chunks
+ *  Descriptions for the selection: one singular selection across many chunks
  *  Two dimensions, Num of chunks = 2* mpi_size
  *
  *  dim1       = SPACE_DIM1*mpi_size
diff --git a/testpar/t_coll_md_read.c b/testpar/t_coll_md_read.c
index fd62eb6..66f3151 100644
--- a/testpar/t_coll_md_read.c
+++ b/testpar/t_coll_md_read.c
@@ -351,7 +351,7 @@ test_multi_chunk_io_addrmap_issue(void)
  * ranks must exceed or equal 10000. In other words, each MPI rank must be
  * responsible for 10000 or more unique chunks.
  *
- * Condition 3: This test will currently only be reliably reproducable for 2 or 3
+ * Condition 3: This test will currently only be reliably reproducible for 2 or 3
  * MPI ranks. The threshold value calculated reduces to a constant 100 / mpi_size,
  * and is compared against a default value of 30%.
  *
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 19caff5..fa34980 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -2881,7 +2881,7 @@ none_selection_chunk(void)
  *                  Simple independent I/O. This tests that the defaults are properly set.
  *
  *              TEST_ACTUAL_IO_RESET:
- *                  Perfroms collective and then independent I/O wit hthe same dxpl to
+ *                  Performs collective and then independent I/O with hthe same dxpl to
  *                  make sure the peroperty is correctly reset to the default on each use.
  *                  Specifically, this test runs TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_MIX_DISAGREE
  *                  (The most complex case that works on all builds) and then performs
@@ -2890,7 +2890,7 @@ none_selection_chunk(void)
  *          Note: DIRECT_MULTI_CHUNK_MIX and DIRECT_MULTI_CHUNK_MIX_DISAGREE
  *          is not needed as they are covered by DIRECT_CHUNK_MIX and
  *          MULTI_CHUNK_MIX_DISAGREE cases. _DIRECT_ cases are only for testing
- *          path way to multi-chunk-io by H5FD_MPIO_CHUNK_MULTI_IO insted of num-threshold.
+ *          path way to multi-chunk-io by H5FD_MPIO_CHUNK_MULTI_IO instead of num-threshold.
  *
  * Modification:
  *  - Refctore to remove multi-chunk-without-opimization test and update for
@@ -2905,12 +2905,12 @@ none_selection_chunk(void)
 static void
 test_actual_io_mode(int selection_mode)
 {
-    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_write    = -1;
-    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_read     = -1;
-    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_expected = -1;
-    H5D_mpio_actual_io_mode_t        actual_io_mode_write           = -1;
-    H5D_mpio_actual_io_mode_t        actual_io_mode_read            = -1;
-    H5D_mpio_actual_io_mode_t        actual_io_mode_expected        = -1;
+    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_write    = H5D_MPIO_NO_CHUNK_OPTIMIZATION;
+    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_read     = H5D_MPIO_NO_CHUNK_OPTIMIZATION;
+    H5D_mpio_actual_chunk_opt_mode_t actual_chunk_opt_mode_expected = H5D_MPIO_NO_CHUNK_OPTIMIZATION;
+    H5D_mpio_actual_io_mode_t        actual_io_mode_write           = H5D_MPIO_NO_COLLECTIVE;
+    H5D_mpio_actual_io_mode_t        actual_io_mode_read            = H5D_MPIO_NO_COLLECTIVE;
+    H5D_mpio_actual_io_mode_t        actual_io_mode_expected        = H5D_MPIO_NO_COLLECTIVE;
     const char *                     filename;
     const char *                     test_name;
     hbool_t                          direct_multi_chunk_io;
@@ -3078,7 +3078,7 @@ test_actual_io_mode(int selection_mode)
             break;
 
         /* RESET tests that the properties are properly reset to defaults each time I/O is
-         * performed. To acheive this, we have RESET perform collective I/O (which would change
+         * performed. To achieve this, we have RESET perform collective I/O (which would change
          * the values from the defaults) followed by independent I/O (which should report the
          * default values). RESET doesn't need to have a unique selection, so we reuse
          * MULTI_CHUMK_MIX_DISAGREE, which was chosen because it is a complex case that works
@@ -3094,7 +3094,7 @@ test_actual_io_mode(int selection_mode)
              * assgigned collective I/O, while each other process gets independent I/O.
              * Since the root process with only access the first chunk, it will report
              * collective I/O. The subsequent processes will access the first chunk
-             * collectively, and their other chunk indpendently, reporting mixed I/O.
+             * collectively, and their other chunk independently, reporting mixed I/O.
              */
 
             if (mpi_rank == 0) {
@@ -3163,8 +3163,8 @@ test_actual_io_mode(int selection_mode)
 
         default:
             test_name                      = "Undefined Selection Mode";
-            actual_chunk_opt_mode_expected = -1;
-            actual_io_mode_expected        = -1;
+            actual_chunk_opt_mode_expected = H5D_MPIO_NO_CHUNK_OPTIMIZATION;
+            actual_io_mode_expected        = H5D_MPIO_NO_COLLECTIVE;
             break;
     }
 
@@ -3209,7 +3209,7 @@ test_actual_io_mode(int selection_mode)
             ret = H5Pset_dxpl_mpio_chunk_opt_num(dxpl_write, (unsigned)mpi_size * 2);
             VRFY((ret >= 0), "H5Pset_dxpl_mpio_chunk_opt_num succeeded");
 
-            /* set this to manipulate testing senario about allocating processes
+            /* set this to manipulate testing scenario about allocating processes
              * to chunks */
             ret = H5Pset_dxpl_mpio_chunk_opt_ratio(dxpl_write, (unsigned)99);
             VRFY((ret >= 0), "H5Pset_dxpl_mpio_chunk_opt_ratio succeeded");
@@ -3233,12 +3233,12 @@ test_actual_io_mode(int selection_mode)
         H5Eprint2(H5E_DEFAULT, stdout);
     VRFY((ret >= 0), "H5Dwrite() dataset multichunk write succeeded");
 
-    /* Retreive Actual io valuess */
+    /* Retrieve Actual io values */
     ret = H5Pget_mpio_actual_io_mode(dxpl_write, &actual_io_mode_write);
-    VRFY((ret >= 0), "retriving actual io mode suceeded");
+    VRFY((ret >= 0), "retrieving actual io mode succeeded");
 
     ret = H5Pget_mpio_actual_chunk_opt_mode(dxpl_write, &actual_chunk_opt_mode_write);
-    VRFY((ret >= 0), "retriving actual chunk opt mode succeeded");
+    VRFY((ret >= 0), "retrieving actual chunk opt mode succeeded");
 
     /* Read */
     ret = H5Dread(dataset, data_type, mem_space, file_space, dxpl_read, buffer);
@@ -3246,12 +3246,12 @@ test_actual_io_mode(int selection_mode)
         H5Eprint2(H5E_DEFAULT, stdout);
     VRFY((ret >= 0), "H5Dread() dataset multichunk read succeeded");
 
-    /* Retreive Actual io values */
+    /* Retrieve Actual io values */
     ret = H5Pget_mpio_actual_io_mode(dxpl_read, &actual_io_mode_read);
-    VRFY((ret >= 0), "retriving actual io mode succeeded");
+    VRFY((ret >= 0), "retrieving actual io mode succeeded");
 
     ret = H5Pget_mpio_actual_chunk_opt_mode(dxpl_read, &actual_chunk_opt_mode_read);
-    VRFY((ret >= 0), "retriving actual chunk opt mode succeeded");
+    VRFY((ret >= 0), "retrieving actual chunk opt mode succeeded");
 
     /* Check write vs read */
     VRFY((actual_io_mode_read == actual_io_mode_write),
@@ -3272,7 +3272,7 @@ test_actual_io_mode(int selection_mode)
                   actual_io_mode_write);
     }
 
-    /* To test that the property is succesfully reset to the default, we perform some
+    /* To test that the property is successfully reset to the default, we perform some
      * independent I/O after the collective I/O
      */
     if (selection_mode == TEST_ACTUAL_IO_RESET) {
@@ -3289,9 +3289,9 @@ test_actual_io_mode(int selection_mode)
 
             /* Check Properties */
             ret = H5Pget_mpio_actual_io_mode(dxpl_write, &actual_io_mode_write);
-            VRFY((ret >= 0), "retriving actual io mode succeeded");
+            VRFY((ret >= 0), "retrieving actual io mode succeeded");
             ret = H5Pget_mpio_actual_chunk_opt_mode(dxpl_write, &actual_chunk_opt_mode_write);
-            VRFY((ret >= 0), "retriving actual chunk opt mode succeeded");
+            VRFY((ret >= 0), "retrieving actual chunk opt mode succeeded");
 
             VRFY(actual_chunk_opt_mode_write == H5D_MPIO_NO_CHUNK_OPTIMIZATION,
                  "actual_chunk_opt_mode has correct value for reset write (independent)");
@@ -3304,9 +3304,9 @@ test_actual_io_mode(int selection_mode)
 
             /* Check Properties */
             ret = H5Pget_mpio_actual_io_mode(dxpl_read, &actual_io_mode_read);
-            VRFY((ret >= 0), "retriving actual io mode succeeded");
+            VRFY((ret >= 0), "retrieving actual io mode succeeded");
             ret = H5Pget_mpio_actual_chunk_opt_mode(dxpl_read, &actual_chunk_opt_mode_read);
-            VRFY((ret >= 0), "retriving actual chunk opt mode succeeded");
+            VRFY((ret >= 0), "retrieving actual chunk opt mode succeeded");
 
             VRFY(actual_chunk_opt_mode_read == H5D_MPIO_NO_CHUNK_OPTIMIZATION,
                  "actual_chunk_opt_mode has correct value for reset read (independent)");
@@ -3363,11 +3363,11 @@ actual_io_mode_tests(void)
         test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_IND);
         test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_COL);
 
-        /* The Multi Chunk Mixed test requires atleast three processes. */
+        /* The Multi Chunk Mixed test requires at least three processes. */
         if (mpi_size > 2)
             test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX);
         else
-            HDfprintf(stdout, "Multi Chunk Mixed test requires 3 proceses minimum\n");
+            HDfprintf(stdout, "Multi Chunk Mixed test requires 3 processes minimum\n");
 
         test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX_DISAGREE);
 
@@ -3413,7 +3413,7 @@ actual_io_mode_tests(void)
  *         Test for Data Type Conversion as the cause of breaking collective I/O.
  *
  *       TEST_DATA_TRANSFORMS:
- *         Test for Data Transfrom feature as the cause of breaking collective I/O.
+ *         Test for Data Transform feature as the cause of breaking collective I/O.
  *
  *       TEST_NOT_SIMPLE_OR_SCALAR_DATASPACES:
  *         Test for NULL dataspace as the cause of breaking collective I/O.
@@ -3577,7 +3577,7 @@ test_no_collective_cause_mode(int selection_mode)
     }
 
     if (selection_mode & TEST_DATA_TRANSFORMS) {
-        test_name = "Broken Collective I/O - DATA Transfroms";
+        test_name = "Broken Collective I/O - DATA Transforms";
         no_collective_cause_local_expected |= H5D_MPIO_DATA_TRANSFORMS;
         no_collective_cause_global_expected |= H5D_MPIO_DATA_TRANSFORMS;
     }
@@ -3675,7 +3675,7 @@ test_no_collective_cause_mode(int selection_mode)
     /* Get the cause of broken collective I/O */
     ret = H5Pget_mpio_no_collective_cause(dxpl_write, &no_collective_cause_local_write,
                                           &no_collective_cause_global_write);
-    VRFY((ret >= 0), "retriving no collective cause succeeded");
+    VRFY((ret >= 0), "retrieving no collective cause succeeded");
 
     /*---------------------
      * Test Read access
@@ -3695,7 +3695,7 @@ test_no_collective_cause_mode(int selection_mode)
     /* Get the cause of broken collective I/O */
     ret = H5Pget_mpio_no_collective_cause(dxpl_read, &no_collective_cause_local_read,
                                           &no_collective_cause_global_read);
-    VRFY((ret >= 0), "retriving no collective cause succeeded");
+    VRFY((ret >= 0), "retrieving no collective cause succeeded");
 
     /* Check write vs read */
     VRFY((no_collective_cause_local_read == no_collective_cause_local_write),
@@ -3941,7 +3941,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
     /* Get the cause of broken collective I/O */
     ret = H5Pget_mpio_no_collective_cause(dxpl, &no_collective_cause_local_read,
                                           &no_collective_cause_global_read);
-    VRFY((ret >= 0), "retriving no collective cause succeeded");
+    VRFY((ret >= 0), "retrieving no collective cause succeeded");
 
     /* Test values */
     HDmemset(message, 0, sizeof(message));
@@ -4120,7 +4120,7 @@ dataset_atomicity(void)
     /* file locking allows only one file open (serial) for writing */
     if (MAINPROCESS) {
         fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT);
-        VRFY((fid >= 0), "H5Fopen succeeed");
+        VRFY((fid >= 0), "H5Fopen succeeded");
 
         /* should fail */
         H5E_BEGIN_TRY
diff --git a/testpar/t_file.c b/testpar/t_file.c
index 5348f4f..6c6ac69 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -106,7 +106,7 @@ test_split_comm_access(void)
 
         /* delete the test file */
         if (sub_mpi_rank == 0) {
-            mrc = MPI_File_delete((char *)filename, info);
+            mrc = MPI_File_delete(filename, info);
             /*VRFY((mrc==MPI_SUCCESS), ""); */
         }
     }
@@ -179,7 +179,7 @@ test_page_buffer_access(void)
 
     data = (int *)HDmalloc(sizeof(int) * (size_t)num_elements);
 
-    /* intialize all the elements to have a value of -1 */
+    /* initialize all the elements to have a value of -1 */
     for (i = 0; i < num_elements; i++)
         data[i] = -1;
     if (MAINPROCESS) {
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 3041e77..97d5966 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -1721,7 +1721,7 @@ io_mode_confusion(void)
  * Open the each of the data sets in turn.  If all opens are successful,
  * the test passes.  Otherwise the test fails.
  *
- * Note that this test will probably become irrelevent shortly, when we
+ * Note that this test will probably become irrelevant shortly, when we
  * land the journaling modifications on the trunk -- at which point all
  * cache clients will have to construct on disk images on demand.
  *
@@ -1782,7 +1782,7 @@ rr_obj_hdr_flush_confusion(void)
     mrc       = MPI_Comm_split(MPI_COMM_WORLD, is_reader, mpi_rank, &comm);
     VRFY((mrc == MPI_SUCCESS), "MPI_Comm_split");
 
-    /* The reader proocesses branches off to do reading
+    /* The reader processes branches off to do reading
      * while the writer processes continues to do writing
      * Whenever writers finish one writing step, including a H5Fflush,
      * they inform the readers, via MPI_COMM_WORLD, to verify.
@@ -2063,7 +2063,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
     /*
      * flush the metadata cache yet again to clean the object headers.
      *
-     * This is an attempt to crate a situation where we have dirty
+     * This is an attempt to create a situation where we have dirty
      * object header continuation chunks, but clean opject headers
      * to verify a speculative bug fix -- it doesn't seem to work,
      * but I will leave the code in anyway, as the object header
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index a8a756c..96cbc4b 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -215,7 +215,7 @@ test_mpio_gb_file(char *filename)
      * sizes.
      */
     if (MAINPROCESS) { /* only process 0 needs to check it*/
-        HDprintf("MPI_Offset is %s %d bytes integeral type\n", is_signed ? "signed" : "unsigned",
+        HDprintf("MPI_Offset is %s %d bytes integral type\n", is_signed ? "signed" : "unsigned",
                  (int)sizeof(MPI_Offset));
         if (sizeof_mpi_offset <= 4 && is_signed) {
             HDprintf("Skipped 2GB range test "
@@ -400,7 +400,7 @@ finish:
  * MPI-IO Test: One writes, Many reads.
  * Verify if only one process writes some data and then all other
  * processes can read them back correctly. This tests if the
- * underlaying parallel I/O and file system supports parallel I/O
+ * underlying parallel I/O and file system supports parallel I/O
  * correctly.
  *
  * Algorithm: Only one process (e.g., process 0) writes some data.
diff --git a/testpar/t_ph5basic.c b/testpar/t_ph5basic.c
index 05f2c77..59f14cb 100644
--- a/testpar/t_ph5basic.c
+++ b/testpar/t_ph5basic.c
@@ -56,7 +56,7 @@ test_fapl_mpio_dup(void)
         HDprintf("rank/size of MPI_COMM_WORLD are %d/%d\n", mpi_rank, mpi_size);
 
     /* Create a new communicator that has the same processes as MPI_COMM_WORLD.
-     * Use MPI_Comm_split because it is simplier than MPI_Comm_create
+     * Use MPI_Comm_split because it is simpler than MPI_Comm_create
      */
     mrc = MPI_Comm_split(MPI_COMM_WORLD, 0, 0, &comm);
     VRFY((mrc == MPI_SUCCESS), "MPI_Comm_split");
diff --git a/testpar/t_pread.c b/testpar/t_pread.c
index 17091cb..d79130b 100644
--- a/testpar/t_pread.c
+++ b/testpar/t_pread.c
@@ -68,7 +68,7 @@ static char *test_argv0 = NULL;
  *              more or less in half. Each sub group will operate
  *              collectively on their assigned file.  This split into
  *              subgroups validates that parallel groups can successfully
- *              open and read data independantly from the other parallel
+ *              open and read data independently from the other parallel
  *              operations taking place.
  *
  * Return:      Success: 0
@@ -132,7 +132,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
     }
 
     /* Setup the file names
-     * The test specfic filenames are stored as consecutive
+     * The test specific filenames are stored as consecutive
      * array entries in the global 'FILENAMES' array above.
      * Here, we simply decide on the starting index for
      * file construction.  The reading portion of the test
@@ -1043,11 +1043,11 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id)
  * Purpose:     To implement a parallel test which validates whether the
  *              new superblock lookup functionality is working correctly.
  *
- *              The test consists of creating two seperate HDF datasets
+ *              The test consists of creating two separate HDF datasets
  *              in which random text is inserted at the start of each
  *              file using the 'j5jam' application.  This forces the
  *              HDF5 file superblock to a non-zero offset.
- *              Having created the two independant files, we create two
+ *              Having created the two independent files, we create two
  *              non-overlapping MPI groups, each of which is then tasked
  *              with the opening and validation of the data contained
  *              therein.
@@ -1152,7 +1152,7 @@ main(int argc, char **argv)
         goto finish;
     }
 
-    /* Now read the generated test file (stil using MPI_COMM_WORLD) */
+    /* Now read the generated test file (still using MPI_COMM_WORLD) */
     nerrs += test_parallel_read(MPI_COMM_WORLD, mpi_rank, mpi_size, which_group);
 
     if (nerrs > 0) {
diff --git a/testpar/t_prop.c b/testpar/t_prop.c
index a3f1859..5979c5d 100644
--- a/testpar/t_prop.c
+++ b/testpar/t_prop.c
@@ -215,7 +215,7 @@ test_plist_ed(void)
     dxpl = H5Pcreate(H5P_DATASET_XFER);
     VRFY((dxpl >= 0), "H5Pcreate succeeded");
 
-    ret = H5Pset_btree_ratios(dxpl, 0.2f, 0.6f, 0.2f);
+    ret = H5Pset_btree_ratios(dxpl, 0.2, 0.6, 0.2);
     VRFY((ret >= 0), "H5Pset_btree_ratios succeeded");
 
     ret = H5Pset_hyper_vector_size(dxpl, 5);
@@ -354,7 +354,7 @@ test_plist_ed(void)
     ret = H5Pset_alignment(fapl, 2, 1024);
     VRFY((ret >= 0), "H5Pset_alignment succeeded");
 
-    ret = H5Pset_cache(fapl, 1024, 128, 10485760, 0.3f);
+    ret = H5Pset_cache(fapl, 1024, 128, 10485760, 0.3);
     VRFY((ret >= 0), "H5Pset_cache succeeded");
 
     ret = H5Pset_elink_file_cache_size(fapl, 10485760);
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 2dd867a..0a18781 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -11,7 +11,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
-   This program will test independant and collective reads and writes between
+   This program will test independent and collective reads and writes between
    selections of different rank that non-the-less are deemed as having the
    same shape by H5Sselect_shape_same().
  */
@@ -415,11 +415,11 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker
     /* setup selections for writing initial data to the small data set */
     ret = H5Sselect_hyperslab(tv_ptr->mem_small_ds_sid, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) succeeded");
 
     ret = H5Sselect_hyperslab(tv_ptr->file_small_ds_sid_0, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) succeeded");
 
     if (MAINPROCESS) { /* add an additional slice to the selections */
 
@@ -427,11 +427,11 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker
 
         ret = H5Sselect_hyperslab(tv_ptr->mem_small_ds_sid, H5S_SELECT_OR, tv_ptr->start, tv_ptr->stride,
                                   tv_ptr->count, tv_ptr->block);
-        VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, or) suceeded");
+        VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, or) succeeded");
 
         ret = H5Sselect_hyperslab(tv_ptr->file_small_ds_sid_0, H5S_SELECT_OR, tv_ptr->start, tv_ptr->stride,
                                   tv_ptr->count, tv_ptr->block);
-        VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, or) suceeded");
+        VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, or) succeeded");
     }
 
     /* write the initial value of the small data set to file */
@@ -475,21 +475,21 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker
 
     ret = H5Sselect_hyperslab(tv_ptr->mem_large_ds_sid, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_sid, set) succeeded");
 
     ret = H5Sselect_hyperslab(tv_ptr->file_large_ds_sid_0, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid_0, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid_0, set) succeeded");
 
     /* In passing, setup the process slice dataspaces as well */
 
     ret = H5Sselect_hyperslab(tv_ptr->mem_large_ds_process_slice_sid, H5S_SELECT_SET, tv_ptr->start,
                               tv_ptr->stride, tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_process_slice_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_process_slice_sid, set) succeeded");
 
     ret = H5Sselect_hyperslab(tv_ptr->file_large_ds_process_slice_sid, H5S_SELECT_SET, tv_ptr->start,
                               tv_ptr->stride, tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_process_slice_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_process_slice_sid, set) succeeded");
 
     if (MAINPROCESS) { /* add an additional slice to the selections */
 
@@ -497,11 +497,11 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker
 
         ret = H5Sselect_hyperslab(tv_ptr->mem_large_ds_sid, H5S_SELECT_OR, tv_ptr->start, tv_ptr->stride,
                                   tv_ptr->count, tv_ptr->block);
-        VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_sid, or) suceeded");
+        VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_sid, or) succeeded");
 
         ret = H5Sselect_hyperslab(tv_ptr->file_large_ds_sid_0, H5S_SELECT_OR, tv_ptr->start, tv_ptr->stride,
                                   tv_ptr->count, tv_ptr->block);
-        VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid_0, or) suceeded");
+        VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid_0, or) succeeded");
     }
 
     /* write the initial value of the large data set to file */
@@ -933,7 +933,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
 
     ret = H5Sselect_hyperslab(tv_ptr->file_small_ds_sid_0, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) succeeded");
 
 #if CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG
     HDfprintf(stdout, "%s reading slices of on disk small data set into slices of big data set.\n", fcnName);
@@ -1185,11 +1185,11 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 
     ret = H5Sselect_hyperslab(tv_ptr->file_small_ds_sid_0, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) succeeded");
 
     ret = H5Sselect_hyperslab(tv_ptr->mem_small_ds_sid, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) succeeded");
 
     /* set up start, stride, count, and block -- note that we will
      * change start[] so as to read slices of the large cube.
@@ -1462,7 +1462,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
 
     ret = H5Sselect_hyperslab(tv_ptr->mem_small_ds_sid, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) succeeded");
 
     /* set up start, stride, count, and block -- note that we will
      * change start[] so as to write slices of the small data set to
@@ -1572,7 +1572,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                     ret = H5Dwrite(tv_ptr->large_dataset, H5T_NATIVE_UINT32, tv_ptr->large_ds_slice_sid,
                                    tv_ptr->file_large_ds_process_slice_sid, tv_ptr->xfer_plist,
                                    tv_ptr->large_ds_buf_2);
-                    VRFY((ret != FAIL), "H5Dwrite() to zero large ds suceeded");
+                    VRFY((ret != FAIL), "H5Dwrite() to zero large ds succeeded");
 
                     /* select the portion of the in memory large cube to which we
                      * are going to write data.
@@ -2008,8 +2008,8 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type)
 **    edge_size, and a checker_edge_size, select a checker
 **    board selection of a sel_rank (sel_rank < tgt_rank)
 **    dimensional slice through the dataspace parallel to the
-**      sel_rank fastest changing indicies, with origin (in the
-**    higher indicies) as indicated by the start array.
+**      sel_rank fastest changing indices, with origin (in the
+**    higher indices) as indicated by the start array.
 **
 **    Note that this function, like all its relatives, is
 **    hard coded to presume a maximum dataspace rank of 5.
@@ -2318,7 +2318,7 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
 **    or writing a checker board selection of an m (1 <= m <
 **      rank) dimensional slice through this processes slice
 **    of the target data set.  Also, this slice must be parallel
-**    to the fastest changing indicies.
+**    to the fastest changing indices.
 **
 **    It is further presumed that the buffer was zeroed before
 **    the read/write, and that the full target data set (i.e.
@@ -2353,7 +2353,7 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
 **    of the buffer resides either at the origin of either
 **    a selected or an unselected checker.  (Translation:
 **    if partial checkers appear in the buffer, they will
-**    intersect the edges of the n-cube oposite the origin.)
+**    intersect the edges of the n-cube opposite the origin.)
 **
 ****************************************************************/
 
@@ -3091,11 +3091,11 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 
     ret = H5Sselect_hyperslab(tv_ptr->file_small_ds_sid_0, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) succeeded");
 
     ret = H5Sselect_hyperslab(tv_ptr->mem_small_ds_sid, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) succeeded");
 
     sel_start[0] = sel_start[1] = sel_start[2] = sel_start[3] = sel_start[4] = 0;
     sel_start[tv_ptr->small_ds_offset]                                       = (hsize_t)(tv_ptr->mpi_rank);
@@ -3384,11 +3384,11 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
 
     ret = H5Sselect_hyperslab(tv_ptr->file_large_ds_sid_0, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid_0, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid_0, set) succeeded");
 
     ret = H5Sselect_hyperslab(tv_ptr->mem_large_ds_sid, H5S_SELECT_SET, tv_ptr->start, tv_ptr->stride,
                               tv_ptr->count, tv_ptr->block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(tv_ptr->mem_large_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(tv_ptr->mem_large_ds_sid, set) succeeded");
 
     /* setup a checkerboard selection of the slice of the in memory small
      * data set associated with the process's mpi rank.
@@ -3496,7 +3496,7 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                      */
                     ret = H5Dwrite(tv_ptr->large_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_large_ds_sid,
                                    tv_ptr->file_large_ds_sid_0, tv_ptr->xfer_plist, tv_ptr->large_ds_buf_2);
-                    VRFY((ret != FAIL), "H5Dwrite() to zero large ds suceeded");
+                    VRFY((ret != FAIL), "H5Dwrite() to zero large ds succeeded");
 
                     /* select the portion of the in memory large cube to which we
                      * are going to write data.
@@ -4210,42 +4210,42 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
     return (ret_pl);
 }
 
-/* Shape Same test using contigous hyperslab using independent IO on contigous datasets */
+/* Shape Same test using contiguous hyperslab using independent IO on contiguous datasets */
 static void
 sscontig1(void)
 {
     contig_hs_dr_pio_test(IND_CONTIG);
 }
 
-/* Shape Same test using contigous hyperslab using collective IO on contigous datasets */
+/* Shape Same test using contiguous hyperslab using collective IO on contiguous datasets */
 static void
 sscontig2(void)
 {
     contig_hs_dr_pio_test(COL_CONTIG);
 }
 
-/* Shape Same test using contigous hyperslab using independent IO on chunked datasets */
+/* Shape Same test using contiguous hyperslab using independent IO on chunked datasets */
 static void
 sscontig3(void)
 {
     contig_hs_dr_pio_test(IND_CHUNKED);
 }
 
-/* Shape Same test using contigous hyperslab using collective IO on chunked datasets */
+/* Shape Same test using contiguous hyperslab using collective IO on chunked datasets */
 static void
 sscontig4(void)
 {
     contig_hs_dr_pio_test(COL_CHUNKED);
 }
 
-/* Shape Same test using checker hyperslab using independent IO on contigous datasets */
+/* Shape Same test using checker hyperslab using independent IO on contiguous datasets */
 static void
 sschecker1(void)
 {
     ckrbrd_hs_dr_pio_test(IND_CONTIG);
 }
 
-/* Shape Same test using checker hyperslab using collective IO on contigous datasets */
+/* Shape Same test using checker hyperslab using collective IO on contiguous datasets */
 static void
 sschecker2(void)
 {
@@ -4305,7 +4305,7 @@ main(int argc, char **argv)
     /* Initialize testing framework */
     TestInit(argv[0], usage, parse_options);
 
-    /* Shape Same tests using contigous hyperslab */
+    /* Shape Same tests using contiguous hyperslab */
     AddTest("sscontig1", sscontig1, NULL, "Cntg hslab, ind IO, cntg dsets", PARATESTFILE);
     AddTest("sscontig2", sscontig2, NULL, "Cntg hslab, col IO, cntg dsets", PARATESTFILE);
     AddTest("sscontig3", sscontig3, NULL, "Cntg hslab, ind IO, chnk dsets", PARATESTFILE);
diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c
index 518741d..e624a01 100644
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -424,7 +424,7 @@ coll_write_test(int chunk_factor)
          the correctedness of collective write compared with
          independent write,
 
-         In order to throughly test this feature, we choose
+         In order to thoroughly test this feature, we choose
          a different selection set for reading the data out.
 
 
@@ -890,8 +890,8 @@ coll_read_test(void)
 **    edge_size, and a checker_edge_size, select a checker
 **    board selection of a sel_rank (sel_rank < tgt_rank)
 **    dimensional slice through the dataspace parallel to the
-**      sel_rank fastest changing indicies, with origin (in the
-**    higher indicies) as indicated by the start array.
+**      sel_rank fastest changing indices, with origin (in the
+**    higher indices) as indicated by the start array.
 **
 **    Note that this function, is hard coded to presume a
 **    maximum dataspace rank of 5.
@@ -1230,7 +1230,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 **    or writing a checker board selection of an m (1 <= m <
 **      rank) dimensional slice through this processes slice
 **    of the target data set.  Also, this slice must be parallel
-**    to the fastest changing indicies.
+**    to the fastest changing indices.
 **
 **    It is further presumed that the buffer was zeroed before
 **    the read/write, and that the full target data set (i.e.
@@ -1265,7 +1265,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 **    of the buffer resides either at the origin of either
 **    a selected or an unselected checker.  (Translation:
 **    if partial checkers appear in the buffer, they will
-**    intersect the edges of the n-cube oposite the origin.)
+**    intersect the edges of the n-cube opposite the origin.)
 **
 ****************************************************************/
 
@@ -1726,7 +1726,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     if (!use_collective_io) {
 
         ret = H5Pset_dxpl_mpio_collective_opt(xfer_plist, H5FD_MPIO_INDIVIDUAL_IO);
-        VRFY((ret >= 0), "H5Pset_dxpl_mpio_collective_opt() suceeded");
+        VRFY((ret >= 0), "H5Pset_dxpl_mpio_collective_opt() succeeded");
     }
 
     /* setup selection to write initial data to the small data sets */
@@ -1758,10 +1758,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
     /* setup selections for writing initial data to the small data set */
     ret = H5Sselect_hyperslab(mem_small_ds_sid, H5S_SELECT_SET, start, stride, count, block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, set) succeeded");
 
     ret = H5Sselect_hyperslab(file_small_ds_sid, H5S_SELECT_SET, start, stride, count, block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid, set) succeeded");
 
     if (MAINPROCESS) { /* add an additional slice to the selections */
 
@@ -1782,10 +1782,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
         ret = H5Sselect_hyperslab(mem_small_ds_sid, H5S_SELECT_OR, start, stride, count, block);
-        VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, or) suceeded");
+        VRFY((ret >= 0), "H5Sselect_hyperslab(mem_small_ds_sid, or) succeeded");
 
         ret = H5Sselect_hyperslab(file_small_ds_sid, H5S_SELECT_OR, start, stride, count, block);
-        VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid, or) suceeded");
+        VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid, or) succeeded");
     }
 
     check = H5Sselect_valid(mem_small_ds_sid);
@@ -1864,10 +1864,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
     ret = H5Sselect_hyperslab(mem_large_ds_sid, H5S_SELECT_SET, start, stride, count, block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_sid, set) succeeded");
 
     ret = H5Sselect_hyperslab(file_large_ds_sid, H5S_SELECT_SET, start, stride, count, block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid, set) succeeded");
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
@@ -1897,10 +1897,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
         ret = H5Sselect_hyperslab(mem_large_ds_sid, H5S_SELECT_OR, start, stride, count, block);
-        VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_sid, or) suceeded");
+        VRFY((ret >= 0), "H5Sselect_hyperslab(mem_large_ds_sid, or) succeeded");
 
         ret = H5Sselect_hyperslab(file_large_ds_sid, H5S_SELECT_OR, start, stride, count, block);
-        VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid, or) suceeded");
+        VRFY((ret >= 0), "H5Sselect_hyperslab(file_large_ds_sid, or) succeeded");
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
@@ -2427,7 +2427,7 @@ link_chunk_collective_io_test(void)
     /* select the file and mem spaces */
     start[0] = (hsize_t)(mpi_rank * LINK_CHUNK_COLLECTIVE_IO_TEST_CHUNK_SIZE);
     ret      = H5Sselect_hyperslab(file_ds_sid, H5S_SELECT_SET, start, stride, count, block);
-    VRFY((ret >= 0), "H5Sselect_hyperslab(file_ds_sid, set) suceeded");
+    VRFY((ret >= 0), "H5Sselect_hyperslab(file_ds_sid, set) succeeded");
 
     ret = H5Sselect_all(write_mem_ds_sid);
     VRFY((ret != FAIL), "H5Sselect_all(mem_ds_sid) succeeded");
diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c
index 2d16606..26a4423 100644
--- a/testpar/t_vfd.c
+++ b/testpar/t_vfd.c
@@ -512,7 +512,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
         *fapl_id_ptr = fapl_id;
         *dxpl_id_ptr = dxpl_id;
     }
-    else { /* tidy up from failure as posible  */
+    else { /* tidy up from failure as possible  */
 
         if (lf)
             H5FDclose(lf);
@@ -648,7 +648,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap
  *                 Verify that read_fi_buf contains zeros for all
  *                 indices less than mpi_rank * INTS_PER_RANK, or
  *                 greater than or equal to (mpi_rank + 1) * INTS_PER_RANK.
- *                 For all other indicies, read_fi_buf should equal
+ *                 For all other indices, read_fi_buf should equal
  *                 increasing_fi_buf.
  *
  *              5) Barrier
@@ -766,7 +766,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
      *    Verify that read_fi_buf contains zeros for all
      *    indices less than mpi_rank * INTS_PER_RANK, or
      *    greater than or equal to (mpi_rank + 1) * INTS_PER_RANK.
-     *    For all other indicies, read_fi_buf should equal
+     *    For all other indices, read_fi_buf should equal
      *    increasing_fi_buf.
      */
     if (pass) {
@@ -890,7 +890,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
  *               8) Verify that read_fi_buf contains zeros for all
  *                  indices less than mpi_rank * INTS_PER_RANK, or
  *                  greater than or equal to (mpi_rank + 1) * INTS_PER_RANK.
- *                  For all other indicies, read_fi_buf should equal
+ *                  For all other indices, read_fi_buf should equal
  *                  decreasing_fi_buf.
  *
  *               9) Barrier
@@ -1089,7 +1089,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     /* 8) Verify that read_fi_buf contains zeros for all
      *    indices less than mpi_rank * INTS_PER_RANK, or
      *    greater than or equal to (mpi_rank + 1) * INTS_PER_RANK.
-     *    For all other indicies, read_fi_buf should equal
+     *    For all other indices, read_fi_buf should equal
      *    decreasing_fi_buf.
      */
 
@@ -2258,7 +2258,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
  *
  *              2) Write the entire increasing_fi_buf to the file, with
  *                 exactly one buffer per vector per rank.  Use either
- *                 independant or collective I/O as specified.
+ *                 independent or collective I/O as specified.
  *
  *              3) Barrier
  *
@@ -2343,7 +2343,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
 
     /* 2) Write the entire increasing_fi_buf to the file, with
      *    exactly one buffer per vector per rank.  Use either
-     *    independant or collective I/O as specified.
+     *    independent or collective I/O as specified.
      */
 
     if (pass) {
@@ -2447,7 +2447,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
  *                 the eoa.
  *
  *              2) Write the odd blocks of the increasing_fi_buf to the file,
- *                 with the odd ranks writting the odd blocks, and the even
+ *                 with the odd ranks writing the odd blocks, and the even
  *                 ranks writing an empty vector.
  *
  *                 Here, a "block" of the increasing_fi_buf is a sequence
@@ -2455,7 +2455,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
  *                 and with start index a multiple of INTS_PER_RANK.
  *
  *              3) Write the even blocks of the negative_fi_buf to the file,
- *                 with the even ranks writting the even blocks, and the odd
+ *                 with the even ranks writing the even blocks, and the odd
  *                 ranks writing an empty vector.
  *
  *              4) Barrier
@@ -2540,7 +2540,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Write the odd blocks of the increasing_fi_buf to the file,
-     *    with the odd ranks writting the odd blocks, and the even
+     *    with the odd ranks writing the odd blocks, and the even
      *    ranks writing an empty vector.
      *
      *    Here, a "block" of the increasing_fi_buf is a sequence
@@ -2577,7 +2577,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
         HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Write the even blocks of the negative_fi_buf to the file,
-     *    with the even ranks writting the even blocks, and the odd
+     *    with the even ranks writing the even blocks, and the odd
      *    ranks writing an empty vector.
      */
     if (pass) {
@@ -4363,7 +4363,7 @@ main(int argc, char **argv)
 
     if (!pass) {
 
-        HDprintf("\nAllocation and initialze of file image buffers failed.  Test aborted.\n");
+        HDprintf("\nAllocation and initialize of file image buffers failed.  Test aborted.\n");
     }
 
 #if 1 /* JRM */
diff --git a/testpar/testpflush.sh.in b/testpar/testpflush.sh.in
index be0dcb3..b400447 100644
--- a/testpar/testpflush.sh.in
+++ b/testpar/testpflush.sh.in
@@ -50,7 +50,7 @@ RUNPARALLELSCRIPT=`echo "@RUNPARALLEL@" | sed "s/$$/\$/g"`
 echo "*** NOTE ***********************************************************"
 echo "You may see complaints from mpiexec et al. that not all processes"
 echo "called MPI_Finalize(). This is an intended characteristic of the"
-echo "test and should not be considered an  error."
+echo "test and should not be considered an error."
 echo "********************************************************************"
 eval ${RUNPARALLELSCRIPT} ./t_pflush1
 
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index 10e3027..c692287 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -218,8 +218,8 @@ typedef int DATATYPE;
 
 /* Shape Same Tests Definitions */
 typedef enum {
-    IND_CONTIG,  /* Independent IO on contigous datasets */
-    COL_CONTIG,  /* Collective IO on contigous datasets */
+    IND_CONTIG,  /* Independent IO on contiguous datasets */
+    COL_CONTIG,  /* Collective IO on contiguous datasets */
     IND_CHUNKED, /* Independent IO on chunked datasets */
     COL_CHUNKED  /* Collective IO on chunked datasets */
 } ShapeSameTestMethods;