diff options
Diffstat (limited to 'test/cmpd_dset.c')
| -rw-r--r-- | test/cmpd_dset.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index aad6339..a98a9b3 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -130,7 +130,7 @@ main (void) /* Create the file */ file = H5Fcreate ("cmpd_dset.h5", H5F_ACC_TRUNC, - H5C_DEFAULT, H5C_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT); assert (file>=0); /* Create the data space */ @@ -166,11 +166,11 @@ STEP 1: Initialize dataset `s1' and store it on disk in native order.\n"); assert (s1_tid>=0); /* Create the dataset */ - dataset = H5Dcreate (file, "s1", s1_tid, space, H5C_DEFAULT); + dataset = H5Dcreate (file, "s1", s1_tid, space, H5P_DEFAULT); assert (dataset>=0); /* Write the data */ - status = H5Dwrite (dataset, s1_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s1); + status = H5Dwrite (dataset, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1); assert (status>=0); /* @@ -195,7 +195,7 @@ STEP 2: Read the dataset from disk into a new memory buffer which has the\n\ assert (s2_tid>=0); /* Read the data */ - status = H5Dread (dataset, s2_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s2); + status = H5Dread (dataset, s2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s2); assert (status>=0); /* Compare s2 with s1. They should be the same */ @@ -227,7 +227,7 @@ STEP 3: Read the dataset again with members in a different order.\n"); assert (s3_tid>=0); /* Read the data */ - status = H5Dread (dataset, s3_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s3); + status = H5Dread (dataset, s3_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s3); assert (status>=0); /* Compare s3 with s1. They should be the same */ @@ -255,7 +255,7 @@ STEP 4: Read a subset of the members.\n"); assert (s4_tid>=0); /* Read the data */ - status = H5Dread (dataset, s4_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s4); + status = H5Dread (dataset, s4_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s4); assert (status>=0); /* Compare s4 with s1 */ @@ -291,7 +291,7 @@ STEP 5: Read members into a superset which is partially initialized.\n"); assert (s5_tid>=0); /* Read the data */ - status = H5Dread (dataset, s5_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s5); + status = H5Dread (dataset, s5_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s5); assert (status>=0); /* Check that the data was read properly */ @@ -329,11 +329,11 @@ STEP 6: Update fields `b' and `d' on the file, leaving the other fields\n\ } /* Write the data to file */ - status = H5Dwrite (dataset, s4_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s4); + status = H5Dwrite (dataset, s4_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s4); assert (status>=0); /* Read the data back */ - status = H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s1); + status = H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1); assert (status>=0); /* Compare */ @@ -360,7 +360,7 @@ STEP 7: Reading original dataset with explicit data space.\n"); assert (s7_sid>=0); /* Read the dataset */ - status = H5Dread (dataset, s2_tid, s7_sid, H5S_ALL, H5C_DEFAULT, s2); + status = H5Dread (dataset, s2_tid, s7_sid, H5S_ALL, H5P_DEFAULT, s2); assert (status>=0); /* Compare */ @@ -401,7 +401,7 @@ STEP 8: Read middle third hyperslab into memory array.\n"); /* Read the dataset */ s8 = calloc (h_size[0]*h_size[1], sizeof(s1_t)); assert (s8); - status = H5Dread (dataset, s1_tid, s8_m_sid, s8_f_sid, H5C_DEFAULT, s8); + status = H5Dread (dataset, s1_tid, s8_m_sid, s8_f_sid, H5P_DEFAULT, s8); assert (status>=0); /* Compare */ @@ -435,7 +435,7 @@ STEP 9: Read middle third of hyperslab into middle third of memory array.\n"); memset (s2, 0xFF, NX*NY*sizeof(s2_t)); /* Read the hyperslab */ - status = H5Dread (dataset, s2_tid, s8_f_sid, s8_f_sid, H5C_DEFAULT, s2); + status = H5Dread (dataset, s2_tid, s8_f_sid, s8_f_sid, H5P_DEFAULT, s2); assert (status>=0); /* Compare */ @@ -474,7 +474,7 @@ STEP 10: Read middle third of hyperslab into middle third of memory array\n\ memset (s5, 0xFF, NX*NY*sizeof(s5_t)); /* Read the hyperslab */ - status = H5Dread (dataset, s5_tid, s8_f_sid, s8_f_sid, H5C_DEFAULT, s5); + status = H5Dread (dataset, s5_tid, s8_f_sid, s8_f_sid, H5P_DEFAULT, s5); assert (status>=0); /* Compare */ @@ -525,11 +525,11 @@ STEP 11: Write an array back to the middle third of the dataset to\n\ memset (s11, 0xff, h_size[0]*h_size[1]*sizeof(s4_t)); /* Write to disk */ - status = H5Dwrite (dataset, s4_tid, s8_m_sid, s8_f_sid, H5C_DEFAULT, s11); + status = H5Dwrite (dataset, s4_tid, s8_m_sid, s8_f_sid, H5P_DEFAULT, s11); assert (status>=0); /* Read the whole thing */ - status = H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s1); + status = H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1); assert (status>=0); /* Compare */ |