diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-08-27 21:56:20 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-08-27 21:56:20 (GMT) |
| commit | a6df73c723b4ef604e2a0aab06efc72e30b0478a (patch) | |
| tree | 0951b6c9e44fb707ad8f83a36daa55c6f5b8048b /testpar/testpar.h | |
| parent | 09d13b3c13dfc3fa79a7d616d80a06183fb05cc9 (diff) | |
| parent | fb8296371cf45654a9252ed01b635519205da3de (diff) | |
| download | hdf5-a6df73c723b4ef604e2a0aab06efc72e30b0478a.zip hdf5-a6df73c723b4ef604e2a0aab06efc72e30b0478a.tar.gz hdf5-a6df73c723b4ef604e2a0aab06efc72e30b0478a.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'fb8296371cf45654a9252ed01b635519205da3de':
Minor tweaks to new H5P MPI code based on code review feedback.
Fixed a bug in the cache image code that was introduced by the HD changes.
Added H5Pset/get_mpi_params calls and unified them with the MPI-I/O VFD info in H5FDmpio.c.
Diffstat (limited to 'testpar/testpar.h')
| -rw-r--r-- | testpar/testpar.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/testpar/testpar.h b/testpar/testpar.h index 4fbe8d8..86677d1 100644 --- a/testpar/testpar.h +++ b/testpar/testpar.h @@ -32,7 +32,7 @@ */ #define MESG(mesg) \ if (VERBOSE_MED && *mesg != '\0') \ - HDprintf("%s\n", mesg) + HDprintf("%s\n", mesg) /* * VRFY: Verify if the condition val is true. @@ -46,16 +46,17 @@ */ #define VRFY(val, mesg) do { \ if (val) { \ - MESG(mesg); \ - } else { \ - HDprintf("Proc %d: ", mpi_rank); \ - HDprintf("*** Parallel ERROR ***\n"); \ - HDprintf(" VRFY (%s) failed at line %4d in %s\n", \ + MESG(mesg); \ + } \ + else { \ + HDprintf("Proc %d: ", mpi_rank); \ + HDprintf("*** Parallel ERROR ***\n"); \ + HDprintf(" VRFY (%s) failed at line %4d in %s\n", \ mesg, (int)__LINE__, __FILE__); \ ++nerrors; \ fflush(stdout); \ if (!VERBOSE_MED) { \ - HDprintf("aborting MPI processes\n"); \ + HDprintf("aborting MPI processes\n"); \ MPI_Abort(MPI_COMM_WORLD, 1); \ } \ } \ |