diff options
author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-16 16:12:08 (GMT) |
---|---|---|
committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-01-16 16:12:08 (GMT) |
commit | 8005df6417fa0f57b8769be046ae9bd7b32f9202 (patch) | |
tree | e8f1af762f6d5e4fdcad76e0d4c72811948401ab /tools/testfiles/tindicessub2.ddl | |
parent | 5382d51033772833b1d32edc4b4a648576cbf0ee (diff) | |
download | hdf5-8005df6417fa0f57b8769be046ae9bd7b32f9202.zip hdf5-8005df6417fa0f57b8769be046ae9bd7b32f9202.tar.gz hdf5-8005df6417fa0f57b8769be046ae9bd7b32f9202.tar.bz2 |
[svn-r14437] bug fix for h5dump subsetting (deal with blocks)and new test runs
add a check for block overlap after the command line parsing
* Algorithm
*
* In a inner loop, the parameters from SSET are translated into temporary
* variables so that 1 row is printed at a time (getting the coordinate indices
* at each row).
* We define the stride, count and block to be 1 in the row dimension to achieve
* this and advance until all points are printed.
* An outer loop for cases where dimensionality is greater than 2D is made.
* In each iteration, the 2D block is displayed in the inner loop. The remaining
* slower dimensions above the first 2 are incremented one at a time in the outer loop
*
* The element position is obtained from the matrix according to:
* Given an index I(z,y,x) its position from the beginning of an array
* of sizes A(size_z, size_y,size_x) is given by
* Position of I(z,y,x) = index_z * size_y * size_x
* + index_y * size_x
* + index_x
*
tested: windows, linux
Diffstat (limited to 'tools/testfiles/tindicessub2.ddl')
-rw-r--r-- | tools/testfiles/tindicessub2.ddl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/testfiles/tindicessub2.ddl b/tools/testfiles/tindicessub2.ddl index 39260bc..7b70d12 100644 --- a/tools/testfiles/tindicessub2.ddl +++ b/tools/testfiles/tindicessub2.ddl @@ -1,5 +1,5 @@ ############################# -Expected output for 'h5dump -d 2d -s 1,2 -c 2,3 -k 1,1 -S 2,1 taindices.h5' +Expected output for 'h5dump -d 2d -s 1,2 -S 3,3 -c 3,2 -k 2,2 taindices.h5' ############################# HDF5 "taindices.h5" { DATASET "2d" { @@ -7,12 +7,16 @@ DATASET "2d" { DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) } SUBSET { START ( 1, 2 ); - STRIDE ( 2, 1 ); - COUNT ( 2, 3 ); - BLOCK ( 1, 1 ); + STRIDE ( 3, 3 ); + COUNT ( 3, 2 ); + BLOCK ( 2, 2 ); DATA { - (1,2): 12, 13, 14, - (3,2): 32, 33, 34 + (1,2): 12, 13, 15, 16, + (2,2): 22, 23, 25, 26, + (4,2): 42, 43, 45, 46, + (5,2): 52, 53, 55, 56, + (7,2): 72, 73, 75, 76, + (8,2): 82, 83, 85, 86 } } } |