[svn-r22550] Correct datatypes in generator and update files for test.

Tested: local linux with cmake
This commit is contained in:
Allen Byrne
2012-07-11 09:03:53 -05:00
parent 91d63fa0ae
commit 61cb9cc547
3 changed files with 72 additions and 72 deletions

View File

@@ -2,8 +2,8 @@ HDF5 "tnestedcmpddt.h5" {
GROUP "/" {
DATASET "dset1" {
DATATYPE H5T_COMPOUND {
H5T_STD_I32BE "a_name";
H5T_IEEE_F32BE "b_name";
H5T_STD_I32LE "a_name";
H5T_IEEE_F32LE "b_name";
}
DATASPACE SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
DATA {
@@ -12,24 +12,24 @@ GROUP "/" {
0
},
(1): {
16777216,
4.6006e-41
1,
1
},
(2): {
33554432,
4.60074e-41
2,
4
},
(3): {
50331648,
5.8308e-42
3,
9
},
(4): {
67108864,
4.60088e-41
4,
16
},
(5): {
83886080,
7.18376e-41
5,
25
}
}
}
@@ -92,28 +92,28 @@ GROUP "/" {
DATASPACE SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
DATA {
(0): {
-1434300087,
-1.69532e-21
0,
0
},
(1): {
-965921664,
-7.63504e-06
1,
1
},
(2): {
0,
1.01342e-41
2,
4
},
(3): {
485220918,
2.64926e-23
3,
9
},
(4): {
970376557,
1.19312e-07
4,
16
},
(5): {
1438754980,
5.37334e+08
5,
25
}
}
}
@@ -128,11 +128,11 @@ GROUP "/" {
GROUP "group1" {
DATASET "dset3" {
DATATYPE H5T_COMPOUND {
H5T_ARRAY { [5] H5T_STD_I32BE } "int_name";
H5T_ARRAY { [5][6] H5T_IEEE_F32BE } "float_name";
H5T_ARRAY { [5] H5T_STD_I32LE } "int_name";
H5T_ARRAY { [5][6] H5T_IEEE_F32LE } "float_name";
H5T_COMPOUND {
H5T_STD_I32BE "int_name";
H5T_IEEE_F32BE "float_name";
H5T_STD_I32LE "int_name";
H5T_IEEE_F32LE "float_name";
} "cmpd_name";
}
DATASPACE SIMPLE { ( 6 ) / ( H5S_UNLIMITED ) }
@@ -150,71 +150,71 @@ GROUP "/" {
}
},
(1): {
[ 0, 16777216, 33554432, 50331648, 67108864 ],
[ 0, 1, 2, 3, 4 ],
[ 0, 0, 0, 0, 0, 0,
0, 4.6006e-41, 8.96831e-44, 2.30486e-41, 4.60074e-41, 5.74869e-41,
0, 8.96831e-44, 4.60074e-41, 6.89663e-41, 9.10844e-44, 1.15705e-41,
0, 2.30486e-41, 6.89663e-41, 5.8308e-42, 2.305e-41, 4.02691e-41,
0, 4.60074e-41, 9.10844e-44, 2.305e-41, 4.60088e-41, 5.74883e-41 ],
0, 1, 2, 3, 4, 5,
0, 2, 4, 6, 8, 10,
0, 3, 6, 9, 12, 15,
0, 4, 8, 12, 16, 20 ],
{
16777216,
4.6006e-41
1,
1
}
},
(2): {
[ 0, 33554432, 67108864, 100663296, 134217728 ],
[ 0, 2, 4, 6, 8 ],
[ 0, 0, 0, 0, 0, 0,
0, 8.96831e-44, 4.60074e-41, 6.89663e-41, 9.10844e-44, 1.15705e-41,
0, 4.60074e-41, 9.10844e-44, 2.305e-41, 4.60088e-41, 5.74883e-41,
0, 6.89663e-41, 2.305e-41, 5.17486e-41, 6.89677e-41, 8.61869e-41,
0, 9.10844e-44, 4.60088e-41, 6.89677e-41, 9.24857e-44, 1.15719e-41 ],
0, 2, 4, 6, 8, 10,
0, 4, 8, 12, 16, 20,
0, 6, 12, 18, 24, 30,
0, 8, 16, 24, 32, 40 ],
{
33554432,
8.96831e-44
2,
2
}
},
(3): {
[ 0, 50331648, 100663296, 150994944, 201326592 ],
[ 0, 3, 6, 9, 12 ],
[ 0, 0, 0, 0, 0, 0,
0, 2.30486e-41, 6.89663e-41, 5.8308e-42, 2.305e-41, 4.02691e-41,
0, 6.89663e-41, 2.305e-41, 5.17486e-41, 6.89677e-41, 8.61869e-41,
0, 5.8308e-42, 5.17486e-41, 7.75773e-41, 5.8322e-42, 1.87466e-41,
0, 2.305e-41, 6.89677e-41, 5.8322e-42, 2.30514e-41, 4.02705e-41 ],
0, 3, 6, 9, 12, 15,
0, 6, 12, 18, 24, 30,
0, 9, 18, 27, 36, 45,
0, 12, 24, 36, 48, 60 ],
{
50331648,
2.30486e-41
3,
3
}
},
(4): {
[ 0, 67108864, 134217728, 201326592, 268435456 ],
[ 0, 4, 8, 12, 16 ],
[ 0, 0, 0, 0, 0, 0,
0, 4.60074e-41, 9.10844e-44, 2.305e-41, 4.60088e-41, 5.74883e-41,
0, 9.10844e-44, 4.60088e-41, 6.89677e-41, 9.24857e-44, 1.15719e-41,
0, 2.305e-41, 6.89677e-41, 5.8322e-42, 2.30514e-41, 4.02705e-41,
0, 4.60088e-41, 9.24857e-44, 2.30514e-41, 4.60102e-41, 5.74897e-41 ],
0, 4, 8, 12, 16, 20,
0, 8, 16, 24, 32, 40,
0, 12, 24, 36, 48, 60,
0, 16, 32, 48, 64, 80 ],
{
67108864,
4.60074e-41
4,
4
}
},
(5): {
[ 0, 83886080, 167772160, 251658240, 335544320 ],
[ 0, 5, 10, 15, 20 ],
[ 0, 0, 0, 0, 0, 0,
0, 5.74869e-41, 1.15705e-41, 4.02691e-41, 5.74883e-41, 7.18376e-41,
0, 1.15705e-41, 5.74883e-41, 8.61869e-41, 1.15719e-41, 2.59212e-41,
0, 4.02691e-41, 8.61869e-41, 1.87466e-41, 4.02705e-41, 5.39023e-41,
0, 5.74883e-41, 1.15719e-41, 4.02705e-41, 5.74897e-41, 7.1839e-41 ],
0, 5, 10, 15, 20, 25,
0, 10, 20, 30, 40, 50,
0, 15, 30, 45, 60, 75,
0, 20, 40, 60, 80, 100 ],
{
83886080,
5.74869e-41
5,
5
}
}
}
}
}
DATATYPE "type1" H5T_COMPOUND {
H5T_STD_I32BE "int_name";
H5T_IEEE_F32BE "float_name";
H5T_STD_I32LE "int_name";
H5T_IEEE_F32LE "float_name";
}
}
}