[svn-r459] Changed H5Sget_npoints call to H5Sextent_npoints and H5Sselect_npoints calls.

This commit is contained in:
Quincey Koziol 1998-07-07 15:03:50 -05:00
parent a67faf3172
commit 63be23d70d

View File

@ -104,9 +104,9 @@ test_h5s_basic(void)
sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
n = H5Sget_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_npoints");
VERIFY(n, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3, "H5Sget_npoints");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3, "H5Sextent_npoints");
rank = H5Sget_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_lrank");
@ -120,10 +120,10 @@ test_h5s_basic(void)
sid2 = H5Screate_simple(SPACE2_RANK, dims2, max2);
CHECK(sid2, FAIL, "H5Screate_simple");
n = H5Sget_npoints(sid2);
CHECK(n, UFAIL, "H5Snelem");
n = H5Sextent_npoints(sid2);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, SPACE2_DIM1 * SPACE2_DIM2 * SPACE2_DIM3 * SPACE2_DIM4,
"H5Snelem");
"H5Sextent_npoints");
rank = H5Sget_ndims(sid2);
CHECK(rank, UFAIL, "H5Sget_lrank");
@ -174,9 +174,9 @@ test_h5s_scalar_write(void)
sid1 = H5Screate_simple(SPACE3_RANK, NULL, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
n = H5Sget_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_npoints");
VERIFY(n, 1, "H5Sget_npoints");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, 1, "H5Sextent_npoints");
rank = H5Sget_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_lrank");
@ -236,9 +236,9 @@ test_h5s_scalar_read(void)
sid1=H5Dget_space(dataset);
CHECK(sid1, FAIL, "H5Dget_space");
n = H5Sget_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_npoints");
VERIFY(n, 1, "H5Sget_npoints");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, 1, "H5Sextent_npoints");
rank = H5Sget_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_lrank");
@ -313,9 +313,9 @@ test_h5s_compound_scalar_write(void)
sid1 = H5Screate_simple(SPACE3_RANK, NULL, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
n = H5Sget_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_npoints");
VERIFY(n, 1, "H5Sget_npoints");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, 1, "H5Sextent_npoints");
rank = H5Sget_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_lrank");
@ -377,9 +377,9 @@ test_h5s_compound_scalar_read(void)
sid1=H5Dget_space(dataset);
CHECK(sid1, FAIL, "H5Dget_space");
n = H5Sget_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_npoints");
VERIFY(n, 1, "H5Sget_npoints");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, 1, "H5Sextent_npoints");
rank = H5Sget_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_lrank");