[svn-r7548] Purpose:

Bug fixes and code cleanup

Description:
    Whitespace removal.

    Added testfiles for named datatypes in attributes.

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    h5committest
This commit is contained in:
Quincey Koziol
2003-10-05 16:30:13 -05:00
parent e1ba6c55de
commit 4739cc20ee
93 changed files with 2501 additions and 2514 deletions

View File

@@ -6,14 +6,14 @@ GROUP "/" {
DATATYPE "#6632:0" H5T_COMPOUND {
H5T_STD_I32BE "int";
H5T_IEEE_F32BE "float";
}
}
DATASET "dset1" {
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,
@@ -40,12 +40,12 @@ GROUP "/" {
16,
0.2
}
}
}
}
}
GROUP "group1" {
DATASET "dset2" {
DATATYPE "/type1"
DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
DATATYPE "/type1"
DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
DATA {
{
0,
@@ -67,161 +67,161 @@ GROUP "/" {
4,
4.4
}
}
}
}
}
DATASET "dset3" {
DATATYPE "/type2"
DATASPACE SIMPLE { ( 3, 6 ) / ( 3, 6 ) }
DATATYPE "/type2"
DATASPACE SIMPLE { ( 3, 6 ) / ( 3, 6 ) }
DATA {
{
[ 0, 1, 2, 3 ],
[ 1, 2, 3, 4, 5, 6,
2, 3, 4, 5, 6, 7,
3, 4, 5, 6, 7, 8,
4, 5, 6, 7, 8, 9,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
},
{
[ 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,
[ 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 ]
}
}
}
}
}
DATASET "dset4" {
DATATYPE "/group1/type3"
DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
DATATYPE "/group1/type3"
DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
DATA {
{
0,
@@ -243,18 +243,17 @@ GROUP "/" {
4,
7
}
}
}
}
}
DATATYPE "type3" H5T_COMPOUND {
H5T_STD_I32BE "int";
H5T_IEEE_F32BE "float";
}
}
}
}
GROUP "group2" {
DATASET "dset5" {
DATATYPE "/#6632:0"
DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
DATASPACE SIMPLE { ( 5 ) / ( 5 ) }
DATA {
{
0,
@@ -276,16 +275,16 @@ GROUP "/" {
4,
0.4
}
}
}
}
}
}
}
DATATYPE "type1" H5T_COMPOUND {
H5T_STD_I32BE "int_name";
H5T_IEEE_F32BE "float_name";
}
}
DATATYPE "type2" H5T_COMPOUND {
H5T_ARRAY { [4] H5T_STD_I32BE } "int_array";
H5T_ARRAY { [5][6] H5T_IEEE_F32BE } "float_array";
}
}
}
}
}
}