[svn-r7542] 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:
@@ -6,73 +6,73 @@ Expected output for 'h5dump --xml tcompound2.h5'
|
||||
<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
|
||||
<hdf5:NamedDataType Name="#9560" 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_3280" 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_6544" 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="/">
|
||||
@@ -128,22 +128,22 @@ Expected output for 'h5dump --xml tcompound2.h5'
|
||||
<hdf5:Group Name="group1" OBJ-XID="xid_3960" H5Path="/group1" Parents="xid_696" H5ParentPaths="/" >
|
||||
<hdf5:NamedDataType Name="type3" OBJ-XID="xid_6624" H5Path="/group1/type3" Parents="xid_3960" 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_4008" H5Path= "/group1/dset2" Parents="xid_3960" H5ParentPaths="/group1">
|
||||
|
||||
Reference in New Issue
Block a user