summaryrefslogtreecommitdiffstats
path: root/tools/testfiles/tindicessub3.ddl
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-16 16:12:08 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2008-01-16 16:12:08 (GMT)
commit8005df6417fa0f57b8769be046ae9bd7b32f9202 (patch)
treee8f1af762f6d5e4fdcad76e0d4c72811948401ab /tools/testfiles/tindicessub3.ddl
parent5382d51033772833b1d32edc4b4a648576cbf0ee (diff)
downloadhdf5-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/tindicessub3.ddl')
-rw-r--r--tools/testfiles/tindicessub3.ddl18
1 files changed, 12 insertions, 6 deletions
diff --git a/tools/testfiles/tindicessub3.ddl b/tools/testfiles/tindicessub3.ddl
index 16c71d3..fde8e82 100644
--- a/tools/testfiles/tindicessub3.ddl
+++ b/tools/testfiles/tindicessub3.ddl
@@ -1,5 +1,5 @@
#############################
-Expected output for 'h5dump -d 3d -s 0,1,2 -c 1,2,3 -k 1,1,1 -S 1,2,1 taindices.h5'
+Expected output for 'h5dump -d 3d -s 0,1,2 -S 1,3,3 -c 2,2,2 -k 1,2,2 taindices.h5'
#############################
HDF5 "taindices.h5" {
DATASET "3d" {
@@ -7,12 +7,18 @@ DATASET "3d" {
DATASPACE SIMPLE { ( 2, 10, 10 ) / ( 2, 10, 10 ) }
SUBSET {
START ( 0, 1, 2 );
- STRIDE ( 1, 2, 1 );
- COUNT ( 1, 2, 3 );
- BLOCK ( 1, 1, 1 );
+ STRIDE ( 1, 3, 3 );
+ COUNT ( 2, 2, 2 );
+ BLOCK ( 1, 2, 2 );
DATA {
- (0,1,2): 12, 13, 14,
- (0,3,2): 32, 33, 34
+ (0,1,2): 12, 13, 15, 16,
+ (0,2,2): 22, 23, 25, 26,
+ (0,4,2): 42, 43, 45, 46,
+ (0,5,2): 52, 53, 55, 56
+ (1,1,2): 112, 113, 115, 116,
+ (1,2,2): 122, 123, 125, 126,
+ (1,4,2): 142, 143, 145, 146,
+ (1,5,2): 152, 153, 155, 156
}
}
}