philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r7542] Purpose:

Browse Source 
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:23:57 -05:00
parent f768247888
commit 651bd4e252
95 changed files with 2550 additions and 2505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

330
tools/testfiles/tcompound.h5.xml
View File

@@ -6,73 +6,73 @@ Expected output for 'h5dump --xml tcompound.h5'
<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
<hdf5:NamedDataType Name="#6632" OBJ-XID="xid_18446744073709551614" Parents="xid_696" H5ParentPaths="/">
<hdf5:DataType>
<hdf5:CompoundType>
<hdf5:Field FieldName="int">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
<hdf5:Field FieldName="float">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
</hdf5:CompoundType>
<hdf5:CompoundType>
<hdf5:Field FieldName="int">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
<hdf5:Field FieldName="float">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
</hdf5:CompoundType>
</hdf5:DataType>
</hdf5:NamedDataType>
<hdf5:NamedDataType Name="type1" OBJ-XID="xid_1424" H5Path="/type1" Parents="xid_696" H5ParentPaths="/">
<hdf5:DataType>
<hdf5:CompoundType>
<hdf5:Field FieldName="int_name">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
<hdf5:Field FieldName="float_name">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
</hdf5:CompoundType>
<hdf5:CompoundType>
<hdf5:Field FieldName="int_name">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
<hdf5:Field FieldName="float_name">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
</hdf5:CompoundType>
</hdf5:DataType>
</hdf5:NamedDataType>
<hdf5:NamedDataType Name="type2" OBJ-XID="xid_2792" H5Path="/type2" Parents="xid_696" H5ParentPaths="/">
<hdf5:DataType>
<hdf5:CompoundType>
<hdf5:Field FieldName="int_array">
<hdf5:DataType>
<hdf5:ArrayType Ndims="1">
<hdf5:ArrayDimension DimSize="4" DimPerm="0"/>
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:ArrayType>
</hdf5:DataType>
</hdf5:Field>
<hdf5:Field FieldName="float_array">
<hdf5:DataType>
<hdf5:ArrayType Ndims="2">
<hdf5:ArrayDimension DimSize="5" DimPerm="0"/>
<hdf5:ArrayDimension DimSize="6" DimPerm="1"/>
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:ArrayType>
</hdf5:DataType>
</hdf5:Field>
</hdf5:CompoundType>
<hdf5:CompoundType>
<hdf5:Field FieldName="int_array">
<hdf5:DataType>
<hdf5:ArrayType Ndims="1">
<hdf5:ArrayDimension DimSize="4" DimPerm="0"/>
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:ArrayType>
</hdf5:DataType>
</hdf5:Field>
<hdf5:Field FieldName="float_array">
<hdf5:DataType>
<hdf5:ArrayType Ndims="2">
<hdf5:ArrayDimension DimSize="5" DimPerm="0"/>
<hdf5:ArrayDimension DimSize="6" DimPerm="1"/>
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:ArrayType>
</hdf5:DataType>
</hdf5:Field>
</hdf5:CompoundType>
</hdf5:DataType>
</hdf5:NamedDataType>
<hdf5:Dataset Name="dset1" OBJ-XID="xid_744" H5Path= "/dset1" Parents="xid_696" H5ParentPaths="/">
@@ -124,22 +124,22 @@ Expected output for 'h5dump --xml tcompound.h5'
<hdf5:Group Name="group1" OBJ-XID="xid_2104" H5Path="/group1" Parents="xid_696" H5ParentPaths="/" >
<hdf5:NamedDataType Name="type3" OBJ-XID="xid_5592" H5Path="/group1/type3" Parents="xid_2104" H5ParentPaths="/group1">
<hdf5:DataType>
<hdf5:CompoundType>
<hdf5:Field FieldName="int">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
<hdf5:Field FieldName="float">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
</hdf5:CompoundType>
<hdf5:CompoundType>
<hdf5:Field FieldName="int">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
<hdf5:Field FieldName="float">
<hdf5:DataType>
<hdf5:AtomicType>
<hdf5:FloatType ByteOrder="BE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
</hdf5:AtomicType>
</hdf5:DataType>
</hdf5:Field>
</hdf5:CompoundType>
</hdf5:DataType>
</hdf5:NamedDataType>
<hdf5:Dataset Name="dset2" OBJ-XID="xid_2152" H5Path= "/group1/dset2" Parents="xid_2104" H5ParentPaths="/group1">
@@ -183,96 +183,96 @@ Expected output for 'h5dump --xml tcompound.h5'
<!-- Note: format of compound data not specified -->
<hdf5:Data>
<hdf5:DataFromFile>
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
12 13 14 15 16 17
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
12 13 14 15 16 17
</hdf5:DataFromFile>
</hdf5:Data>
</hdf5:Dataset>