summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_chunk_alloc.c4
-rw-r--r--testpar/t_coll_chunk.c2
-rw-r--r--testpar/t_dset.c24
-rw-r--r--testpar/t_filter_read.c4
-rw-r--r--testpar/t_mdset.c12
-rw-r--r--testpar/t_pflush2.c10
-rw-r--r--testpar/t_span_tree.c12
7 files changed, 34 insertions, 34 deletions
diff --git a/testpar/t_chunk_alloc.c b/testpar/t_chunk_alloc.c
index 6703687..e496a58 100644
--- a/testpar/t_chunk_alloc.c
+++ b/testpar/t_chunk_alloc.c
@@ -250,7 +250,7 @@ parallel_access_dataset(const char *filename, int nchunks, access_type action, h
/* Open dataset*/
if (*dataset<0){
- *dataset = H5Dopen(*file_id, DATASETNAME);
+ *dataset = H5Dopen2(*file_id, DATASETNAME, H5P_DEFAULT);
VRFY((*dataset >= 0), "");
}
@@ -381,7 +381,7 @@ void verify_data(const char *filename, int nchunks, write_type write_pattern, in
/* Open dataset*/
if (*dataset<0){
- *dataset = H5Dopen(*file_id, DATASETNAME);
+ *dataset = H5Dopen2(*file_id, DATASETNAME, H5P_DEFAULT);
VRFY((*dataset >= 0), "");
}
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index 04088b5..46dfff1 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -805,7 +805,7 @@ coll_chunktest(const char* filename,
VRFY((status >= 0),"");
/* open the collective dataset*/
- dataset = H5Dopen(file, DSET_COLLECTIVE_CHUNK_NAME);
+ dataset = H5Dopen2(file, DSET_COLLECTIVE_CHUNK_NAME, H5P_DEFAULT);
VRFY((dataset >= 0), "");
/* set up dimensions of the slab this process accesses */
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 4f8de21..2d02cdb 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -419,11 +419,11 @@ dataset_readInd(void)
VRFY((ret >= 0), "");
/* open the dataset1 collectively */
- dataset1 = H5Dopen(fid, DATASETNAME1);
+ dataset1 = H5Dopen2(fid, DATASETNAME1, H5P_DEFAULT);
VRFY((dataset1 >= 0), "");
/* open another dataset collectively */
- dataset2 = H5Dopen(fid, DATASETNAME1);
+ dataset2 = H5Dopen2(fid, DATASETNAME1, H5P_DEFAULT);
VRFY((dataset2 >= 0), "");
@@ -932,12 +932,12 @@ dataset_readAll(void)
* Open the datasets in it
* ------------------------- */
/* open the dataset1 collectively */
- dataset1 = H5Dopen(fid, DATASETNAME1);
- VRFY((dataset1 >= 0), "H5Dopen succeeded");
+ dataset1 = H5Dopen2(fid, DATASETNAME1, H5P_DEFAULT);
+ VRFY((dataset1 >= 0), "H5Dopen2 succeeded");
/* open another dataset collectively */
- dataset2 = H5Dopen(fid, DATASETNAME2);
- VRFY((dataset2 >= 0), "H5Dopen 2 succeeded");
+ dataset2 = H5Dopen2(fid, DATASETNAME2, H5P_DEFAULT);
+ VRFY((dataset2 >= 0), "H5Dopen2 2 succeeded");
/*
* Set up dimensions of the slab this process accesses.
@@ -1558,11 +1558,11 @@ extend_readInd(void)
VRFY((ret >= 0), "");
/* open the dataset1 collectively */
- dataset1 = H5Dopen(fid, DATASETNAME1);
+ dataset1 = H5Dopen2(fid, DATASETNAME1, H5P_DEFAULT);
VRFY((dataset1 >= 0), "");
/* open another dataset collectively */
- dataset2 = H5Dopen(fid, DATASETNAME1);
+ dataset2 = H5Dopen2(fid, DATASETNAME1, H5P_DEFAULT);
VRFY((dataset2 >= 0), "");
/* Try extend dataset1 which is open RDONLY. Should fail. */
@@ -1990,11 +1990,11 @@ extend_readAll(void)
VRFY((ret >= 0), "");
/* open the dataset1 collectively */
- dataset1 = H5Dopen(fid, DATASETNAME1);
+ dataset1 = H5Dopen2(fid, DATASETNAME1, H5P_DEFAULT);
VRFY((dataset1 >= 0), "");
/* open another dataset collectively */
- dataset2 = H5Dopen(fid, DATASETNAME1);
+ dataset2 = H5Dopen2(fid, DATASETNAME1, H5P_DEFAULT);
VRFY((dataset2 >= 0), "");
/* Try extend dataset1 which is open RDONLY. Should fail. */
@@ -2236,8 +2236,8 @@ compress_readAll(void)
/* Open dataset with compressed chunks */
- dataset = H5Dopen(fid, "compressed_data");
- VRFY((dataset > 0), "H5Dopen succeeded");
+ dataset = H5Dopen2(fid, "compressed_data", H5P_DEFAULT);
+ VRFY((dataset > 0), "H5Dopen2 succeeded");
/* Try reading & writing data */
if(dataset>0) {
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index 1e76c46..e255c73 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -138,8 +138,8 @@ filter_read_internal(const char *filename, hid_t dcpl,
file = H5Fopen(filename, H5F_ACC_RDWR, access_plist);
VRFY((file >= 0), "H5Fopen");
- dataset = H5Dopen (file, name);
- VRFY((dataset >= 0), "H5Dopen");
+ dataset = H5Dopen2(file, name, H5P_DEFAULT);
+ VRFY((dataset >= 0), "H5Dopen2");
hrc = H5Sselect_hyperslab(sid, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL);
VRFY(hrc>=0, "H5Sselect_hyperslab");
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 0a7a1a8..2fb2aef 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -260,8 +260,8 @@ void compact_dataset(void)
}
- dataset = H5Dopen(iof, dname);
- VRFY((dataset >= 0), "H5Dcreate succeeded");
+ dataset = H5Dopen2(iof, dname, H5P_DEFAULT);
+ VRFY((dataset >= 0), "H5Dopen2 succeeded");
ret = H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, dxpl, inme);
VRFY((ret >= 0), "H5Dread succeeded");
@@ -371,8 +371,8 @@ void null_dataset(void)
}
- dataset = H5Dopen(iof, dname);
- VRFY((dataset >= 0), "H5Dcreate succeeded");
+ dataset = H5Dopen2(iof, dname, H5P_DEFAULT);
+ VRFY((dataset >= 0), "H5Dopen2 succeeded");
/* Try reading from the dataset (make certain our buffer is unmodified) */
ret = H5Dread(dataset, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, dxpl, &uval);
@@ -898,7 +898,7 @@ void group_dataset_read(hid_t fid, int mpi_rank, int m)
/* check the data. */
sprintf(dname, "dataset%d", m);
- did = H5Dopen(gid, dname);
+ did = H5Dopen2(gid, dname, H5P_DEFAULT);
VRFY((did>0), dname);
H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, indata);
@@ -1226,7 +1226,7 @@ int read_dataset(hid_t memspace, hid_t filespace, hid_t gid)
for(n=0; n<NDATASET; n++) {
sprintf(dname, "dataset%d", n);
- did = H5Dopen(gid, dname);
+ did = H5Dopen2(gid, dname, H5P_DEFAULT);
VRFY((did>0), dname);
H5Dread(did, H5T_NATIVE_INT, memspace, filespace, H5P_DEFAULT,
diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c
index 2839cf8..4ca6a96 100644
--- a/testpar/t_pflush2.c
+++ b/testpar/t_pflush2.c
@@ -58,17 +58,17 @@ int check_file(char* name, hid_t fapl)
plist = H5Pcreate(H5P_DATASET_XFER);
H5Pset_dxpl_mpio(plist, H5FD_MPIO_COLLECTIVE);
- if ((file=H5Fopen(name, H5F_ACC_RDONLY, fapl))<0) goto error;
+ if((file = H5Fopen(name, H5F_ACC_RDONLY, fapl)) < 0) goto error;
/* Open the dataset */
- if ((dset=H5Dopen(file, "dset"))<0) goto error;
- if ((space=H5Dget_space(dset))<0) goto error;
- if (H5Sget_simple_extent_dims(space, ds_size, NULL)<0) goto error;
+ if((dset = H5Dopen2(file, "dset", H5P_DEFAULT)) < 0) goto error;
+ if((space = H5Dget_space(dset)) < 0) goto error;
+ if(H5Sget_simple_extent_dims(space, ds_size, NULL) < 0) goto error;
assert(100==ds_size[0] && 100==ds_size[1]);
/* Read some data */
if (H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, plist,
- the_data)<0) goto error;
+ the_data) < 0) goto error;
for (i=0; i<ds_size[0]; i++) {
for (j=0; j<ds_size[1]; j++) {
/*
diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c
index 50c2624..3a5bc2e 100644
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -483,11 +483,11 @@ void coll_write_test(int chunk_factor)
/*
* Open the dataset.
*/
- datasetc = H5Dopen(file,"collect_write");
- VRFY((datasetc >= 0),"H5Dopen succeeded");
+ datasetc = H5Dopen2(file,"collect_write", H5P_DEFAULT);
+ VRFY((datasetc >= 0),"H5Dopen2 succeeded");
- dataseti = H5Dopen(file,"independ_write");
- VRFY((dataseti >= 0),"H5Dopen succeeded");
+ dataseti = H5Dopen2(file,"independ_write", H5P_DEFAULT);
+ VRFY((dataseti >= 0),"H5Dopen2 succeeded");
/*
* Get dataspace of the open dataset.
@@ -760,8 +760,8 @@ void coll_read_test(int chunk_factor)
/*
* Open the dataset.
*/
- dataseti = H5Dopen(file,"independ_write");
- VRFY((dataseti >= 0),"H5Dopen succeeded");
+ dataseti = H5Dopen2(file,"independ_write", H5P_DEFAULT);
+ VRFY((dataseti >= 0),"H5Dopen2 succeeded");
/*
* Get dataspace of the open dataset.
generated by cgit v0.12 at 2024-11-01 11:20:16 (GMT)