From cab0d73cb381ced30a5284ef798961dc55547672 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 21 Nov 2000 14:35:23 -0500 Subject: [svn-r2988] Purpose: Updating test files. Description: Updated test files to reflect changes to DDL. Platforms tested: FreeBSD 4.1.1 (hawkwind) --- tools/testfiles/tall-1.ddl | 32 +-- tools/testfiles/tall-2.ddl | 20 +- tools/testfiles/tall-3.ddl | 4 +- tools/testfiles/tarray1.ddl | 15 ++ tools/testfiles/tarray1.h5 | Bin 0 -> 2112 bytes tools/testfiles/tarray1.ls | 6 + tools/testfiles/tarray2.ddl | 61 +++++ tools/testfiles/tarray2.h5 | Bin 0 -> 3008 bytes tools/testfiles/tarray3.ddl | 97 +++++++ tools/testfiles/tarray3.h5 | Bin 0 -> 3200 bytes tools/testfiles/tarray4.ddl | 68 +++++ tools/testfiles/tarray4.h5 | Bin 0 -> 2176 bytes tools/testfiles/tarray5.h5 | Bin 0 -> 2368 bytes tools/testfiles/tarray6.ddl | 17 ++ tools/testfiles/tarray6.h5 | Bin 0 -> 6400 bytes tools/testfiles/tarray7.ddl | 17 ++ tools/testfiles/tarray7.h5 | Bin 0 -> 6400 bytes tools/testfiles/tattr-1.ddl | 31 ++- tools/testfiles/tattr-2.ddl | 23 +- tools/testfiles/tattr-3.ddl | 4 +- tools/testfiles/tcomp-1.ddl | 54 ++-- tools/testfiles/tcomp-2.ddl | 16 +- tools/testfiles/tcomp-3.ddl | 11 +- tools/testfiles/tdset-1.ddl | 8 +- tools/testfiles/tdset-2.ddl | 8 +- tools/testfiles/thlink-1.ddl | 4 +- tools/testfiles/thlink-2.ddl | 4 +- tools/testfiles/thlink-3.ddl | 4 +- tools/testfiles/thlink-4.ddl | 4 +- tools/testfiles/thlink-5.ddl | 4 +- tools/testfiles/tnestcomp-1.ddl | 19 +- tools/testfiles/tsaf.ddl | 568 ++++++++++++++++++++-------------------- tools/testfiles/tstr-1.ddl | 79 +++--- tools/testfiles/tstr-2.ddl | 157 +++++++++++ tools/testfiles/tvldtypes.ddl | 35 --- tools/testfiles/tvldtypes.h5 | Bin 8336 -> 0 bytes tools/testfiles/tvldtypes.ls | 20 -- tools/testfiles/tvldtypes1.ddl | 28 ++ tools/testfiles/tvldtypes1.h5 | Bin 0 -> 8336 bytes tools/testfiles/tvldtypes1.ls | 14 + tools/testfiles/tvldtypes2.ddl | 15 ++ tools/testfiles/tvldtypes2.h5 | Bin 0 -> 6208 bytes tools/testfiles/tvldtypes3.ddl | 37 +++ tools/testfiles/tvldtypes3.h5 | Bin 0 -> 6240 bytes tools/testfiles/tvldtypes4.ddl | 50 ++++ tools/testfiles/tvldtypes4.h5 | Bin 0 -> 6208 bytes tools/testh5dump.sh | 16 +- tools/testh5ls.sh | 5 +- 48 files changed, 1051 insertions(+), 504 deletions(-) create mode 100644 tools/testfiles/tarray1.ddl create mode 100644 tools/testfiles/tarray1.h5 create mode 100644 tools/testfiles/tarray1.ls create mode 100644 tools/testfiles/tarray2.ddl create mode 100644 tools/testfiles/tarray2.h5 create mode 100644 tools/testfiles/tarray3.ddl create mode 100644 tools/testfiles/tarray3.h5 create mode 100644 tools/testfiles/tarray4.ddl create mode 100644 tools/testfiles/tarray4.h5 create mode 100644 tools/testfiles/tarray5.h5 create mode 100644 tools/testfiles/tarray6.ddl create mode 100644 tools/testfiles/tarray6.h5 create mode 100644 tools/testfiles/tarray7.ddl create mode 100644 tools/testfiles/tarray7.h5 create mode 100644 tools/testfiles/tstr-2.ddl delete mode 100644 tools/testfiles/tvldtypes.ddl delete mode 100644 tools/testfiles/tvldtypes.h5 delete mode 100644 tools/testfiles/tvldtypes.ls create mode 100644 tools/testfiles/tvldtypes1.ddl create mode 100644 tools/testfiles/tvldtypes1.h5 create mode 100644 tools/testfiles/tvldtypes1.ls create mode 100644 tools/testfiles/tvldtypes2.ddl create mode 100644 tools/testfiles/tvldtypes2.h5 create mode 100644 tools/testfiles/tvldtypes3.ddl create mode 100644 tools/testfiles/tvldtypes3.h5 create mode 100644 tools/testfiles/tvldtypes4.ddl create mode 100644 tools/testfiles/tvldtypes4.h5 diff --git a/tools/testfiles/tall-1.ddl b/tools/testfiles/tall-1.ddl index 521ea3c..31f0608 100644 --- a/tools/testfiles/tall-1.ddl +++ b/tools/testfiles/tall-1.ddl @@ -4,15 +4,15 @@ Expected output for 'h5dump tall.h5' HDF5 "tall.h5" { GROUP "/" { ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE H5T_STD_I8BE + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { 97, 98, 99, 100, 101, 102, 103, 104, 105, 0 } } ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 2, 2 ) / ( 2, 2 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 2, 2 ) / ( 2, 2 ) } DATA { 0, 1, 2, 3 @@ -21,8 +21,8 @@ GROUP "/" { GROUP "g1" { GROUP "g1.1" { DATASET "dset1.1.1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) } DATA { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, @@ -36,16 +36,16 @@ GROUP "/" { 0, 9, 18, 27, 36, 45, 54, 63, 72, 81 } ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + DATATYPE H5T_STD_I8BE + DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { 49, 115, 116, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0 } } ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + DATATYPE H5T_STD_I8BE + DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { 50, 110, 100, 32, 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 100, 115, 101, 116, 49, 46, 49, 46, 49, 0 @@ -53,8 +53,8 @@ GROUP "/" { } } DATASET "dset1.1.2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 20 ) / ( 20 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 20 ) / ( 20 ) } DATA { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 @@ -71,15 +71,15 @@ GROUP "/" { } GROUP "g2" { DATASET "dset2.1" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 } } DATASET "dset2.2" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 3, 5 ) / ( 3, 5 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 3, 5 ) / ( 3, 5 ) } DATA { 0, 0.1, 0.2, 0.3, 0.4, 0, 0.2, 0.4, 0.6, 0.8, diff --git a/tools/testfiles/tall-2.ddl b/tools/testfiles/tall-2.ddl index ff5a7f3..200c828 100644 --- a/tools/testfiles/tall-2.ddl +++ b/tools/testfiles/tall-2.ddl @@ -4,24 +4,24 @@ Expected output for 'h5dump -header -g /g1/g1.1 -a attr2 tall.h5' HDF5 "tall.h5" { GROUP "/g1/g1.1" { DATASET "dset1.1.1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10, 10 ) / ( 10, 10 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 10, 10 ) / ( 10, 10 ) } ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + DATATYPE H5T_STD_I8BE + DATASPACE SIMPLE { ( 27 ) / ( 27 ) } } ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + DATATYPE H5T_STD_I8BE + DATASPACE SIMPLE { ( 27 ) / ( 27 ) } } } DATASET "dset1.1.2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 20 ) / ( 20 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 20 ) / ( 20 ) } } } ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 2, 2 ) / ( 2, 2 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 2, 2 ) / ( 2, 2 ) } } } diff --git a/tools/testfiles/tall-3.ddl b/tools/testfiles/tall-3.ddl index 389ad0a..8372a21 100644 --- a/tools/testfiles/tall-3.ddl +++ b/tools/testfiles/tall-3.ddl @@ -3,8 +3,8 @@ Expected output for 'h5dump -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5' ############################# HDF5 "tall.h5" { DATASET "/g2/dset2.1" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9 } diff --git a/tools/testfiles/tarray1.ddl b/tools/testfiles/tarray1.ddl new file mode 100644 index 0000000..2f6df5f --- /dev/null +++ b/tools/testfiles/tarray1.ddl @@ -0,0 +1,15 @@ +############################# +Expected output for 'h5dump tarray1.h5' +############################# +HDF5 "tarray1.h5" { +GROUP "/" { + DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_STD_I32LE } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + [ 0, 1, 2, 3 ], [ 10, 11, 12, 13 ], [ 20, 21, 22, 23 ], + [ 30, 31, 32, 33 ] + } + } +} +} diff --git a/tools/testfiles/tarray1.h5 b/tools/testfiles/tarray1.h5 new file mode 100644 index 0000000..d62d752 Binary files /dev/null and b/tools/testfiles/tarray1.h5 differ diff --git a/tools/testfiles/tarray1.ls b/tools/testfiles/tarray1.ls new file mode 100644 index 0000000..5180db6 --- /dev/null +++ b/tools/testfiles/tarray1.ls @@ -0,0 +1,6 @@ +############################# + output for 'h5ls -w80 -r -d tarray1.h5' +############################# +/tarray1.h5/Dataset1 Dataset {4} + Data: + (0) [0,1,2,3], [10,11,12,13], [20,21,22,23], [30,31,32,33] diff --git a/tools/testfiles/tarray2.ddl b/tools/testfiles/tarray2.ddl new file mode 100644 index 0000000..2080056 --- /dev/null +++ b/tools/testfiles/tarray2.ddl @@ -0,0 +1,61 @@ +############################# +Expected output for 'h5dump tarray2.h5' +############################# +HDF5 "tarray2.h5" { +GROUP "/" { + DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [3][4][5] H5T_STD_I32LE } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + [ 0, 1, 2, 3, 4, + 10, 11, 12, 13, 14, + 20, 21, 22, 23, 24, + 30, 31, 32, 33, 34, + 100, 101, 102, 103, 104, + 110, 111, 112, 113, 114, + 120, 121, 122, 123, 124, + 130, 131, 132, 133, 134, + 200, 201, 202, 203, 204, + 210, 211, 212, 213, 214, + 220, 221, 222, 223, 224, + 230, 231, 232, 233, 234 ], + [ 1000, 1001, 1002, 1003, 1004, + 1010, 1011, 1012, 1013, 1014, + 1020, 1021, 1022, 1023, 1024, + 1030, 1031, 1032, 1033, 1034, + 1100, 1101, 1102, 1103, 1104, + 1110, 1111, 1112, 1113, 1114, + 1120, 1121, 1122, 1123, 1124, + 1130, 1131, 1132, 1133, 1134, + 1200, 1201, 1202, 1203, 1204, + 1210, 1211, 1212, 1213, 1214, + 1220, 1221, 1222, 1223, 1224, + 1230, 1231, 1232, 1233, 1234 ], + [ 2000, 2001, 2002, 2003, 2004, + 2010, 2011, 2012, 2013, 2014, + 2020, 2021, 2022, 2023, 2024, + 2030, 2031, 2032, 2033, 2034, + 2100, 2101, 2102, 2103, 2104, + 2110, 2111, 2112, 2113, 2114, + 2120, 2121, 2122, 2123, 2124, + 2130, 2131, 2132, 2133, 2134, + 2200, 2201, 2202, 2203, 2204, + 2210, 2211, 2212, 2213, 2214, + 2220, 2221, 2222, 2223, 2224, + 2230, 2231, 2232, 2233, 2234 ], + [ 3000, 3001, 3002, 3003, 3004, + 3010, 3011, 3012, 3013, 3014, + 3020, 3021, 3022, 3023, 3024, + 3030, 3031, 3032, 3033, 3034, + 3100, 3101, 3102, 3103, 3104, + 3110, 3111, 3112, 3113, 3114, + 3120, 3121, 3122, 3123, 3124, + 3130, 3131, 3132, 3133, 3134, + 3200, 3201, 3202, 3203, 3204, + 3210, 3211, 3212, 3213, 3214, + 3220, 3221, 3222, 3223, 3224, + 3230, 3231, 3232, 3233, 3234 ] + } + } +} +} diff --git a/tools/testfiles/tarray2.h5 b/tools/testfiles/tarray2.h5 new file mode 100644 index 0000000..5582c5a Binary files /dev/null and b/tools/testfiles/tarray2.h5 differ diff --git a/tools/testfiles/tarray3.ddl b/tools/testfiles/tarray3.ddl new file mode 100644 index 0000000..b24181a --- /dev/null +++ b/tools/testfiles/tarray3.ddl @@ -0,0 +1,97 @@ +############################# +Expected output for 'h5dump tarray3.h5' +############################# +HDF5 "tarray3.h5" { +GROUP "/" { + DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_ARRAY { [6][3] H5T_STD_I32LE } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + [ [ 0, 1, 2, + 10, 11, 12, + 20, 21, 22, + 30, 31, 32, + 40, 41, 42, + 50, 51, 52 ], [ 100, 101, 102, + 110, 111, 112, + 120, 121, 122, + 130, 131, 132, + 140, 141, 142, + 150, 151, 152 ], [ 200, 201, 202, + 210, 211, 212, + 220, 221, 222, + 230, 231, 232, + 240, 241, 242, + 250, 251, 252 ], [ 300, 301, 302, + 310, 311, 312, + 320, 321, 322, + 330, 331, 332, + 340, 341, 342, + 350, 351, 352 ] ], + [ [ 1000, 1001, 1002, + 1010, 1011, 1012, + 1020, 1021, 1022, + 1030, 1031, 1032, + 1040, 1041, 1042, + 1050, 1051, 1052 ], [ 1100, 1101, 1102, + 1110, 1111, 1112, + 1120, 1121, 1122, + 1130, 1131, 1132, + 1140, 1141, 1142, + 1150, 1151, 1152 ], [ 1200, 1201, 1202, + 1210, 1211, 1212, + 1220, 1221, 1222, + 1230, 1231, 1232, + 1240, 1241, 1242, + 1250, 1251, 1252 ], [ 1300, 1301, 1302, + 1310, 1311, 1312, + 1320, 1321, 1322, + 1330, 1331, 1332, + 1340, 1341, 1342, + 1350, 1351, 1352 ] ], + [ [ 2000, 2001, 2002, + 2010, 2011, 2012, + 2020, 2021, 2022, + 2030, 2031, 2032, + 2040, 2041, 2042, + 2050, 2051, 2052 ], [ 2100, 2101, 2102, + 2110, 2111, 2112, + 2120, 2121, 2122, + 2130, 2131, 2132, + 2140, 2141, 2142, + 2150, 2151, 2152 ], [ 2200, 2201, 2202, + 2210, 2211, 2212, + 2220, 2221, 2222, + 2230, 2231, 2232, + 2240, 2241, 2242, + 2250, 2251, 2252 ], [ 2300, 2301, 2302, + 2310, 2311, 2312, + 2320, 2321, 2322, + 2330, 2331, 2332, + 2340, 2341, 2342, + 2350, 2351, 2352 ] ], + [ [ 3000, 3001, 3002, + 3010, 3011, 3012, + 3020, 3021, 3022, + 3030, 3031, 3032, + 3040, 3041, 3042, + 3050, 3051, 3052 ], [ 3100, 3101, 3102, + 3110, 3111, 3112, + 3120, 3121, 3122, + 3130, 3131, 3132, + 3140, 3141, 3142, + 3150, 3151, 3152 ], [ 3200, 3201, 3202, + 3210, 3211, 3212, + 3220, 3221, 3222, + 3230, 3231, 3232, + 3240, 3241, 3242, + 3250, 3251, 3252 ], [ 3300, 3301, 3302, + 3310, 3311, 3312, + 3320, 3321, 3322, + 3330, 3331, 3332, + 3340, 3341, 3342, + 3350, 3351, 3352 ] ] + } + } +} +} diff --git a/tools/testfiles/tarray3.h5 b/tools/testfiles/tarray3.h5 new file mode 100644 index 0000000..0c75d79 Binary files /dev/null and b/tools/testfiles/tarray3.h5 differ diff --git a/tools/testfiles/tarray4.ddl b/tools/testfiles/tarray4.ddl new file mode 100644 index 0000000..19ca0cd --- /dev/null +++ b/tools/testfiles/tarray4.ddl @@ -0,0 +1,68 @@ +############################# +Expected output for 'h5dump tarray4.h5' +############################# +HDF5 "tarray4.h5" { +GROUP "/" { + DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_COMPOUND { + H5T_STD_I32LE "i"; + H5T_IEEE_F32LE "f"; + } } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + [ { + 0, + 0 + }, { + 1, + 1 + }, { + 2, + 2 + }, { + 3, + 3 + } ], + [ { + 10, + 2.5 + }, { + 11, + 3.5 + }, { + 12, + 4.5 + }, { + 13, + 5.5 + } ], + [ { + 20, + 5 + }, { + 21, + 6 + }, { + 22, + 7 + }, { + 23, + 8 + } ], + [ { + 30, + 7.5 + }, { + 31, + 8.5 + }, { + 32, + 9.5 + }, { + 33, + 10.5 + } ] + } + } +} +} diff --git a/tools/testfiles/tarray4.h5 b/tools/testfiles/tarray4.h5 new file mode 100644 index 0000000..c2811d2 Binary files /dev/null and b/tools/testfiles/tarray4.h5 differ diff --git a/tools/testfiles/tarray5.h5 b/tools/testfiles/tarray5.h5 new file mode 100644 index 0000000..8cb45b8 Binary files /dev/null and b/tools/testfiles/tarray5.h5 differ diff --git a/tools/testfiles/tarray6.ddl b/tools/testfiles/tarray6.ddl new file mode 100644 index 0000000..26f2ba2 --- /dev/null +++ b/tools/testfiles/tarray6.ddl @@ -0,0 +1,17 @@ +############################# +Expected output for 'h5dump tarray6.h5' +############################# +HDF5 "tarray6.h5" { +GROUP "/" { + DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_STD_U32LE} } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + [ (0), (10, 11), (20, 21, 22), (30, 31, 32, 33) ], + [ (100, 101), (110, 111, 112), (120, 121, 122, 123), (130, 131, 132, 133, 134) ], + [ (200, 201, 202), (210, 211, 212, 213), (220, 221, 222, 223, 224), (230, 231, 232, 233, 234, 235) ], + [ (300, 301, 302, 303), (310, 311, 312, 313, 314), (320, 321, 322, 323, 324, 325), (330, 331, 332, 333, 334, 335, 336) ] + } + } +} +} diff --git a/tools/testfiles/tarray6.h5 b/tools/testfiles/tarray6.h5 new file mode 100644 index 0000000..5cf95cf Binary files /dev/null and b/tools/testfiles/tarray6.h5 differ diff --git a/tools/testfiles/tarray7.ddl b/tools/testfiles/tarray7.ddl new file mode 100644 index 0000000..7f9e803 --- /dev/null +++ b/tools/testfiles/tarray7.ddl @@ -0,0 +1,17 @@ +############################# +Expected output for 'h5dump tarray7.h5' +############################# +HDF5 "tarray7.h5" { +GROUP "/" { + DATASET "Dataset1" { + DATATYPE H5T_ARRAY { [4] H5T_VLEN { H5T_ARRAY { [4] H5T_STD_U32LE }} } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + [ ([ 0, 1, 2, 3 ]), ([ 100, 101, 102, 103 ], [ 110, 111, 112, 113 ]), ([ 200, 201, 202, 203 ], [ 210, 211, 212, 213 ], [ 220, 221, 222, 223 ]), ([ 300, 301, 302, 303 ], [ 310, 311, 312, 313 ], [ 320, 321, 322, 323 ], [ 330, 331, 332, 333 ]) ], + [ ([ 1000, 1001, 1002, 1003 ], [ 1010, 1011, 1012, 1013 ]), ([ 1100, 1101, 1102, 1103 ], [ 1110, 1111, 1112, 1113 ], [ 1120, 1121, 1122, 1123 ]), ([ 1200, 1201, 1202, 1203 ], [ 1210, 1211, 1212, 1213 ], [ 1220, 1221, 1222, 1223 ], [ 1230, 1231, 1232, 1233 ]), ([ 1300, 1301, 1302, 1303 ], [ 1310, 1311, 1312, 1313 ], [ 1320, 1321, 1322, 1323 ], [ 1330, 1331, 1332, 1333 ], [ 1340, 1341, 1342, 1343 ]) ], + [ ([ 2000, 2001, 2002, 2003 ], [ 2010, 2011, 2012, 2013 ], [ 2020, 2021, 2022, 2023 ]), ([ 2100, 2101, 2102, 2103 ], [ 2110, 2111, 2112, 2113 ], [ 2120, 2121, 2122, 2123 ], [ 2130, 2131, 2132, 2133 ]), ([ 2200, 2201, 2202, 2203 ], [ 2210, 2211, 2212, 2213 ], [ 2220, 2221, 2222, 2223 ], [ 2230, 2231, 2232, 2233 ], [ 2240, 2241, 2242, 2243 ]), ([ 2300, 2301, 2302, 2303 ], [ 2310, 2311, 2312, 2313 ], [ 2320, 2321, 2322, 2323 ], [ 2330, 2331, 2332, 2333 ], [ 2340, 2341, 2342, 2343 ], [ 2350, 2351, 2352, 2353 ]) ], + [ ([ 3000, 3001, 3002, 3003 ], [ 3010, 3011, 3012, 3013 ], [ 3020, 3021, 3022, 3023 ], [ 3030, 3031, 3032, 3033 ]), ([ 3100, 3101, 3102, 3103 ], [ 3110, 3111, 3112, 3113 ], [ 3120, 3121, 3122, 3123 ], [ 3130, 3131, 3132, 3133 ], [ 3140, 3141, 3142, 3143 ]), ([ 3200, 3201, 3202, 3203 ], [ 3210, 3211, 3212, 3213 ], [ 3220, 3221, 3222, 3223 ], [ 3230, 3231, 3232, 3233 ], [ 3240, 3241, 3242, 3243 ], [ 3250, 3251, 3252, 3253 ]), ([ 3300, 3301, 3302, 3303 ], [ 3310, 3311, 3312, 3313 ], [ 3320, 3321, 3322, 3323 ], [ 3330, 3331, 3332, 3333 ], [ 3340, 3341, 3342, 3343 ], [ 3350, 3351, 3352, 3353 ], [ 3360, 3361, 3362, 3363 ]) ] + } + } +} +} diff --git a/tools/testfiles/tarray7.h5 b/tools/testfiles/tarray7.h5 new file mode 100644 index 0000000..0b49f04 Binary files /dev/null and b/tools/testfiles/tarray7.h5 differ diff --git a/tools/testfiles/tattr-1.ddl b/tools/testfiles/tattr-1.ddl index c00f149..4368809 100644 --- a/tools/testfiles/tattr-1.ddl +++ b/tools/testfiles/tattr-1.ddl @@ -4,43 +4,42 @@ Expected output for 'h5dump tattr.h5' HDF5 "tattr.h5" { GROUP "/" { ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 24 ) / ( 24 ) } + DATATYPE H5T_STD_I8BE + DATASPACE SIMPLE { ( 24 ) / ( 24 ) } DATA { 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111, 111, 116, 32, 103, 114, 111, 117, 112, 0 } } ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 } } ATTRIBUTE "attr3" { - DATATYPE { H5T_IEEE_F64BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE H5T_IEEE_F64BE + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9 } } ATTRIBUTE "attr4" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SCALAR } + DATATYPE H5T_STD_I32BE + DATASPACE SCALAR DATA { 100 } } ATTRIBUTE "attr5" { - DATATYPE { - { STRSIZE 17; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } - } - DATASPACE { SCALAR } + DATATYPE H5T_STRING { + STRSIZE 17; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR DATA { "string attribute" } diff --git a/tools/testfiles/tattr-2.ddl b/tools/testfiles/tattr-2.ddl index 01d46dc..fa8e97f 100644 --- a/tools/testfiles/tattr-2.ddl +++ b/tools/testfiles/tattr-2.ddl @@ -3,29 +3,28 @@ Expected output for 'h5dump -a attr1 attr4 attr5 tattr.h5' ############################# HDF5 "tattr.h5" { ATTRIBUTE "attr1" { - DATATYPE { H5T_STD_I8BE } - DATASPACE { SIMPLE ( 24 ) / ( 24 ) } + DATATYPE H5T_STD_I8BE + DATASPACE SIMPLE { ( 24 ) / ( 24 ) } DATA { 97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111, 111, 116, 32, 103, 114, 111, 117, 112, 0 } } ATTRIBUTE "attr4" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SCALAR } + DATATYPE H5T_STD_I32BE + DATASPACE SCALAR DATA { 100 } } ATTRIBUTE "attr5" { - DATATYPE { - { STRSIZE 17; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } - } - DATASPACE { SCALAR } + DATATYPE H5T_STRING { + STRSIZE 17; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SCALAR DATA { "string attribute" } diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl index a97629a..c05ae64 100644 --- a/tools/testfiles/tattr-3.ddl +++ b/tools/testfiles/tattr-3.ddl @@ -3,8 +3,8 @@ Expected output for 'h5dump -header -a attr2 attr tattr.h5' ############################# HDF5 "tattr.h5" { ATTRIBUTE "attr2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } } ATTRIBUTE "attr" { h5dump error: unable to open attribute. diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl index 36bd46e..80a0535 100644 --- a/tools/testfiles/tcomp-1.ddl +++ b/tools/testfiles/tcomp-1.ddl @@ -3,17 +3,17 @@ Expected output for 'h5dump tcompound.h5' ############################# HDF5 "tcompound.h5" { GROUP "/" { - DATATYPE "#6632:0" { + DATATYPE "#6632:0" H5T_STD_I32BE "int"; H5T_IEEE_F32BE "float"; - } + DATASET "dset1" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32BE "a_name"; H5T_IEEE_F32BE "b_name"; H5T_IEEE_F64BE "c_name"; - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + } + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { { 0, @@ -44,10 +44,9 @@ GROUP "/" { } GROUP "group1" { DATASET "dset2" { - DATATYPE { - "/type1" - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE "/type1" + + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { { 0, @@ -72,10 +71,9 @@ GROUP "/" { } } DATASET "dset3" { - DATATYPE { - "/type2" - } - DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) } + DATATYPE "/type2" + + DATASPACE SIMPLE { ( 3, 6 ) / ( 3, 6 ) } DATA { { [ 0, 1, 2, 3 ], @@ -224,10 +222,9 @@ GROUP "/" { } } DATASET "dset4" { - DATATYPE { - "/group1/type3" - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE "/group1/type3" + + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { { 0, @@ -251,17 +248,16 @@ GROUP "/" { } } } - DATATYPE "type3" { + DATATYPE "type3" H5T_STD_I32BE "int"; H5T_IEEE_F32BE "float"; - } + } GROUP "group2" { DATASET "dset5" { - DATATYPE { - "/#6632:0" - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE "/#6632:0" + + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { { 0, @@ -286,13 +282,13 @@ GROUP "/" { } } } - DATATYPE "type1" { + DATATYPE "type1" H5T_STD_I32BE "int_name"; H5T_IEEE_F32BE "float_name"; - } - DATATYPE "type2" { - H5T_ARRAY [4] of H5T_STD_I32BE "int_array"; - H5T_ARRAY [5][6] of H5T_IEEE_F32BE "float_array"; - } + + DATATYPE "type2" + H5T_ARRAY { [4] H5T_STD_I32BE } "int_array"; + H5T_ARRAY { [5][6] H5T_IEEE_F32BE } "float_array"; + } } diff --git a/tools/testfiles/tcomp-2.ddl b/tools/testfiles/tcomp-2.ddl index 408ad77..32a4c2d 100644 --- a/tools/testfiles/tcomp-2.ddl +++ b/tools/testfiles/tcomp-2.ddl @@ -2,16 +2,16 @@ Expected output for 'h5dump -t /type1 /type2 /group1/type3 tcompound.h5' ############################# HDF5 "tcompound.h5" { -DATATYPE "/type1" { +DATATYPE "/type1" H5T_STD_I32BE "int_name"; H5T_IEEE_F32BE "float_name"; -} -DATATYPE "/type2" { - H5T_ARRAY [4] of H5T_STD_I32BE "int_array"; - H5T_ARRAY [5][6] of H5T_IEEE_F32BE "float_array"; -} -DATATYPE "/group1/type3" { + +DATATYPE "/type2" + H5T_ARRAY { [4] H5T_STD_I32BE } "int_array"; + H5T_ARRAY { [5][6] H5T_IEEE_F32BE } "float_array"; + +DATATYPE "/group1/type3" H5T_STD_I32BE "int"; H5T_IEEE_F32BE "float"; -} + } diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl index dbb3598..8a75b1d 100644 --- a/tools/testfiles/tcomp-3.ddl +++ b/tools/testfiles/tcomp-3.ddl @@ -2,15 +2,14 @@ Expected output for 'h5dump -t /#5992:0 -g /group2 tcompound.h5' ############################# HDF5 "tcompound.h5" { -DATATYPE "/#5992:0" { +DATATYPE "/#5992:0" h5dump error: unable to open /#5992:0 -} + GROUP "/group2" { DATASET "dset5" { - DATATYPE { - "/#6632:0" - } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE "/#6632:0" + + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { { 0, diff --git a/tools/testfiles/tdset-1.ddl b/tools/testfiles/tdset-1.ddl index 77a4e3d..6d561b1 100644 --- a/tools/testfiles/tdset-1.ddl +++ b/tools/testfiles/tdset-1.ddl @@ -4,8 +4,8 @@ Expected output for 'h5dump tdset.h5' HDF5 "tdset.h5" { GROUP "/" { DATASET "dset1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10, 20 ) / ( 10, 20 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 10, 20 ) / ( 10, 20 ) } DATA { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, @@ -27,8 +27,8 @@ GROUP "/" { } } DATASET "dset2" { - DATATYPE { H5T_IEEE_F64BE } - DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) } + DATATYPE H5T_IEEE_F64BE + DATASPACE SIMPLE { ( 30, 20 ) / ( 30, 20 ) } DATA { 0, 0.0001, 0.0002, 0.0003, 0.0004, 0.0005, 0.0006, 0.0007, 0.0008, 0.0009, 0.001, 0.0011, 0.0012, 0.0013, 0.0014, 0.0015, 0.0016, 0.0017, diff --git a/tools/testfiles/tdset-2.ddl b/tools/testfiles/tdset-2.ddl index 6ce9aa8..e28fe68 100644 --- a/tools/testfiles/tdset-2.ddl +++ b/tools/testfiles/tdset-2.ddl @@ -3,12 +3,12 @@ Expected output for 'h5dump -header -d dset1 /dset2 dset3 tdset.h5' ############################# HDF5 "tdset.h5" { DATASET "dset1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10, 20 ) / ( 10, 20 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 10, 20 ) / ( 10, 20 ) } } DATASET "/dset2" { - DATATYPE { H5T_IEEE_F64BE } - DATASPACE { SIMPLE ( 30, 20 ) / ( 30, 20 ) } + DATATYPE H5T_IEEE_F64BE + DATASPACE SIMPLE { ( 30, 20 ) / ( 30, 20 ) } } DATASET "dset3" { h5dump error: unable to open dset3 diff --git a/tools/testfiles/thlink-1.ddl b/tools/testfiles/thlink-1.ddl index 14b81e2..e3c39cd 100644 --- a/tools/testfiles/thlink-1.ddl +++ b/tools/testfiles/thlink-1.ddl @@ -4,8 +4,8 @@ Expected output for 'h5dump thlink.h5' HDF5 "thlink.h5" { GROUP "/" { DATASET "dset1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 } diff --git a/tools/testfiles/thlink-2.ddl b/tools/testfiles/thlink-2.ddl index 300ed54..a85484f 100644 --- a/tools/testfiles/thlink-2.ddl +++ b/tools/testfiles/thlink-2.ddl @@ -3,8 +3,8 @@ Expected output for 'h5dump -d /g1/dset2 /dset1 /g1/g1.1/dset3 thlink.h5' ############################# HDF5 "thlink.h5" { DATASET "/g1/dset2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 } diff --git a/tools/testfiles/thlink-3.ddl b/tools/testfiles/thlink-3.ddl index 8ea0057..ad5d963 100644 --- a/tools/testfiles/thlink-3.ddl +++ b/tools/testfiles/thlink-3.ddl @@ -3,8 +3,8 @@ Expected output for 'h5dump -d /g1/g1.1/dset3 /g1/dset2 /dset1 thlink.h5' ############################# HDF5 "thlink.h5" { DATASET "/g1/g1.1/dset3" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 } diff --git a/tools/testfiles/thlink-4.ddl b/tools/testfiles/thlink-4.ddl index 54c73bc..7667957 100644 --- a/tools/testfiles/thlink-4.ddl +++ b/tools/testfiles/thlink-4.ddl @@ -4,8 +4,8 @@ Expected output for 'h5dump -g /g1 thlink.h5' HDF5 "thlink.h5" { GROUP "/g1" { DATASET "dset2" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 } diff --git a/tools/testfiles/thlink-5.ddl b/tools/testfiles/thlink-5.ddl index d49bcec..af6d2f2 100644 --- a/tools/testfiles/thlink-5.ddl +++ b/tools/testfiles/thlink-5.ddl @@ -3,8 +3,8 @@ Expected output for 'h5dump -d /dset1 -g /g2 -d /g1/dset2 thlink.h5' ############################# HDF5 "thlink.h5" { DATASET "/dset1" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 0, 1, 2, 3, 4 } diff --git a/tools/testfiles/tnestcomp-1.ddl b/tools/testfiles/tnestcomp-1.ddl index 5c91726..07d7df7 100644 --- a/tools/testfiles/tnestcomp-1.ddl +++ b/tools/testfiles/tnestcomp-1.ddl @@ -4,20 +4,21 @@ Expected output for 'h5dump tnestedcomp.h5' HDF5 "tnestedcomp.h5" { GROUP "/" { DATASET "ArrayOfStructures" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32LE "a_name"; H5T_IEEE_F32LE "b_name"; H5T_IEEE_F64LE "c_name"; - { - { STRSIZE 1; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_COMPOUND { + H5T_STRING { + STRSIZE 1; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "char_name"; - H5T_ARRAY [2] of H5T_IEEE_F32LE "array_name"; + H5T_ARRAY { [2] H5T_IEEE_F32LE } "array_name"; } "d_name"; - } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + } + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { { 0, diff --git a/tools/testfiles/tsaf.ddl b/tools/testfiles/tsaf.ddl index 384b101..237e9fd 100644 --- a/tools/testfiles/tsaf.ddl +++ b/tools/testfiles/tsaf.ddl @@ -4,8 +4,8 @@ Expected output for 'h5dump tsaf.h5' HDF5 "tsaf.h5" { GROUP "/" { DATASET ".DSL_METADATA" { - DATATYPE { H5T_STD_U8LE } - DATASPACE { SIMPLE ( 5919 ) / ( H5S_UNLIMITED ) } + DATATYPE H5T_STD_U8LE + DATASPACE SIMPLE { ( 5919 ) / ( H5S_UNLIMITED ) } DATA { 47, 32, 67, 79, 78, 84, 65, 73, 78, 69, 82, 10, 47, 46, 97, 116, 116, 114, 105, 98, 117, 116, 101, 115, 32, 67, 79, 78, 84, 65, 73, 78, 69, @@ -372,85 +372,93 @@ GROUP "/" { GROUP ".attributes" { GROUP "database" { DATASET ".SAF_DbProps" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32BE "magic"; - { STRSIZE 1024; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 1024; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "SFileDir"; - { STRSIZE 1024; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 1024; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "ImportFile"; H5T_STD_I32BE "parallel"; - { + H5T_COMPOUND { H5T_STD_I32BE "vmajor"; H5T_STD_I32BE "vminor"; H5T_STD_I32BE "rel"; - { STRSIZE 10; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 10; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "annot"; } "safapi"; - { + H5T_COMPOUND { H5T_STD_I32BE "vmajor"; H5T_STD_I32BE "vminor"; H5T_STD_I32BE "rel"; - { STRSIZE 10; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 10; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "annot"; } "saflib"; - { + H5T_COMPOUND { H5T_STD_I32BE "vmajor"; H5T_STD_I32BE "vminor"; H5T_STD_I32BE "rel"; - { STRSIZE 10; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 10; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "annot"; } "vbt"; - { + H5T_COMPOUND { H5T_STD_I32BE "vmajor"; H5T_STD_I32BE "vminor"; H5T_STD_I32BE "rel"; - { STRSIZE 10; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 10; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "annot"; } "dsl"; - { + H5T_COMPOUND { H5T_STD_I32BE "vmajor"; H5T_STD_I32BE "vminor"; H5T_STD_I32BE "rel"; - { STRSIZE 10; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 10; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "annot"; } "hdf5"; - { + H5T_COMPOUND { H5T_STD_I32BE "vmajor"; H5T_STD_I32BE "vminor"; H5T_STD_I32BE "rel"; - { STRSIZE 10; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 10; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "annot"; } "mpi"; H5T_STD_I32BE "DoToc"; H5T_STD_I32BE "ReadOnly"; H5T_STD_I32BE "Clobber"; H5T_STD_I32BE "OSModes"; - } - DATASPACE { SIMPLE ( 1 ) / ( 1 ) } + } + DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { { -604320037, @@ -503,7 +511,7 @@ GROUP "/" { } } DATASET "Blob" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32BE "file_id"; H5T_STD_I32BE "dataset_id"; H5T_STD_I32BE "offset"; @@ -511,8 +519,8 @@ GROUP "/" { H5T_STD_I32BE "count"; H5T_STD_I32BE "base_id"; H5T_STD_I32BE "num_recs"; - } - DATASPACE { SIMPLE ( 24 ) / ( H5S_UNLIMITED ) } + } + DATASPACE SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) } DATA { { -1, @@ -733,33 +741,34 @@ GROUP "/" { } } DATASET "Cat" { - DATATYPE { - { STRSIZE 64; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + DATATYPE H5T_COMPOUND { + H5T_STRING { + STRSIZE 64; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "name"; - H5T_ENUM - { H5T_STD_I32BE; - "TOPO" 0; - "BND" 1; - "PROC" 2; - "DOMN" 3; - "BLOCK" 4; - "ASSY" 5; - "MAT" 6; - "XPROD" 7; - "USERD" 8; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "TOPO" 0; + "BND" 1; + "PROC" 2; + "DOMN" 3; + "BLOCK" 4; + "ASSY" 5; + "MAT" 6; + "XPROD" 7; + "USERD" 8; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "role"; H5T_STD_I32BE "tdim"; H5T_STD_I32BE "base_id"; H5T_STD_I32BE "num_recs"; - } - DATASPACE { SIMPLE ( 5 ) / ( H5S_UNLIMITED ) } + } + DATASPACE SIMPLE { ( 5 ) / ( H5S_UNLIMITED ) } DATA { { "nodes", @@ -799,31 +808,31 @@ GROUP "/" { } } DATASET "Collection" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32BE "containing_set_id"; H5T_STD_I32BE "cat_id"; - H5T_ENUM - { H5T_STD_I32BE; - "NONE" 0; - "POINT" 1; - "LINE" 2; - "TRI" 3; - "QUAD" 4; - "TET" 5; - "PYRAMID" 6; - "PRISM" 7; - "HEX" 8; - "MIXED" 9; - "ARB" 10; - "1BALL" 11; - "2BALL" 12; - "3BALL" 13; - "1SHELL" 14; - "2SHELL" 15; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "NONE" 0; + "POINT" 1; + "LINE" 2; + "TRI" 3; + "QUAD" 4; + "TET" 5; + "PYRAMID" 6; + "PRISM" 7; + "HEX" 8; + "MIXED" 9; + "ARB" 10; + "1BALL" 11; + "2BALL" 12; + "3BALL" 13; + "1SHELL" 14; + "2SHELL" 15; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "cell_type"; H5T_STD_I32BE "count"; H5T_STD_I32BE "indexing_id"; @@ -831,8 +840,8 @@ GROUP "/" { H5T_STD_I32BE "members_blob_id"; H5T_STD_I32BE "base_id"; H5T_STD_I32BE "num_recs"; - } - DATASPACE { SIMPLE ( 24 ) / ( H5S_UNLIMITED ) } + } + DATASPACE SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) } DATA { { 0, @@ -1101,40 +1110,41 @@ GROUP "/" { } } DATASET "Field" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32BE "ftmpl_id"; - { STRSIZE 64; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 64; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "name"; H5T_STD_I32BE "units_id"; H5T_STD_I32BE "storage_decomp_cat_id"; - H5T_ENUM - { H5T_STD_I32BE; - "COMPONENT" 0; - "VECTOR" 1; - "INDEPENDENT" 2; - "NONE" 3; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "COMPONENT" 0; + "VECTOR" 1; + "INDEPENDENT" 2; + "NONE" 3; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "comp_intlv"; H5T_STD_I32BE "indexing_id"; H5T_STD_I32BE "dof_assoc_cat_id"; H5T_STD_I32BE "assoc_ratio"; H5T_STD_I32BE "eval_decomp_cat_id"; - H5T_ENUM - { H5T_STD_I32BE; - "CONSTANT" 0; - "UNIFORM" 1; - "PWCONST" 2; - "PWLINEAR" 3; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "CONSTANT" 0; + "UNIFORM" 1; + "PWCONST" 2; + "PWLINEAR" 3; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "eval_func"; H5T_STD_I32BE "is_homogeneous"; H5T_STD_I32BE "is_coord_field"; @@ -1144,8 +1154,8 @@ GROUP "/" { H5T_STD_I32BE "dof_blob_id"; H5T_STD_I32BE "base_id"; H5T_STD_I32BE "num_recs"; - } - DATASPACE { SIMPLE ( 14 ) / ( H5S_UNLIMITED ) } + } + DATASPACE SIMPLE { ( 14 ) / ( H5S_UNLIMITED ) } DATA { { 1, @@ -1430,50 +1440,51 @@ GROUP "/" { } } DATASET "FieldTmpl" { - DATATYPE { - { STRSIZE 64; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + DATATYPE H5T_COMPOUND { + H5T_STRING { + STRSIZE 64; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "name"; H5T_STD_I32BE "base_space_id"; - H5T_ENUM - { H5T_STD_I32BE; - "CONSTANT" 0; - "COMPONENT" 1; - "SCALAR" 2; - "VECTOR" 3; - "TENSOR" 4; - "SYM_TENSOR" 5; - "FIELD" 6; - "STATE" 7; - "TUPLE" 8; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "CONSTANT" 0; + "COMPONENT" 1; + "SCALAR" 2; + "VECTOR" 3; + "TENSOR" 4; + "SYM_TENSOR" 5; + "FIELD" 6; + "STATE" 7; + "TUPLE" 8; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "alg_type"; - H5T_ENUM - { H5T_STD_I32BE; - "UNITY" 0; - "CARTESIAN" 1; - "SPHERICAL" 2; - "CYLINDRICAL" 3; - "UPPER_TRI" 4; - "FOURIER" 5; - "VARIABLE" 6; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "UNITY" 0; + "CARTESIAN" 1; + "SPHERICAL" 2; + "CYLINDRICAL" 3; + "UPPER_TRI" 4; + "FOURIER" 5; + "VARIABLE" 6; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "basis"; H5T_STD_I32BE "quantity_id"; H5T_STD_I32BE "num_comps"; H5T_STD_I32BE "ftmpl_ids_blob_id"; H5T_STD_I32BE "base_id"; H5T_STD_I32BE "num_recs"; - } - DATASPACE { SIMPLE ( 8 ) / ( H5S_UNLIMITED ) } + } + DATASPACE SIMPLE { ( 8 ) / ( H5S_UNLIMITED ) } DATA { { "coordinate_tmpl", @@ -1566,30 +1577,30 @@ GROUP "/" { } } DATASET "IndexSpec" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32BE "ndims"; - { - H5T_ARRAY [8] of H5T_STD_I32BE "_"; + H5T_COMPOUND { + H5T_ARRAY { [8] H5T_STD_I32BE } "_"; } "origins"; - { - H5T_ARRAY [8] of H5T_STD_I32BE "_"; + H5T_COMPOUND { + H5T_ARRAY { [8] H5T_STD_I32BE } "_"; } "sizes"; - { - H5T_ARRAY [8] of H5T_STD_I32BE "_"; + H5T_COMPOUND { + H5T_ARRAY { [8] H5T_STD_I32BE } "_"; } "order"; - H5T_ENUM - { H5T_STD_I32BE; - "C_ORDER" 0; - "F_ORDER" 1; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "C_ORDER" 0; + "F_ORDER" 1; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "index_type"; H5T_STD_I32BE "base_id"; H5T_STD_I32BE "num_recs"; - } - DATASPACE { SIMPLE ( 24 ) / ( H5S_UNLIMITED ) } + } + DATASPACE SIMPLE { ( 24 ) / ( H5S_UNLIMITED ) } DATA { { 1, @@ -1954,49 +1965,49 @@ GROUP "/" { } } DATASET "Relation" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32BE "sub_id"; H5T_STD_I32BE "sub_cat_id"; H5T_STD_I32BE "sub_decomp_cat_id"; H5T_STD_I32BE "sup_id"; H5T_STD_I32BE "sup_cat_id"; H5T_STD_I32BE "sup_decomp_cat_id"; - H5T_ENUM - { H5T_STD_I32BE; - "SUBSET" 0; - "SUPSET" 1; - "BOUND" 2; - "PERMUTE" 3; - "NEIGHBOR" 4; - "COPY" 5; - "EQUAL" 6; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "SUBSET" 0; + "SUPSET" 1; + "BOUND" 2; + "PERMUTE" 3; + "NEIGHBOR" 4; + "COPY" 5; + "EQUAL" 6; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "kind"; - H5T_ENUM - { H5T_STD_I32BE; - "IDENTITY" 0; - "HLIST" 1; - "TLIST" 2; - "TLIST_1" 3; - "ELIST" 4; - "STRUCTURED" 5; - "UNSTRUCTURED" 6; - "ARBITRARY_R" 7; - "ARBITRARY_DR" 8; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "IDENTITY" 0; + "HLIST" 1; + "TLIST" 2; + "TLIST_1" 3; + "ELIST" 4; + "STRUCTURED" 5; + "UNSTRUCTURED" 6; + "ARBITRARY_R" 7; + "ARBITRARY_DR" 8; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "rep_type"; H5T_STD_I32BE "d_blob_id"; H5T_STD_I32BE "r_blob_id"; H5T_STD_I32BE "base_id"; H5T_STD_I32BE "num_recs"; - } - DATASPACE { SIMPLE ( 21 ) / ( H5S_UNLIMITED ) } + } + DATASPACE SIMPLE { ( 21 ) / ( H5S_UNLIMITED ) } DATA { { 1, @@ -2295,30 +2306,31 @@ GROUP "/" { } } DATASET "Set" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32BE "user_id"; - { STRSIZE 64; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; + H5T_STRING { + STRSIZE 64; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; } "name"; H5T_STD_I32BE "tdim"; - H5T_ENUM - { H5T_STD_I32BE; - "TIME" 0; - "SPACE" 1; - "STATE" 2; - "PARAM" 3; - "CTYPE" 4; - "ATYPE" 5; - "USERD" 6; - "ANY" -1; - "INVALID" -2; - "NA" -3; - "UNKNOWN" -4; + H5T_ENUM { + H5T_STD_I32BE; + "TIME" 0; + "SPACE" 1; + "STATE" 2; + "PARAM" 3; + "CTYPE" 4; + "ATYPE" 5; + "USERD" 6; + "ANY" -1; + "INVALID" -2; + "NA" -3; + "UNKNOWN" -4; } "srole"; - { - H5T_ARRAY [16] of H5T_STD_I32BE "_"; + H5T_COMPOUND { + H5T_ARRAY { [16] H5T_STD_I32BE } "_"; } "coll_ids"; H5T_STD_I32BE "is_top"; H5T_STD_I32BE "is_extendible"; @@ -2326,8 +2338,8 @@ GROUP "/" { H5T_STD_I32BE "bnd_set_id"; H5T_STD_I32BE "base_id"; H5T_STD_I32BE "num_recs"; - } - DATASPACE { SIMPLE ( 9 ) / ( H5S_UNLIMITED ) } + } + DATASPACE SIMPLE { ( 9 ) / ( H5S_UNLIMITED ) } DATA { { 0, @@ -2467,16 +2479,16 @@ GROUP "/" { } } DATASET "field-coords_0002" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 36 ) / ( 36 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 36 ) / ( 36 ) } DATA { 0, 4, 1, 4, 2, 4, 2.5, 4, 0, 3, 1, 3, 2, 3, 2.5, 3, 0, 2, 1, 2, 2, 2, 2.5, 2, 0, 1, 2, 1, 2.5, 1, 0, 0, 2, 0, 2.5, 0 } } DATASET "field-displacements_0007" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 36 ) / ( 36 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 36 ) / ( 36 ) } DATA { 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, 0.25, @@ -2484,53 +2496,53 @@ GROUP "/" { } } DATASET "field-distribution_factors_0003" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 4, 3, 2, 1, 0 } } DATASET "field-pressure_0013" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 2 ) / ( 2 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 2 ) / ( 2 ) } DATA { 45, 55 } } DATASET "field-stress_0011" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 12 ) / ( 12 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 12 ) / ( 12 ) } DATA { 0.5, 0.25, 0.5, 0.5, 0.25, 0.5, 0.5, 0.25, 0.5, 0.5, 0.25, 0.5 } } DATASET "field-temperature_0004" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 100, 150, 150, 100, 75 } } DATASET "field-temperature_0012" { - DATATYPE { H5T_IEEE_F32BE } - DATASPACE { SIMPLE ( 7 ) / ( 7 ) } + DATATYPE H5T_IEEE_F32BE + DATASPACE SIMPLE { ( 7 ) / ( 7 ) } DATA { 75, 95, 120, 80, 115, 85, 110 } } DATASET "metablob00000.blob" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 19 ) / ( H5S_UNLIMITED ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 19 ) / ( H5S_UNLIMITED ) } DATA { 1, 7, 8, 3, -2, -2, -2, -2, -2, -2, -2, -2, 0, 1, 5, 6, 8, 9, 10 } } DATASET "metablob00000.index" { - DATATYPE { + DATATYPE H5T_COMPOUND { H5T_STD_I32BE "index"; H5T_STD_I32BE "length"; - } - DATASPACE { SIMPLE ( 10 ) / ( H5S_UNLIMITED ) } + } + DATASPACE SIMPLE { ( 10 ) / ( H5S_UNLIMITED ) } DATA { { 0, @@ -2575,120 +2587,120 @@ GROUP "/" { } } DATASET "ssrel-_0000" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 9 ) / ( 9 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 9 ) / ( 9 ) } DATA { 1, 2, 3, 5, 6, 7, 9, 10, 11 } } DATASET "ssrel-_0001" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 4 ) / ( 4 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { 1, 2, 4, 5 } } DATASET "ssrel-_0002" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 7 ) / ( 7 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 7 ) / ( 7 ) } DATA { 9, 10, 11, 13, 14, 16, 17 } } DATASET "ssrel-_0003" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 4 ) / ( 4 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { 7, 8, 9, 11 } } DATASET "ssrel-_0004" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 9, 10, 11, 13, 14 } } DATASET "ssrel-_0005" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 3 ) / ( 3 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 3 ) / ( 3 ) } DATA { 7, 8, 9 } } DATASET "ssrel-_0006" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 4 ) / ( 4 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { 13, 14, 16, 17 } } DATASET "ssrel-_0007" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 1 ) / ( 1 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 1 ) / ( 1 ) } DATA { 11 } } DATASET "ssrel-_0008" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 10 ) / ( 10 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } DATA { 3, 4, 7, 8, 11, 12, 14, 15, 17, 18 } } DATASET "ssrel-_0009" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 4 ) / ( 4 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { 3, 6, 10, 12 } } DATASET "ssrel-_0010" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 3 ) / ( 3 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 3 ) / ( 3 ) } DATA { 9, 10, 11 } } DATASET "ssrel-_0011" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 1, 5, 9, 13, 16 } } DATASET "ssrel-_0012" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 5 ) / ( 5 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 5 ) / ( 5 ) } DATA { 4, 8, 12, 15, 18 } } DATASET "toporel-_0017" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 16 ) / ( 16 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 16 ) / ( 16 ) } DATA { 1, 2, 6, 5, 2, 3, 7, 6, 5, 6, 10, 9, 6, 7, 11, 10 } } DATASET "toporel-_0018" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 9 ) / ( 9 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 9 ) / ( 9 ) } DATA { 9, 10, 13, 10, 14, 13, 10, 11, 14 } } DATASET "toporel-_0019" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 4 ) / ( 4 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } DATA { 13, 14, 17, 16 } } DATASET "toporel-_0020" { - DATATYPE { H5T_STD_I32BE } - DATASPACE { SIMPLE ( 16 ) / ( 16 ) } + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 16 ) / ( 16 ) } DATA { 3, 4, 8, 7, 7, 8, 12, 11, 11, 12, 15, 14, 14, 15, 18, 17 } diff --git a/tools/testfiles/tstr-1.ddl b/tools/testfiles/tstr-1.ddl index 532ed5e..198fa51 100644 --- a/tools/testfiles/tstr-1.ddl +++ b/tools/testfiles/tstr-1.ddl @@ -4,15 +4,16 @@ Expected output for 'h5dump tstr.h5' HDF5 "tstr.h5" { GROUP "/" { DATASET "comp1" { - DATATYPE { - H5T_ARRAY [8][10] of H5T_STD_I32BE "int_array"; - H5T_ARRAY [3][4] of { STRSIZE 32; - STRPAD H5T_STR_SPACEPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } "string"; - } - DATASPACE { SIMPLE ( 3, 6 ) / ( 3, 6 ) } + DATATYPE H5T_COMPOUND { + H5T_ARRAY { [8][10] H5T_STD_I32BE } "int_array"; + H5T_ARRAY { [3][4] H5T_STRING { + STRSIZE 32; + STRPAD H5T_STR_SPACEPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } } "string"; + } + DATASPACE SIMPLE { ( 3, 6 ) / ( 3, 6 ) } DATA { { [ 0, 1, 4, 9, 16, 25, 36, 49, 64, 81, @@ -251,14 +252,13 @@ GROUP "/" { } } DATASET "string1" { - DATATYPE { - { STRSIZE 5; - STRPAD H5T_STR_NULLTERM; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } - } - DATASPACE { SIMPLE ( 3, 4 ) / ( 3, 4 ) } + DATATYPE H5T_STRING { + STRSIZE 5; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 3, 4 ) / ( 3, 4 ) } DATA { "s1", "s2", "s3", "s4", "s5", "s6", "s7", "s8", @@ -266,14 +266,13 @@ GROUP "/" { } } DATASET "string2" { - DATATYPE { - { STRSIZE 11; - STRPAD H5T_STR_SPACEPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } - } - DATASPACE { SIMPLE ( 20 ) / ( 20 ) } + DATATYPE H5T_STRING { + STRSIZE 11; + STRPAD H5T_STR_SPACEPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 20 ) / ( 20 ) } DATA { "ab cd ef1 ", "ab cd ef2 ", "ab cd ef3 ", "ab cd ef4 ", "ab cd ef5 ", "ab cd ef6 ", "ab cd ef7 ", "ab cd ef8 ", @@ -283,14 +282,13 @@ GROUP "/" { } } DATASET "string3" { - DATATYPE { - { STRSIZE 8; - STRPAD H5T_STR_NULLPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } - } - DATASPACE { SIMPLE ( 27 ) / ( 27 ) } + DATATYPE H5T_STRING { + STRSIZE 8; + STRPAD H5T_STR_NULLPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 27 ) / ( 27 ) } DATA { "abcd0\000\000\000", "abcd1\000\000\000", "abcd2\000\000\000", "abcd3\000\000\000", "abcd4\000\000\000", "abcd5\000\000\000", @@ -304,14 +302,13 @@ GROUP "/" { } } DATASET "string4" { - DATATYPE { - { STRSIZE 168; - STRPAD H5T_STR_SPACEPAD; - CSET H5T_CSET_ASCII; - CTYPE H5T_C_S1; - } - } - DATASPACE { SIMPLE ( 3 ) / ( 3 ) } + DATATYPE H5T_STRING { + STRSIZE 168; + STRPAD H5T_STR_SPACEPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 3 ) / ( 3 ) } DATA { "s1234567890123456789 ", "s1234567890123456789 ", diff --git a/tools/testfiles/tstr-2.ddl b/tools/testfiles/tstr-2.ddl new file mode 100644 index 0000000..2abb260 --- /dev/null +++ b/tools/testfiles/tstr-2.ddl @@ -0,0 +1,157 @@ +############################# +Expected output for 'h5dump tstr2.h5' +############################# +HDF5 "tstr2.h5" { +GROUP "/" { + GROUP "g1" { + DATASET "dset1" { + DATATYPE H5T_STRING { + STRSIZE 50; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } + DATA { + "This is row 0 of type H5T_STR_NULLTERM of", + "This is row 1 of type H5T_STR_NULLTERM of", + "This is row 2 of type H5T_STR_NULLTERM of", + "This is row 3 of type H5T_STR_NULLTERM of", + "This is row 4 of type H5T_STR_NULLTERM of", + "This is row 5 of type H5T_STR_NULLTERM of", + "This is row 6 of type H5T_STR_NULLTERM of", + "This is row 7 of type H5T_STR_NULLTERM of", + "This is row 8 of type H5T_STR_NULLTERM of", + "This is row 9 of type H5T_STR_NULLTERM of" + } + ATTRIBUTE "attr1" { + DATATYPE H5T_STRING { + STRSIZE 11; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 3 ) / ( 3 ) } + DATA { + "0123456789", "abcdefghij", "ABCDEFGHIJ" + } + } + } + } + GROUP "g2" { + DATASET "dset2" { + DATATYPE H5T_STRING { + STRSIZE 50; + STRPAD H5T_STR_NULLTERM; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } + DATA { + "This is row 0 of type H5T_STR_NULLTERM of string ", + "This is row 1 of type H5T_STR_NULLTERM of string ", + "This is row 2 of type H5T_STR_NULLTERM of string ", + "This is row 3 of type H5T_STR_NULLTERM of string ", + "This is row 4 of type H5T_STR_NULLTERM of string ", + "This is row 5 of type H5T_STR_NULLTERM of string ", + "This is row 6 of type H5T_STR_NULLTERM of string ", + "This is row 7 of type H5T_STR_NULLTERM of string ", + "This is row 8 of type H5T_STR_NULLTERM of string ", + "This is row 9 of type H5T_STR_NULLTERM of string " + } + } + } + GROUP "g3" { + DATASET "dset3" { + DATATYPE H5T_STRING { + STRSIZE 50; + STRPAD H5T_STR_NULLPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } + DATA { + "This is row 0 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + "This is row 1 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + "This is row 2 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + "This is row 3 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + "This is row 4 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + "This is row 5 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + "This is row 6 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + "This is row 7 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + "This is row 8 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000", + "This is row 9 of type H5T_STR_NULLPAD of\000\000\000\000\000\000\000\000\000\000" + } + } + } + GROUP "g4" { + DATASET "dset4" { + DATATYPE H5T_STRING { + STRSIZE 50; + STRPAD H5T_STR_NULLPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } + DATA { + "This is row 0 of type H5T_STR_NULLPAD of string ar", + "This is row 1 of type H5T_STR_NULLPAD of string ar", + "This is row 2 of type H5T_STR_NULLPAD of string ar", + "This is row 3 of type H5T_STR_NULLPAD of string ar", + "This is row 4 of type H5T_STR_NULLPAD of string ar", + "This is row 5 of type H5T_STR_NULLPAD of string ar", + "This is row 6 of type H5T_STR_NULLPAD of string ar", + "This is row 7 of type H5T_STR_NULLPAD of string ar", + "This is row 8 of type H5T_STR_NULLPAD of string ar", + "This is row 9 of type H5T_STR_NULLPAD of string ar" + } + } + } + GROUP "g5" { + DATASET "dset5" { + DATATYPE H5T_STRING { + STRSIZE 50; + STRPAD H5T_STR_SPACEPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } + DATA { + "This is row 0 of type H5T_STR_SPACEPAD of ", + "This is row 1 of type H5T_STR_SPACEPAD of ", + "This is row 2 of type H5T_STR_SPACEPAD of ", + "This is row 3 of type H5T_STR_SPACEPAD of ", + "This is row 4 of type H5T_STR_SPACEPAD of ", + "This is row 5 of type H5T_STR_SPACEPAD of ", + "This is row 6 of type H5T_STR_SPACEPAD of ", + "This is row 7 of type H5T_STR_SPACEPAD of ", + "This is row 8 of type H5T_STR_SPACEPAD of ", + "This is row 9 of type H5T_STR_SPACEPAD of " + } + } + } + GROUP "g6" { + DATASET "dset6" { + DATATYPE H5T_STRING { + STRSIZE 50; + STRPAD H5T_STR_SPACEPAD; + CSET H5T_CSET_ASCII; + CTYPE H5T_C_S1; + } + DATASPACE SIMPLE { ( 10 ) / ( 10 ) } + DATA { + "This is row 0 of type H5T_STR_SPACEPAD of string a", + "This is row 1 of type H5T_STR_SPACEPAD of string a", + "This is row 2 of type H5T_STR_SPACEPAD of string a", + "This is row 3 of type H5T_STR_SPACEPAD of string a", + "This is row 4 of type H5T_STR_SPACEPAD of string a", + "This is row 5 of type H5T_STR_SPACEPAD of string a", + "This is row 6 of type H5T_STR_SPACEPAD of string a", + "This is row 7 of type H5T_STR_SPACEPAD of string a", + "This is row 8 of type H5T_STR_SPACEPAD of string a", + "This is row 9 of type H5T_STR_SPACEPAD of string a" + } + } + } +} +} diff --git a/tools/testfiles/tvldtypes.ddl b/tools/testfiles/tvldtypes.ddl deleted file mode 100644 index 16ab380..0000000 --- a/tools/testfiles/tvldtypes.ddl +++ /dev/null @@ -1,35 +0,0 @@ -############################# -Expected output for 'h5dump tvldtypes.h5' -############################# -HDF5 "tvldtypes.h5" { -GROUP "/" { - DATASET "Dataset1.0" { - DATATYPE { H5T_VLEN of H5T_STD_I32LE } - DATASPACE { SIMPLE ( 4 ) / ( 4 ) } - DATA { - 0 - 10, 11 - 20, 21, 22 - 30, 31, 32, 33 - } - } - DATASET "Dataset2.0" { - DATATYPE { H5T_VLEN of H5T_IEEE_F32LE } - DATASPACE { SIMPLE ( 4 ) / ( 4 ) } - DATA { - 0 - 10, 10.1 - 20, 20.1, 20.2 - 30, 30.1, 30.2, 30.3 - } - } - DATASET "Dataset3.0" { - DATATYPE { H5T_VLEN of H5T_STD_I32LE } - DATASPACE { SCALAR } - DATA { - 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, - 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72 - } - } -} -} diff --git a/tools/testfiles/tvldtypes.h5 b/tools/testfiles/tvldtypes.h5 deleted file mode 100644 index df31249..0000000 Binary files a/tools/testfiles/tvldtypes.h5 and /dev/null differ diff --git a/tools/testfiles/tvldtypes.ls b/tools/testfiles/tvldtypes.ls deleted file mode 100644 index 04ed398..0000000 --- a/tools/testfiles/tvldtypes.ls +++ /dev/null @@ -1,20 +0,0 @@ -############################# - output for 'h5ls -w80 -r -d tvldtypes.h5' -############################# -/tvldtypes.h5/Dataset1.0 Dataset {4} - Data: - (0) 0 - (0) 10, 11 - (0) 20, 21, 22 - (0) 30, 31, 32, 33 -/tvldtypes.h5/Dataset2.0 Dataset {4} - Data: - (0) 0 - (0) 10, 10.1000003814697 - (0) 20, 20.1000003814697, 20.2000007629395 - (0) 30, 30.1000003814697, 30.2000007629395, 30.2999992370605 -/tvldtypes.h5/Dataset3.0 Dataset {SCALAR} - Data: - (0) 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, - (0) 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, - (0) 70, 72 diff --git a/tools/testfiles/tvldtypes1.ddl b/tools/testfiles/tvldtypes1.ddl new file mode 100644 index 0000000..b883429 --- /dev/null +++ b/tools/testfiles/tvldtypes1.ddl @@ -0,0 +1,28 @@ +############################# +Expected output for 'h5dump tvldtypes1.h5' +############################# +HDF5 "tvldtypes1.h5" { +GROUP "/" { + DATASET "Dataset1.0" { + DATATYPE H5T_VLEN { H5T_STD_I32LE} + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + (0), (10, 11), (20, 21, 22), (30, 31, 32, 33) + } + } + DATASET "Dataset2.0" { + DATATYPE H5T_VLEN { H5T_IEEE_F32LE} + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + (0), (10, 10.1), (20, 20.1, 20.2), (30, 30.1, 30.2, 30.3) + } + } + DATASET "Dataset3.0" { + DATATYPE H5T_VLEN { H5T_STD_I32LE} + DATASPACE SCALAR + DATA { + (0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72) + } + } +} +} diff --git a/tools/testfiles/tvldtypes1.h5 b/tools/testfiles/tvldtypes1.h5 new file mode 100644 index 0000000..df31249 Binary files /dev/null and b/tools/testfiles/tvldtypes1.h5 differ diff --git a/tools/testfiles/tvldtypes1.ls b/tools/testfiles/tvldtypes1.ls new file mode 100644 index 0000000..a8e3ee9 --- /dev/null +++ b/tools/testfiles/tvldtypes1.ls @@ -0,0 +1,14 @@ +############################# + output for 'h5ls -w80 -r -d tvldtypes1.h5' +############################# +/tvldtypes1.h5/Dataset1.0 Dataset {4} + Data: + (0) (0), (10,11), (20,21,22), (30,31,32,33) +/tvldtypes1.h5/Dataset2.0 Dataset {4} + Data: + (0) (0), (10,10.1000003814697), (20,20.1000003814697,20.2000007629395), + (3) (30,30.1000003814697,30.2000007629395,30.2999992370605) +/tvldtypes1.h5/Dataset3.0 Dataset {SCALAR} + Data: + (0) (0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44, + (0) 46,48,50,52,54,56,58,60,62,64,66,68,70,72) diff --git a/tools/testfiles/tvldtypes2.ddl b/tools/testfiles/tvldtypes2.ddl new file mode 100644 index 0000000..1dac9f6 --- /dev/null +++ b/tools/testfiles/tvldtypes2.ddl @@ -0,0 +1,15 @@ +############################# +Expected output for 'h5dump tvldtypes2.h5' +############################# +HDF5 "tvldtypes2.h5" { +GROUP "/" { + DATASET "Dataset1" { + DATATYPE H5T_VLEN { H5T_VLEN { H5T_STD_U32LE}} + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + ((0)), ((100), (110, 111)), ((200), (210, 211), (220, 221, 222)), + ((300), (310, 311), (320, 321, 322), (330, 331, 332, 333)) + } + } +} +} diff --git a/tools/testfiles/tvldtypes2.h5 b/tools/testfiles/tvldtypes2.h5 new file mode 100644 index 0000000..edb3e77 Binary files /dev/null and b/tools/testfiles/tvldtypes2.h5 differ diff --git a/tools/testfiles/tvldtypes3.ddl b/tools/testfiles/tvldtypes3.ddl new file mode 100644 index 0000000..0583906 --- /dev/null +++ b/tools/testfiles/tvldtypes3.ddl @@ -0,0 +1,37 @@ +############################# +Expected output for 'h5dump tvldtypes3.h5' +############################# +HDF5 "tvldtypes3.h5" { +GROUP "/" { + DATASET "Dataset1" { + DATATYPE H5T_COMPOUND { + H5T_STD_I32LE "i"; + H5T_IEEE_F32LE "f"; + H5T_VLEN { H5T_STD_U32LE} "v"; + } + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + { + 0, + 0, + (0) + }, + { + 10, + 6.66667, + (10, 11) + }, + { + 20, + 13.3333, + (20, 21, 22) + }, + { + 30, + 20, + (30, 31, 32, 33) + } + } + } +} +} diff --git a/tools/testfiles/tvldtypes3.h5 b/tools/testfiles/tvldtypes3.h5 new file mode 100644 index 0000000..e2e1697 Binary files /dev/null and b/tools/testfiles/tvldtypes3.h5 differ diff --git a/tools/testfiles/tvldtypes4.ddl b/tools/testfiles/tvldtypes4.ddl new file mode 100644 index 0000000..566fcb6 --- /dev/null +++ b/tools/testfiles/tvldtypes4.ddl @@ -0,0 +1,50 @@ +############################# +Expected output for 'h5dump tvldtypes4.h5' +############################# +HDF5 "tvldtypes4.h5" { +GROUP "/" { + DATASET "Dataset1" { + DATATYPE H5T_VLEN { H5T_COMPOUND { + H5T_STD_I32LE "i"; + H5T_IEEE_F32LE "f"; + }} + DATASPACE SIMPLE { ( 4 ) / ( 4 ) } + DATA { + ({ + 0, + 0 + }), + ({ + 10, + 6.66667 + }, { + 11, + 7 + }), + ({ + 20, + 13.3333 + }, { + 21, + 13.6667 + }, { + 22, + 14 + }), + ({ + 30, + 20 + }, { + 31, + 20.3333 + }, { + 32, + 20.6667 + }, { + 33, + 21 + }) + } + } +} +} diff --git a/tools/testfiles/tvldtypes4.h5 b/tools/testfiles/tvldtypes4.h5 new file mode 100644 index 0000000..87aa5f9 Binary files /dev/null and b/tools/testfiles/tvldtypes4.h5 differ diff --git a/tools/testh5dump.sh b/tools/testh5dump.sh index 847dcd1..294bc46 100755 --- a/tools/testh5dump.sh +++ b/tools/testh5dump.sh @@ -119,12 +119,26 @@ TOOLTEST tloop-1.ddl tloop.h5 # test for string TOOLTEST tstr-1.ddl tstr.h5 +TOOLTEST tstr-2.ddl tstr2.h5 # test for file created by Lib SAF team TOOLTEST tsaf.ddl tsaf.h5 # test for file with variable length data -TOOLTEST tvldtypes.ddl tvldtypes.h5 +TOOLTEST tvldtypes1.ddl tvldtypes1.h5 +TOOLTEST tvldtypes2.ddl tvldtypes2.h5 +TOOLTEST tvldtypes3.ddl tvldtypes3.h5 +TOOLTEST tvldtypes4.ddl tvldtypes4.h5 + +# test for files with array data +TOOLTEST tarray1.ddl tarray1.h5 +TOOLTEST tarray2.ddl tarray2.h5 +TOOLTEST tarray3.ddl tarray3.h5 +TOOLTEST tarray4.ddl tarray4.h5 +#dumping tarray5.h5 is causing core-dumps currently - QAK +#TOOLTEST tarray5.ddl tarray5.h5 +TOOLTEST tarray6.ddl tarray6.h5 +TOOLTEST tarray7.ddl tarray7.h5 if test $nerrors -eq 0 ; then echo "All $h5tool tests passed." diff --git a/tools/testh5ls.sh b/tools/testh5ls.sh index d159099..7e37100 100755 --- a/tools/testh5ls.sh +++ b/tools/testh5ls.sh @@ -125,7 +125,10 @@ TOOLTEST tstr-1.ls -w80 -r -d tstr.h5 TOOLTEST tsaf.ls -w80 -r -d tsaf.h5 # test for variable length data types -TOOLTEST tvldtypes.ls -w80 -r -d tvldtypes.h5 +TOOLTEST tvldtypes1.ls -w80 -r -d tvldtypes1.h5 + +# test for array data types +TOOLTEST tarray1.ls -w80 -r -d tarray1.h5 if test $nerrors -eq 0 ; then echo "All $h5tool tests passed." -- cgit v0.12