diff options
| -rw-r--r-- | testpar/t_dset.c | 138 | ||||
| -rw-r--r-- | testpar/t_file.c | 2 |
2 files changed, 70 insertions, 70 deletions
diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 90fd190..eed23b8 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -207,14 +207,14 @@ dataset_writeInd(char *filename) * -------------------*/ /* setup file access template with parallel IO access. */ acc_tpl = H5Pcreate (H5P_FILE_ACCESS); - VRFY((acc_tpl != FAIL), "H5Pcreate access succeed"); + VRFY((acc_tpl != FAIL), "H5Pcreate access succeeded"); /* set Parallel access with communicator */ ret = H5Pset_mpi(acc_tpl, comm, info); - VRFY((ret != FAIL), "H5Pset_mpi succeed"); + VRFY((ret != FAIL), "H5Pset_mpi succeeded"); /* create the file collectively */ fid=H5Fcreate(filename,H5F_ACC_TRUNC,H5P_DEFAULT,acc_tpl); - VRFY((fid != FAIL), "H5Fcreate succeed"); + VRFY((fid != FAIL), "H5Fcreate succeeded"); /* Release file-access template */ ret=H5Pclose(acc_tpl); @@ -227,18 +227,18 @@ dataset_writeInd(char *filename) * ------------------------- */ /* setup dimensionality object */ sid = H5Screate_simple (RANK, dims, NULL); - VRFY((sid != FAIL), "H5Screate_simple succeed"); + VRFY((sid != FAIL), "H5Screate_simple succeeded"); /* create a dataset collectively */ dataset1 = H5Dcreate(fid, DATASETNAME1, H5T_NATIVE_INT, sid, H5P_DEFAULT); - VRFY((dataset1 != FAIL), "H5Dcreate succeed"); + VRFY((dataset1 != FAIL), "H5Dcreate succeeded"); /* create another dataset collectively */ dataset2 = H5Dcreate(fid, DATASETNAME2, H5T_NATIVE_INT, sid, H5P_DEFAULT); - VRFY((dataset2 != FAIL), "H5Dcreate succeed"); + VRFY((dataset2 != FAIL), "H5Dcreate succeeded"); @@ -251,9 +251,9 @@ dataset_writeInd(char *filename) /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset1); - VRFY((file_dataspace != FAIL), "H5Dget_space succeed"); + VRFY((file_dataspace != FAIL), "H5Dget_space succeeded"); ret=H5Sset_hyperslab(file_dataspace, start, count, stride); - VRFY((ret != FAIL), "H5Sset_hyperslab succeed"); + VRFY((ret != FAIL), "H5Sset_hyperslab succeeded"); /* create a memory dataspace independently */ mem_dataspace = H5Screate_simple (RANK, count, NULL); @@ -262,21 +262,21 @@ dataset_writeInd(char *filename) /* write data independently */ ret = H5Dwrite(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1); - VRFY((ret != FAIL), "H5Dwrite succeed"); + VRFY((ret != FAIL), "H5Dwrite succeeded"); /* write data independently */ ret = H5Dwrite(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1); - VRFY((ret != FAIL), "H5Dwrite succeed"); + VRFY((ret != FAIL), "H5Dwrite succeeded"); /* release dataspace ID */ H5Sclose(file_dataspace); /* close dataset collectively */ ret=H5Dclose(dataset1); - VRFY((ret != FAIL), "H5Dclose1 succeed"); + VRFY((ret != FAIL), "H5Dclose1 succeeded"); ret=H5Dclose(dataset2); - VRFY((ret != FAIL), "H5Dclose2 succeed"); + VRFY((ret != FAIL), "H5Dclose2 succeeded"); /* release all IDs created */ H5Sclose(sid); @@ -438,14 +438,14 @@ dataset_writeAll(char *filename) * -------------------*/ /* setup file access template with parallel IO access. */ acc_tpl = H5Pcreate (H5P_FILE_ACCESS); - VRFY((acc_tpl != FAIL), "H5Pcreate access succeed"); + VRFY((acc_tpl != FAIL), "H5Pcreate access succeeded"); /* set Parallel access with communicator */ ret = H5Pset_mpi(acc_tpl, comm, info); - VRFY((ret != FAIL), "H5Pset_mpi succeed"); + VRFY((ret != FAIL), "H5Pset_mpi succeeded"); /* create the file collectively */ fid=H5Fcreate(filename,H5F_ACC_TRUNC,H5P_DEFAULT,acc_tpl); - VRFY((fid != FAIL), "H5Fcreate succeed"); + VRFY((fid != FAIL), "H5Fcreate succeeded"); /* Release file-access template */ ret=H5Pclose(acc_tpl); @@ -458,20 +458,20 @@ dataset_writeAll(char *filename) * ------------------------- */ /* setup dimensionality object */ sid = H5Screate_simple (RANK, dims, NULL); - VRFY((sid != FAIL), "H5Screate_simple succeed"); + VRFY((sid != FAIL), "H5Screate_simple succeeded"); /* create a dataset collectively */ dataset1 = H5Dcreate(fid, DATASETNAME1, H5T_NATIVE_INT, sid, H5P_DEFAULT); - VRFY((dataset1 != FAIL), "H5Dcreate succeed"); + VRFY((dataset1 != FAIL), "H5Dcreate succeeded"); /* create another dataset collectively */ datatype = H5Tcopy(H5T_NATIVE_INT); ret = H5Tset_order(datatype, H5T_ORDER_LE); - VRFY((ret != FAIL), "H5Tset_order succeed"); + VRFY((ret != FAIL), "H5Tset_order succeeded"); dataset2 = H5Dcreate(fid, DATASETNAME2, datatype, sid, H5P_DEFAULT); - VRFY((dataset2 != FAIL), "H5Dcreate 2 succeed"); + VRFY((dataset2 != FAIL), "H5Dcreate 2 succeeded"); /* * Set up dimensions of the slab this process accesses. @@ -482,9 +482,9 @@ dataset_writeAll(char *filename) /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset1); - VRFY((file_dataspace != FAIL), "H5Dget_space succeed"); + VRFY((file_dataspace != FAIL), "H5Dget_space succeeded"); ret=H5Sset_hyperslab(file_dataspace, start, count, stride); - VRFY((ret != FAIL), "H5Sset_hyperslab succeed"); + VRFY((ret != FAIL), "H5Sset_hyperslab succeeded"); /* create a memory dataspace independently */ mem_dataspace = H5Screate_simple (RANK, count, NULL); @@ -502,12 +502,12 @@ dataset_writeAll(char *filename) xfer_plist = H5Pcreate (H5P_DATASET_XFER); VRFY((xfer_plist != FAIL), ""); ret=H5Pset_xfer(xfer_plist, H5D_XFER_COLLECTIVE); - VRFY((ret != FAIL), "H5Pcreate xfer succeed"); + VRFY((ret != FAIL), "H5Pcreate xfer succeeded"); /* write data collectively */ ret = H5Dwrite(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, xfer_plist, data_array1); - VRFY((ret != FAIL), "H5Dwrite dataset1 succeed"); + VRFY((ret != FAIL), "H5Dwrite dataset1 succeeded"); /* release all temporary handles. */ /* Could have used them for dataset2 but it is cleaner */ @@ -529,9 +529,9 @@ dataset_writeAll(char *filename) /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset1); - VRFY((file_dataspace != FAIL), "H5Dget_space succeed"); + VRFY((file_dataspace != FAIL), "H5Dget_space succeeded"); ret=H5Sset_hyperslab(file_dataspace, start, count, stride); - VRFY((ret != FAIL), "H5Sset_hyperslab succeed"); + VRFY((ret != FAIL), "H5Sset_hyperslab succeeded"); /* create a memory dataspace independently */ mem_dataspace = H5Screate_simple (RANK, count, NULL); @@ -549,12 +549,12 @@ dataset_writeAll(char *filename) xfer_plist = H5Pcreate (H5P_DATASET_XFER); VRFY((xfer_plist != FAIL), ""); ret=H5Pset_xfer(xfer_plist, H5D_XFER_COLLECTIVE); - VRFY((ret != FAIL), "H5Pcreate xfer succeed"); + VRFY((ret != FAIL), "H5Pcreate xfer succeeded"); /* write data independently */ ret = H5Dwrite(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace, xfer_plist, data_array1); - VRFY((ret != FAIL), "H5Dwrite dataset2 succeed"); + VRFY((ret != FAIL), "H5Dwrite dataset2 succeeded"); /* release all temporary handles. */ H5Sclose(file_dataspace); @@ -566,9 +566,9 @@ dataset_writeAll(char *filename) * All writes completed. Close datasets collectively */ ret=H5Dclose(dataset1); - VRFY((ret != FAIL), "H5Dclose1 succeed"); + VRFY((ret != FAIL), "H5Dclose1 succeeded"); ret=H5Dclose(dataset2); - VRFY((ret != FAIL), "H5Dclose2 succeed"); + VRFY((ret != FAIL), "H5Dclose2 succeeded"); /* release all IDs created */ H5Sclose(sid); @@ -621,14 +621,14 @@ dataset_readAll(char *filename) * -------------------*/ /* setup file access template with parallel IO access. */ acc_tpl = H5Pcreate (H5P_FILE_ACCESS); - VRFY((acc_tpl != FAIL), "H5Pcreate access succeed"); + VRFY((acc_tpl != FAIL), "H5Pcreate access succeeded"); /* set Parallel access with communicator */ ret = H5Pset_mpi(acc_tpl, comm, info); - VRFY((ret != FAIL), "H5Pset_mpi succeed"); + VRFY((ret != FAIL), "H5Pset_mpi succeeded"); /* open the file collectively */ fid=H5Fopen(filename,H5F_ACC_RDONLY,acc_tpl); - VRFY((fid != FAIL), "H5Fopen succeed"); + VRFY((fid != FAIL), "H5Fopen succeeded"); /* Release file-access template */ ret=H5Pclose(acc_tpl); @@ -640,11 +640,11 @@ dataset_readAll(char *filename) * ------------------------- */ /* open the dataset1 collectively */ dataset1 = H5Dopen(fid, DATASETNAME1); - VRFY((dataset1 != FAIL), "H5Dopen succeed"); + VRFY((dataset1 != FAIL), "H5Dopen succeeded"); /* open another dataset collectively */ dataset2 = H5Dopen(fid, DATASETNAME2); - VRFY((dataset2 != FAIL), "H5Dopen 2 succeed"); + VRFY((dataset2 != FAIL), "H5Dopen 2 succeeded"); /* * Set up dimensions of the slab this process accesses. @@ -655,9 +655,9 @@ dataset_readAll(char *filename) /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset1); - VRFY((file_dataspace != FAIL), "H5Dget_space succeed"); + VRFY((file_dataspace != FAIL), "H5Dget_space succeeded"); ret=H5Sset_hyperslab(file_dataspace, start, count, stride); - VRFY((ret != FAIL), "H5Sset_hyperslab succeed"); + VRFY((ret != FAIL), "H5Sset_hyperslab succeeded"); /* create a memory dataspace independently */ mem_dataspace = H5Screate_simple (RANK, count, NULL); @@ -675,12 +675,12 @@ dataset_readAll(char *filename) xfer_plist = H5Pcreate (H5P_DATASET_XFER); VRFY((xfer_plist != FAIL), ""); ret=H5Pset_xfer(xfer_plist, H5D_XFER_COLLECTIVE); - VRFY((ret != FAIL), "H5Pcreate xfer succeed"); + VRFY((ret != FAIL), "H5Pcreate xfer succeeded"); /* read data collectively */ ret = H5Dread(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, xfer_plist, data_array1); - VRFY((ret != FAIL), "H5Dread succeed"); + VRFY((ret != FAIL), "H5Dread succeeded"); /* verify the read data with original expected data */ ret = dataset_vrfy(start, count, stride, &data_array1[0][0], &data_origin1[0][0]); @@ -698,9 +698,9 @@ dataset_readAll(char *filename) /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset1); - VRFY((file_dataspace != FAIL), "H5Dget_space succeed"); + VRFY((file_dataspace != FAIL), "H5Dget_space succeeded"); ret=H5Sset_hyperslab(file_dataspace, start, count, stride); - VRFY((ret != FAIL), "H5Sset_hyperslab succeed"); + VRFY((ret != FAIL), "H5Sset_hyperslab succeeded"); /* create a memory dataspace independently */ mem_dataspace = H5Screate_simple (RANK, count, NULL); @@ -718,12 +718,12 @@ dataset_readAll(char *filename) xfer_plist = H5Pcreate (H5P_DATASET_XFER); VRFY((xfer_plist != FAIL), ""); ret=H5Pset_xfer(xfer_plist, H5D_XFER_COLLECTIVE); - VRFY((ret != FAIL), "H5Pcreate xfer succeed"); + VRFY((ret != FAIL), "H5Pcreate xfer succeeded"); /* read data independently */ ret = H5Dread(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace, xfer_plist, data_array1); - VRFY((ret != FAIL), "H5Dread succeed"); + VRFY((ret != FAIL), "H5Dread succeeded"); /* verify the read data with original expected data */ ret = dataset_vrfy(start, count, stride, &data_array1[0][0], &data_origin1[0][0]); @@ -739,9 +739,9 @@ dataset_readAll(char *filename) * All reads completed. Close datasets collectively */ ret=H5Dclose(dataset1); - VRFY((ret != FAIL), "H5Dclose1 succeed"); + VRFY((ret != FAIL), "H5Dclose1 succeeded"); ret=H5Dclose(dataset2); - VRFY((ret != FAIL), "H5Dclose2 succeed"); + VRFY((ret != FAIL), "H5Dclose2 succeeded"); /* close the file collectively */ H5Fclose(fid); @@ -801,14 +801,14 @@ extend_writeInd(char *filename) * -------------------*/ /* setup file access template with parallel IO access. */ acc_tpl = H5Pcreate (H5P_FILE_ACCESS); - VRFY((acc_tpl != FAIL), "H5Pcreate access succeed"); + VRFY((acc_tpl != FAIL), "H5Pcreate access succeeded"); /* set Parallel access with communicator */ ret = H5Pset_mpi(acc_tpl, comm, info); - VRFY((ret != FAIL), "H5Pset_mpi succeed"); + VRFY((ret != FAIL), "H5Pset_mpi succeeded"); /* create the file collectively */ fid=H5Fcreate(filename,H5F_ACC_TRUNC,H5P_DEFAULT,acc_tpl); - VRFY((fid != FAIL), "H5Fcreate succeed"); + VRFY((fid != FAIL), "H5Fcreate succeeded"); /* Release file-access template */ ret=H5Pclose(acc_tpl); @@ -824,30 +824,30 @@ extend_writeInd(char *filename) if (verbose) printf("chunks[]=%d,%d\n", chunk_dims[0], chunk_dims[1]); dataset_pl = H5Pcreate(H5P_DATASET_CREATE); - VRFY((dataset_pl != FAIL), "H5Pcreate succeed"); + VRFY((dataset_pl != FAIL), "H5Pcreate succeeded"); ret = H5Pset_chunk(dataset_pl, RANK, chunk_dims); - VRFY((ret != FAIL), "H5Pset_chunk succeed"); + VRFY((ret != FAIL), "H5Pset_chunk succeeded"); /* setup dimensionality object */ /* start out with no rows, extend it later. */ dims[0] = dims[1] = 0; sid = H5Screate_simple (RANK, dims, max_dims); - VRFY((sid != FAIL), "H5Screate_simple succeed"); + VRFY((sid != FAIL), "H5Screate_simple succeeded"); /* create an extendable dataset collectively */ dataset1 = H5Dcreate(fid, DATASETNAME1, H5T_NATIVE_INT, sid, dataset_pl); - VRFY((dataset1 != FAIL), "H5Dcreate succeed"); + VRFY((dataset1 != FAIL), "H5Dcreate succeeded"); /* create another extendable dataset collectively */ dataset2 = H5Dcreate(fid, DATASETNAME2, H5T_NATIVE_INT, sid, dataset_pl); - VRFY((dataset2 != FAIL), "H5Dcreate succeed"); + VRFY((dataset2 != FAIL), "H5Dcreate succeeded"); /* extend dataset1 only */ dims[0] = DIM1; dims[1] = DIM2; ret = H5Dextend (dataset1, dims); - VRFY((ret != FAIL), "H5Dextend succeed"); + VRFY((ret != FAIL), "H5Dextend succeeded"); /* set up dimensions of the slab this process accesses */ @@ -859,9 +859,9 @@ extend_writeInd(char *filename) /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset1); - VRFY((file_dataspace != FAIL), "H5Dget_space succeed"); + VRFY((file_dataspace != FAIL), "H5Dget_space succeeded"); ret=H5Sset_hyperslab(file_dataspace, start, count, stride); - VRFY((ret != FAIL), "H5Sset_hyperslab succeed"); + VRFY((ret != FAIL), "H5Sset_hyperslab succeeded"); /* create a memory dataspace independently */ mem_dataspace = H5Screate_simple (RANK, count, NULL); @@ -870,7 +870,7 @@ extend_writeInd(char *filename) /* write data independently */ ret = H5Dwrite(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1); - VRFY((ret != FAIL), "H5Dwrite succeed"); + VRFY((ret != FAIL), "H5Dwrite succeeded"); /* set up dimensions of the slab this process accesses */ slab_set(mpi_rank, mpi_size, start, count, stride, BYCOL); @@ -891,9 +891,9 @@ extend_writeInd(char *filename) /* create a file dataspace independently */ file_dataspace = H5Dget_space (dataset2); - VRFY((file_dataspace != FAIL), "H5Dget_space succeed"); + VRFY((file_dataspace != FAIL), "H5Dget_space succeeded"); ret=H5Sset_hyperslab(file_dataspace, start, count, stride); - VRFY((ret == FAIL), "H5Sset_hyperslab fail as expected"); + VRFY((ret == FAIL), "H5Sset_hyperslab failed as expected"); /* restore auto error reporting */ H5Eset_auto(old_func, old_client_data); @@ -902,14 +902,14 @@ extend_writeInd(char *filename) dims[0] = DIM1; dims[1] = DIM2; ret = H5Dextend (dataset2, dims); - VRFY((ret != FAIL), "H5Dextend succeed"); + VRFY((ret != FAIL), "H5Dextend succeeded"); /* create a file dataspace independently */ H5Sclose(file_dataspace); file_dataspace = H5Dget_space (dataset2); - VRFY((file_dataspace != FAIL), "H5Dget_space succeed"); + VRFY((file_dataspace != FAIL), "H5Dget_space succeeded"); ret=H5Sset_hyperslab(file_dataspace, start, count, stride); - VRFY((ret != FAIL), "H5Sset_hyperslab succeed"); + VRFY((ret != FAIL), "H5Sset_hyperslab succeeded"); /* create a memory dataspace independently */ mem_dataspace = H5Screate_simple (RANK, count, NULL); @@ -918,7 +918,7 @@ extend_writeInd(char *filename) /* write data independently */ ret = H5Dwrite(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1); - VRFY((ret != FAIL), "H5Dwrite succeed"); + VRFY((ret != FAIL), "H5Dwrite succeeded"); /* -------------------------- @@ -930,9 +930,9 @@ extend_writeInd(char *filename) /* close dataset collectively */ ret=H5Dclose(dataset1); - VRFY((ret != FAIL), "H5Dclose1 succeed"); + VRFY((ret != FAIL), "H5Dclose1 succeeded"); ret=H5Dclose(dataset2); - VRFY((ret != FAIL), "H5Dclose2 succeed"); + VRFY((ret != FAIL), "H5Dclose2 succeeded"); /* release all IDs created */ H5Sclose(sid); @@ -1004,12 +1004,12 @@ extend_readInd(char *filename) H5Eset_auto(NULL, NULL); file_dataspace = H5Dget_space (dataset1); - VRFY((file_dataspace != FAIL), "H5Dget_space succeed"); + VRFY((file_dataspace != FAIL), "H5Dget_space succeeded"); ret=H5Sget_dims(file_dataspace, dims, NULL); - VRFY((ret > 0), "H5Sget_dims succeed"); + VRFY((ret > 0), "H5Sget_dims succeeded"); dims[0]=dims[0]*2; ret=H5Dextend(dataset1, dims); - VRFY((ret == FAIL), "H5Dextend fail as expected"); + VRFY((ret == FAIL), "H5Dextend failed as expected"); /* restore auto error reporting */ H5Eset_auto(old_func, old_client_data); @@ -1035,7 +1035,7 @@ extend_readInd(char *filename) /* read data independently */ ret = H5Dread(dataset1, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1); - VRFY((ret != FAIL), "H5Dread succeed"); + VRFY((ret != FAIL), "H5Dread succeeded"); /* verify the read data with original expected data */ ret = dataset_vrfy(start, count, stride, &data_array1[0][0], &data_origin1[0][0]); @@ -1066,7 +1066,7 @@ extend_readInd(char *filename) /* read data independently */ ret = H5Dread(dataset2, H5T_NATIVE_INT, mem_dataspace, file_dataspace, H5P_DEFAULT, data_array1); - VRFY((ret != FAIL), "H5Dread succeed"); + VRFY((ret != FAIL), "H5Dread succeeded"); /* verify the read data with original expected data */ ret = dataset_vrfy(start, count, stride, &data_array1[0][0], &data_origin1[0][0]); diff --git a/testpar/t_file.c b/testpar/t_file.c index 8e5ff67..0c64092 100644 --- a/testpar/t_file.c +++ b/testpar/t_file.c @@ -61,7 +61,7 @@ test_split_comm_access(char *filename[]) /* create the file collectively */ fid=H5Fcreate(filename[color],H5F_ACC_TRUNC,H5P_DEFAULT,acc_tpl); - VRFY((fid != FAIL), "H5Fcreate succeed"); + VRFY((fid != FAIL), "H5Fcreate succeeded"); /* Release file-access template */ ret=H5Pclose(acc_tpl); |