1. Elena Pourmal
  2. hdf5_ep

Source

Source viewDiff to previous
 
57
57
 
​
58
58
 
    /* Open file */
59
59
 
    fid = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT);
60
60
 
    CHECK(fid, FAIL, "H5Fopen");
61
61
 
​
62
62
 
    /*
63
63
 
     * Open the chunked dataset with layout version 3
64
64
 
     */
65
65
 
​
66
66
 
    /* Open the dataset */
67
 
-
    dset = H5Dopen(fid, "DS_chunked_layout_3", H5P_DEFAULT);
68
 
-
    CHECK(dset, FAIL, "H5Dopen");
 
67
+
    dset = H5Dopen2(fid, "DS_chunked_layout_3", H5P_DEFAULT);
 
68
+
    CHECK(dset, FAIL, "H5Dopen2");
69
69
 
​
70
70
 
    ret = H5Dclose(dset);
71
71
 
    CHECK(ret, FAIL, "H5Dclose");
72
72
 
​
73
73
 
    /*
74
74
 
     * Open the chunked dataset with layout version 4.  This should fail
75
75
 
     * with HDF5 1.8.
76
76
 
     */
77
77
 
​
78
78
 
    /* Open the dataset */
79
79
 
    H5E_BEGIN_TRY {
80
 
-
        dset = H5Dopen(fid, "DS_chunked_layout_4", H5P_DEFAULT);
 
80
+
        dset = H5Dopen2(fid, "DS_chunked_layout_4", H5P_DEFAULT);
81
81
 
    } H5E_END_TRY;
82
 
-
    VERIFY(dset, FAIL, "H5Dopen");
 
82
+
    VERIFY(dset, FAIL, "H5Dopen2");
83
83
 
​
84
84
 
    /* Close the file */
85
85
 
    ret = H5Fclose(fid);
86
86
 
    CHECK(ret, FAIL, "H5Fclose");
87
87
 
}
88
88
 
​
89
89
 
/***********************************************************************
90
90
 
 * test_earliest_v18() reads file "bounds_earliest_v18.h5"
91
91
 
 *
92
92
 
 * Description:
Show more
107
107
 
​
108
108
 
    /* Open file */
109
109
 
    fid = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT);
110
110
 
    CHECK(fid, FAIL, "H5Fopen");
111
111
 
​
112
112
 
    /*
113
113
 
     * Open the chunked dataset with layout version 3
114
114
 
     */
115
115
 
​
116
116
 
    /* Open the dataset */
117
 
-
    dset = H5Dopen(fid, "DS_chunked_layout_3", H5P_DEFAULT);
118
 
-
    CHECK(dset, FAIL, "H5Dopen");
 
117
+
    dset = H5Dopen2(fid, "DS_chunked_layout_3", H5P_DEFAULT);
 
118
+
    CHECK(dset, FAIL, "H5Dopen2");
119
119
 
​
120
120
 
    ret = H5Dclose(dset);
121
121
 
    CHECK(ret, FAIL, "H5Dclose");
122
122
 
​
123
123
 
    /* Close the file */
124
124
 
    ret = H5Fclose(fid);
125
125
 
    CHECK(ret, FAIL, "H5Fclose");
126
126
 
}
127
127
 
​
128
128
 
/***********************************************************************
Show more
170
170
 
​
171
171
 
    /* Open file */
172
172
 
    fid = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT);
173
173
 
    CHECK(fid, FAIL, "H5Fopen");
174
174
 
​
175
175
 
    /*
176
176
 
     * Open the chunked dataset with layout version 3
177
177
 
     */
178
178
 
​
179
179
 
    /* Open the dataset */
180
 
-
    dset = H5Dopen(fid, "DS_chunked_layout_3", H5P_DEFAULT);
181
 
-
    CHECK(dset, FAIL, "H5Dopen");
 
180
+
    dset = H5Dopen2(fid, "DS_chunked_layout_3", H5P_DEFAULT);
 
181
+
    CHECK(dset, FAIL, "H5Dopen2");
182
182
 
​
183
183
 
    ret = H5Dclose(dset);
184
184
 
    CHECK(ret, FAIL, "H5Dclose");
185
185
 
​
186
186
 
    /* Close the file */
187
187
 
    ret = H5Fclose(fid);
188
188
 
    CHECK(ret, FAIL, "H5Fclose");
189
189
 
}
190
190
 
​
191
191
 
/***********************************************************************
Show more
211
211
 
​
212
212
 
    /* Open file */
213
213
 
    fid = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT);
214
214
 
    CHECK(fid, FAIL, "H5Fopen");
215
215
 
​
216
216
 
    /*
217
217
 
     * Open the chunked dataset with layout version 3
218
218
 
     */
219
219
 
​
220
220
 
    /* Open the dataset */
221
 
-
    dset = H5Dopen(fid, "DS_chunked_layout_3", H5P_DEFAULT);
222
 
-
    CHECK(dset, FAIL, "H5Dopen");
 
221
+
    dset = H5Dopen2(fid, "DS_chunked_layout_3", H5P_DEFAULT);
 
222
+
    CHECK(dset, FAIL, "H5Dopen2");
223
223
 
​
224
224
 
    ret = H5Dclose(dset);
225
225
 
    CHECK(ret, FAIL, "H5Dclose");
226
226
 
​
227
227
 
    /*
228
228
 
     * Open the chunked dataset with layout version 4.  This should fail
229
229
 
     * with HDF5 1.8.
230
230
 
     */
231
231
 
​
232
232
 
    /* Open the dataset */
233
233
 
    H5E_BEGIN_TRY {
234
 
-
        dset = H5Dopen(fid, "DS_chunked_layout_4", H5P_DEFAULT);
 
234
+
        dset = H5Dopen2(fid, "DS_chunked_layout_4", H5P_DEFAULT);
235
235
 
    } H5E_END_TRY;
236
 
-
    VERIFY(dset, FAIL, "H5Dopen");
 
236
+
    VERIFY(dset, FAIL, "H5Dopen2");
237
237
 
​
238
238
 
    /* Close the file */
239
239
 
    ret = H5Fclose(fid);
240
240
 
    CHECK(ret, FAIL, "H5Fclose");
241
241
 
}
242
242
 
​
243
243
 
/*************************************************************************
244
244
 
**  test_verbounds_18()
245
245
 
**      Main routine to test library version bounds with HDF5 1.8 library.
246
246
 
**