summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Lu <ptlu@hawkwind.ncsa.uiuc.edu>2000-03-23 15:38:14 (GMT)
committerPatrick Lu <ptlu@hawkwind.ncsa.uiuc.edu>2000-03-23 15:38:14 (GMT)
commit1ee399e4912020144a6fe5cfee1ef21285699f21 (patch)
treefe53e2fab54fe820dbb5d233258e835a8a8c11d3
parent1bb9912f803df2b43efa4d4272ca75081ff8ef4a (diff)
downloadhdf5-1ee399e4912020144a6fe5cfee1ef21285699f21.zip
hdf5-1ee399e4912020144a6fe5cfee1ef21285699f21.tar.gz
hdf5-1ee399e4912020144a6fe5cfee1ef21285699f21.tar.bz2
[svn-r2052] the new ddls for the new versions of the testfiles just created(tall.h5, tcompounnd.h5, tnestedcomp.h5)
the data is not as simple as before. rows are not repeated and rows are not just 1 number repeated
-rw-r--r--tools/testfiles/tall-1.ddl24
-rw-r--r--tools/testfiles/tcomp-1.ddl228
-rw-r--r--tools/testfiles/tcomp-3.ddl5
-rw-r--r--tools/testfiles/tnestcomp-1.ddl30
4 files changed, 143 insertions, 144 deletions
diff --git a/tools/testfiles/tall-1.ddl b/tools/testfiles/tall-1.ddl
index 5d1ea0b..521ea3c 100644
--- a/tools/testfiles/tall-1.ddl
+++ b/tools/testfiles/tall-1.ddl
@@ -24,16 +24,16 @@ GROUP "/" {
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,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+ 0, 2, 4, 6, 8, 10, 12, 14, 16, 18,
+ 0, 3, 6, 9, 12, 15, 18, 21, 24, 27,
+ 0, 4, 8, 12, 16, 20, 24, 28, 32, 36,
+ 0, 5, 10, 15, 20, 25, 30, 35, 40, 45,
+ 0, 6, 12, 18, 24, 30, 36, 42, 48, 54,
+ 0, 7, 14, 21, 28, 35, 42, 49, 56, 63,
+ 0, 8, 16, 24, 32, 40, 48, 56, 64, 72,
+ 0, 9, 18, 27, 36, 45, 54, 63, 72, 81
}
ATTRIBUTE "attr1" {
DATATYPE { H5T_STD_I8BE }
@@ -81,9 +81,9 @@ GROUP "/" {
DATATYPE { H5T_IEEE_F32BE }
DATASPACE { SIMPLE ( 3, 5 ) / ( 3, 5 ) }
DATA {
- 0, 0, 0, 0, 0,
- 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2
+ 0, 0.1, 0.2, 0.3, 0.4,
+ 0, 0.2, 0.4, 0.6, 0.8,
+ 0, 0.3, 0.6, 0.9, 1.2
}
}
}
diff --git a/tools/testfiles/tcomp-1.ddl b/tools/testfiles/tcomp-1.ddl
index 13dd33e..4fe756b 100644
--- a/tools/testfiles/tcomp-1.ddl
+++ b/tools/testfiles/tcomp-1.ddl
@@ -3,7 +3,7 @@ Expected output for 'h5dump tcompound.h5'
#############################
HDF5 "tcompound.h5" {
GROUP "/" {
- DATATYPE "#5992:0" {
+ DATATYPE "#6632:0" {
H5T_STD_I32BE "int";
H5T_IEEE_F32BE "float";
}
@@ -79,147 +79,147 @@ GROUP "/" {
DATA {
{
[ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 1, 2, 3, 4, 5, 6,
+ 2, 3, 4, 5, 6, 7,
+ 3, 4, 5, 6, 7, 8,
+ 4, 5, 6, 7, 8, 9,
+ 5, 6, 7, 8, 9, 10 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 1, 2, 3, 4 ],
+ [ 2, 3, 4, 5, 6, 7,
+ 3, 4, 5, 6, 7, 8,
+ 4, 5, 6, 7, 8, 9,
+ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 2, 3, 4, 5 ],
+ [ 3, 4, 5, 6, 7, 8,
+ 4, 5, 6, 7, 8, 9,
+ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 3, 4, 5, 6 ],
+ [ 4, 5, 6, 7, 8, 9,
+ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 4, 5, 6, 7 ],
+ [ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13,
+ 9, 10, 11, 12, 13, 14 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 5, 6, 7, 8 ],
+ [ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13,
+ 9, 10, 11, 12, 13, 14,
+ 10, 11, 12, 13, 14, 15 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 1, 2, 3, 4 ],
+ [ 2, 3, 4, 5, 6, 7,
+ 3, 4, 5, 6, 7, 8,
+ 4, 5, 6, 7, 8, 9,
+ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 2, 3, 4, 5 ],
+ [ 3, 4, 5, 6, 7, 8,
+ 4, 5, 6, 7, 8, 9,
+ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 3, 4, 5, 6 ],
+ [ 4, 5, 6, 7, 8, 9,
+ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 4, 5, 6, 7 ],
+ [ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13,
+ 9, 10, 11, 12, 13, 14 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 5, 6, 7, 8 ],
+ [ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13,
+ 9, 10, 11, 12, 13, 14,
+ 10, 11, 12, 13, 14, 15 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 6, 7, 8, 9 ],
+ [ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13,
+ 9, 10, 11, 12, 13, 14,
+ 10, 11, 12, 13, 14, 15,
+ 11, 12, 13, 14, 15, 16 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 2, 3, 4, 5 ],
+ [ 3, 4, 5, 6, 7, 8,
+ 4, 5, 6, 7, 8, 9,
+ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 3, 4, 5, 6 ],
+ [ 4, 5, 6, 7, 8, 9,
+ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 4, 5, 6, 7 ],
+ [ 5, 6, 7, 8, 9, 10,
+ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13,
+ 9, 10, 11, 12, 13, 14 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 5, 6, 7, 8 ],
+ [ 6, 7, 8, 9, 10, 11,
+ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13,
+ 9, 10, 11, 12, 13, 14,
+ 10, 11, 12, 13, 14, 15 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 6, 7, 8, 9 ],
+ [ 7, 8, 9, 10, 11, 12,
+ 8, 9, 10, 11, 12, 13,
+ 9, 10, 11, 12, 13, 14,
+ 10, 11, 12, 13, 14, 15,
+ 11, 12, 13, 14, 15, 16 ]
},
{
- [ 0, 1, 2, 3 ],
- [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
- 0.2, 0.2, 0.2, 0.2, 0.2, 0.2,
- 0.3, 0.3, 0.3, 0.3, 0.3, 0.3,
- 0.4, 0.4, 0.4, 0.4, 0.4, 0.4,
- 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ]
+ [ 7, 8, 9, 10 ],
+ [ 8, 9, 10, 11, 12, 13,
+ 9, 10, 11, 12, 13, 14,
+ 10, 11, 12, 13, 14, 15,
+ 11, 12, 13, 14, 15, 16,
+ 12, 13, 14, 15, 16, 17 ]
}
}
}
@@ -231,23 +231,23 @@ GROUP "/" {
DATA {
{
0,
- 0
+ 3
},
{
1,
- 1
+ 4
},
{
2,
- 2
+ 5
},
{
3,
- 3
+ 6
},
{
4,
- 4
+ 7
}
}
}
@@ -259,7 +259,7 @@ GROUP "/" {
GROUP "group2" {
DATASET "dset5" {
DATATYPE {
- "/#5992:0"
+ "/#6632:0"
}
DATASPACE { SIMPLE ( 5 ) / ( 5 ) }
DATA {
diff --git a/tools/testfiles/tcomp-3.ddl b/tools/testfiles/tcomp-3.ddl
index c8e553a..dbb3598 100644
--- a/tools/testfiles/tcomp-3.ddl
+++ b/tools/testfiles/tcomp-3.ddl
@@ -3,13 +3,12 @@ Expected output for 'h5dump -t /#5992:0 -g /group2 tcompound.h5'
#############################
HDF5 "tcompound.h5" {
DATATYPE "/#5992:0" {
- H5T_STD_I32BE "int";
- H5T_IEEE_F32BE "float";
+ h5dump error: unable to open /#5992:0
}
GROUP "/group2" {
DATASET "dset5" {
DATATYPE {
- "/#5992:0"
+ "/#6632:0"
}
DATASPACE { SIMPLE ( 5 ) / ( 5 ) }
DATA {
diff --git a/tools/testfiles/tnestcomp-1.ddl b/tools/testfiles/tnestcomp-1.ddl
index 76a38c6..7db8dc9 100644
--- a/tools/testfiles/tnestcomp-1.ddl
+++ b/tools/testfiles/tnestcomp-1.ddl
@@ -19,51 +19,51 @@ GROUP "/" {
{
{
0,
- 0
+ 1
},
{
- 0,
- 0
+ 2,
+ 4
}
},
{
{
1,
- 1
+ 3
},
{
- 1,
- 1
+ 4,
+ 7
}
},
{
{
2,
- 2
+ 5
},
{
- 2,
- 2
+ 6,
+ 10
}
},
{
{
3,
- 3
+ 7
},
{
- 3,
- 3
+ 8,
+ 13
}
},
{
{
4,
- 4
+ 9
},
{
- 4,
- 4
+ 10,
+ 16
}
}
}