[svn-r5679] Purpose:

    Code cleanup

Description:
    Changed ifdef name from "VERBOSE" to "BARRIER_CHECKS", to better describe
    what it affects.

Platforms tested:
    IRIX64 6.5 (modi4) w/parallel

2 files changed, 12 insertions, 6 deletions

diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 6e18453..4c74d8d 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -326,7 +326,9 @@ if ((mpi_rank/2)*2 != mpi_rank){
 	    H5P_DEFAULT, data_array1);					    
     VRFY((ret >= 0), "H5Dwrite dataset1 by ZROW succeeded");
 }
+#ifdef BARRIER_CHECKS
 MPI_Barrier(MPI_COMM_WORLD);
+#endif /* BARRIER_CHECKS */
 
     /* release dataspace ID */
     H5Sclose(file_dataspace);
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 0b6de7a..0a97e5e 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -67,12 +67,12 @@ void multiple_dset_write(char *filename, int ndatasets)
 	H5Dwrite (dataset, H5T_NATIVE_DOUBLE, memspace, filespace, H5P_DEFAULT, outme);
 
 	H5Dclose (dataset);
+#ifdef BARRIER_CHECKS
 	if (! ((n+1) % 10)) {
-#ifdef VERBOSE
 	    printf("created %d datasets\n", n+1);
-#endif /* VERBOSE */
 	    MPI_Barrier(MPI_COMM_WORLD);
 	}
+#endif /* BARRIER_CHECKS */
     }
 
     H5Sclose (filespace);
@@ -154,12 +154,12 @@ void multiple_group_write(char *filename, int ngroups)
 
         H5Gclose(gid);
 
+#ifdef BARRIER_CHECKS
         if(! ((m+1) % 10)) {
-#ifdef VERBOSE
             printf("created %d groups\n", m+1);
-#endif /* VERBOSE */
             MPI_Barrier(MPI_COMM_WORLD);
 	}
+#endif /* BARRIER_CHECKS */
     }
     
     /* recursively creates subgroups under the first group. */
@@ -221,12 +221,12 @@ void create_group_recursive(hid_t memspace, hid_t filespace, hid_t gid,
   
    MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
+#ifdef BARRIER_CHECKS
    if(! ((counter+1) % 10)) {
-#ifdef VERBOSE
         printf("created %dth child groups\n", counter+1);
-#endif /* VERBOSE */
         MPI_Barrier(MPI_COMM_WORLD);
    }
+#endif /* BARRIER_CHECKS */
  
    sprintf(gname, "%dth_child_group", counter+1);   
    child_gid = H5Gcreate(gid, gname, 0);
@@ -290,8 +290,10 @@ void multiple_group_read(char *filename, int ngroups)
 
         H5Gclose(gid);
 
+#ifdef BARRIER_CHECKS
         if(!((m+1)%10))
             MPI_Barrier(MPI_COMM_WORLD);
+#endif /* BARRIER_CHECKS */
     }
 
     /* open all the groups in vertical direction. */
@@ -367,8 +369,10 @@ void recursive_read_group(hid_t memspace, hid_t filespace, hid_t gid,
     char  gname[64];
 
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
+#ifdef BARRIER_CHECKS
     if((counter+1) % 10) 
         MPI_Barrier(MPI_COMM_WORLD);
+#endif /* BARRIER_CHECKS */
 
     if( (err_num = read_dataset(memspace, filespace, gid)) )
         nerrors += err_num;