diff options
author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2005-02-08 20:55:17 (GMT) |
---|---|---|
committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2005-02-08 20:55:17 (GMT) |
commit | 983e9a9e267845c80995898fba2bc7e6ebb0e881 (patch) | |
tree | 9969499d2f5dda6de472656b1f439732dab95eb1 /tools/testfiles | |
parent | 70c0ba03cec20ad3c353fcf776f4b48f2ac8da9f (diff) | |
download | hdf5-983e9a9e267845c80995898fba2bc7e6ebb0e881.zip hdf5-983e9a9e267845c80995898fba2bc7e6ebb0e881.tar.gz hdf5-983e9a9e267845c80995898fba2bc7e6ebb0e881.tar.bz2 |
[svn-r9961]
Purpose:
bug fix, new test file
Description:
h5dump was not properly displaying array indices > 3D
Solution:
added the same algorythm and data structure that h5diff uses to calculate the array index
from a element number position
Platforms tested:
linux
solaris
Misc. update:
Diffstat (limited to 'tools/testfiles')
-rw-r--r-- | tools/testfiles/taindices.h5 | bin | 16736 -> 19264 bytes | |||
-rw-r--r-- | tools/testfiles/tindicesno.ddl | 60 | ||||
-rw-r--r-- | tools/testfiles/tindicesyes.ddl | 60 |
3 files changed, 120 insertions, 0 deletions
diff --git a/tools/testfiles/taindices.h5 b/tools/testfiles/taindices.h5 Binary files differindex e13a69c..a7cb470 100644 --- a/tools/testfiles/taindices.h5 +++ b/tools/testfiles/taindices.h5 diff --git a/tools/testfiles/tindicesno.ddl b/tools/testfiles/tindicesno.ddl index efdbe5e..a3ba33b 100644 --- a/tools/testfiles/tindicesno.ddl +++ b/tools/testfiles/tindicesno.ddl @@ -71,6 +71,36 @@ GROUP "/" { 398, 399 } } + DATASET "4d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 3, 4, 5 ) / ( 2, 3, 4, 5 ) } + DATA { + 0, 1, 2, 3, 4, + 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119 + } + } GROUP "g1" { GROUP "g2" { GROUP "g3" { @@ -159,6 +189,36 @@ GROUP "/" { 390, 391, 392, 393, 394, 395, 396, 397, 398, 399 } } + DATASET "4d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 3, 4, 5 ) / ( 2, 3, 4, 5 ) } + DATA { + 0, 1, 2, 3, 4, + 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119 + } + } } } } diff --git a/tools/testfiles/tindicesyes.ddl b/tools/testfiles/tindicesyes.ddl index ba6624e..2db5c7d 100644 --- a/tools/testfiles/tindicesyes.ddl +++ b/tools/testfiles/tindicesyes.ddl @@ -78,6 +78,36 @@ GROUP "/" { (1,1,96): 396, 397, 398, 399 } } + DATASET "4d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 3, 4, 5 ) / ( 2, 3, 4, 5 ) } + DATA { + (0,0,0,0): 0, 1, 2, 3, 4, + (0,0,1,0): 5, 6, 7, 8, 9, + (0,0,2,0): 10, 11, 12, 13, 14, + (0,0,3,0): 15, 16, 17, 18, 19, + (0,1,0,0): 20, 21, 22, 23, 24, + (0,1,1,0): 25, 26, 27, 28, 29, + (0,1,2,0): 30, 31, 32, 33, 34, + (0,1,3,0): 35, 36, 37, 38, 39, + (0,2,0,0): 40, 41, 42, 43, 44, + (0,2,1,0): 45, 46, 47, 48, 49, + (0,2,2,0): 50, 51, 52, 53, 54, + (0,2,3,0): 55, 56, 57, 58, 59, + (1,0,0,0): 60, 61, 62, 63, 64, + (1,0,1,0): 65, 66, 67, 68, 69, + (1,0,2,0): 70, 71, 72, 73, 74, + (1,0,3,0): 75, 76, 77, 78, 79, + (1,1,0,0): 80, 81, 82, 83, 84, + (1,1,1,0): 85, 86, 87, 88, 89, + (1,1,2,0): 90, 91, 92, 93, 94, + (1,1,3,0): 95, 96, 97, 98, 99, + (1,2,0,0): 100, 101, 102, 103, 104, + (1,2,1,0): 105, 106, 107, 108, 109, + (1,2,2,0): 110, 111, 112, 113, 114, + (1,2,3,0): 115, 116, 117, 118, 119 + } + } GROUP "g1" { GROUP "g2" { GROUP "g3" { @@ -180,6 +210,36 @@ GROUP "/" { (1,1,98): 398, 399 } } + DATASET "4d" { + DATATYPE H5T_STD_I32LE + DATASPACE SIMPLE { ( 2, 3, 4, 5 ) / ( 2, 3, 4, 5 ) } + DATA { + (0,0,0,0): 0, 1, 2, 3, 4, + (0,0,1,0): 5, 6, 7, 8, 9, + (0,0,2,0): 10, 11, 12, 13, 14, + (0,0,3,0): 15, 16, 17, 18, 19, + (0,1,0,0): 20, 21, 22, 23, 24, + (0,1,1,0): 25, 26, 27, 28, 29, + (0,1,2,0): 30, 31, 32, 33, 34, + (0,1,3,0): 35, 36, 37, 38, 39, + (0,2,0,0): 40, 41, 42, 43, 44, + (0,2,1,0): 45, 46, 47, 48, 49, + (0,2,2,0): 50, 51, 52, 53, 54, + (0,2,3,0): 55, 56, 57, 58, 59, + (1,0,0,0): 60, 61, 62, 63, 64, + (1,0,1,0): 65, 66, 67, 68, 69, + (1,0,2,0): 70, 71, 72, 73, 74, + (1,0,3,0): 75, 76, 77, 78, 79, + (1,1,0,0): 80, 81, 82, 83, 84, + (1,1,1,0): 85, 86, 87, 88, 89, + (1,1,2,0): 90, 91, 92, 93, 94, + (1,1,3,0): 95, 96, 97, 98, 99, + (1,2,0,0): 100, 101, 102, 103, 104, + (1,2,1,0): 105, 106, 107, 108, 109, + (1,2,2,0): 110, 111, 112, 113, 114, + (1,2,3,0): 115, 116, 117, 118, 119 + } + } } } } |