diff options
author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-12-11 20:39:38 (GMT) |
---|---|---|
committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-12-11 20:39:38 (GMT) |
commit | 28365eb5b3fb9d329ab7bf09308bd48f42c91158 (patch) | |
tree | 9d06ab00f45a5a4ec1c7f3a743c8a3286662ad0f /tools/testfiles | |
parent | dc73eca1599d065186baa6a44ed611cb37225ce1 (diff) | |
download | hdf5-28365eb5b3fb9d329ab7bf09308bd48f42c91158.zip hdf5-28365eb5b3fb9d329ab7bf09308bd48f42c91158.tar.gz hdf5-28365eb5b3fb9d329ab7bf09308bd48f42c91158.tar.bz2 |
[svn-r13042]
added a size of array information when printing differences
modified print_pos and diff_datum for having one extra argument *dims
Diffstat (limited to 'tools/testfiles')
-rw-r--r-- | tools/testfiles/h5diff_100.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_101.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_102.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_13.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_14.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_15.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_16.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_17.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_191.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_192.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_50.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_51.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_52.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_53.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_54.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_55.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_56.txt | 1 | ||||
-rw-r--r-- | tools/testfiles/h5diff_70.txt | 54 | ||||
-rw-r--r-- | tools/testfiles/h5diff_80.txt | 58 |
19 files changed, 129 insertions, 0 deletions
diff --git a/tools/testfiles/h5diff_100.txt b/tools/testfiles/h5diff_100.txt index 8415956..2e04520 100644 --- a/tools/testfiles/h5diff_100.txt +++ b/tools/testfiles/h5diff_100.txt @@ -7,6 +7,7 @@ file1 file2 x x /big Dataset: </big> and </big> +size [1073741824] position big big difference ------------------------------------------------------------ [ 268435456 ] 31 0 31 diff --git a/tools/testfiles/h5diff_101.txt b/tools/testfiles/h5diff_101.txt index a35ffb6..074445c 100644 --- a/tools/testfiles/h5diff_101.txt +++ b/tools/testfiles/h5diff_101.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/d1 g1/d2 -v' ############################# Dataset: </g1/d1> and </g1/d2> +size [3x2] position d1 d2 difference ------------------------------------------------------------ [ 0 1 ] 1e-09 2e-09 1e-09 diff --git a/tools/testfiles/h5diff_102.txt b/tools/testfiles/h5diff_102.txt index da3ead2..c1c31f5 100644 --- a/tools/testfiles/h5diff_102.txt +++ b/tools/testfiles/h5diff_102.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/fp1 g1/fp2 -v' ############################# Dataset: </g1/fp1> and </g1/fp2> +size [3x2] position fp1 fp2 difference ------------------------------------------------------------ [ 0 1 ] 1e-05 2e-05 1e-05 diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt index 897222c..72f2bc1 100644 --- a/tools/testfiles/h5diff_13.txt +++ b/tools/testfiles/h5diff_13.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r' ############################# Dataset: </g1/dset1> and </g1/dset1> +size [3x2] position dset1 dset1 difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt index b5431cf..5c18e4e 100644 --- a/tools/testfiles/h5diff_14.txt +++ b/tools/testfiles/h5diff_14.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r g1/dset1 g1/dset2' ############################# Dataset: </g1/dset1> and </g1/dset2> +size [3x2] position dset1 dset2 difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt index caf34ec..2515065 100644 --- a/tools/testfiles/h5diff_15.txt +++ b/tools/testfiles/h5diff_15.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r -d 5 g1/dset3 g1/dset4' ############################# Dataset: </g1/dset3> and </g1/dset4> +size [3x2] position dset3 dset4 difference ------------------------------------------------------------ [ 0 1 ] 100 120 20 diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt index 8145b00..78141f7 100644 --- a/tools/testfiles/h5diff_16.txt +++ b/tools/testfiles/h5diff_16.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10 -p 0.01 -v' ############################# Dataset: </g1/dset9> and </g1/dset10> +size [3x2] position dset9 dset10 difference relative ------------------------------------------------------------------------ [ 0 0 ] 100 120 20 0.2 diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt index 3701655..7c33114 100644 --- a/tools/testfiles/h5diff_17.txt +++ b/tools/testfiles/h5diff_17.txt @@ -24,6 +24,7 @@ file1 file2 Group: </g1> and </g1> 0 differences found Dataset: </g1/dset1> and </g1/dset1> +size [3x2] position dset1 dset1 difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_191.txt b/tools/testfiles/h5diff_191.txt index 25b298e..801cca7 100644 --- a/tools/testfiles/h5diff_191.txt +++ b/tools/testfiles/h5diff_191.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset5 g1/dset6' ############################# Dataset: </g1/dset5> and </g1/dset6> +size [3x2] position dset5 dset6 difference relative ------------------------------------------------------------------------ [ 1 0 ] 100 103 3 0.030000 diff --git a/tools/testfiles/h5diff_192.txt b/tools/testfiles/h5diff_192.txt index 5108d1b..3173153 100644 --- a/tools/testfiles/h5diff_192.txt +++ b/tools/testfiles/h5diff_192.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset7 g1/dset8' ############################# Dataset: </g1/dset7> and </g1/dset8> +size [3x2] position dset7 dset8 difference relative ------------------------------------------------------------------------ [ 1 0 ] 100 103 3 0.030000 diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt index ccbffbe..1607804 100644 --- a/tools/testfiles/h5diff_50.txt +++ b/tools/testfiles/h5diff_50.txt @@ -5,6 +5,7 @@ Dataset: </dset0a> and </dset0b> warning: different storage datatype </dset0a> has file datatype H5T_STD_I16LE </dset0b> has file datatype H5T_STD_I32LE +size [3x2] position dset0a dset0b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt index 91a125f..46a82c7 100644 --- a/tools/testfiles/h5diff_51.txt +++ b/tools/testfiles/h5diff_51.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset1a dset1b' ############################# Dataset: </dset1a> and </dset1b> +size [3x2] position dset1a dset1b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt index 490b407..7e4580f 100644 --- a/tools/testfiles/h5diff_52.txt +++ b/tools/testfiles/h5diff_52.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset2a dset2b' ############################# Dataset: </dset2a> and </dset2b> +size [3x2] position dset2a dset2b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt index 454c35c..1651457 100644 --- a/tools/testfiles/h5diff_53.txt +++ b/tools/testfiles/h5diff_53.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset3a dset4b' ############################# Dataset: </dset3a> and </dset4b> +size [3x2] position dset3a dset4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt index 1f1a375..e6fcbe8 100644 --- a/tools/testfiles/h5diff_54.txt +++ b/tools/testfiles/h5diff_54.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset4a dset4b' ############################# Dataset: </dset4a> and </dset4b> +size [3x2] position dset4a dset4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index 736c2d5..6ad0808 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset5a dset5b' ############################# Dataset: </dset5a> and </dset5b> +size [3x2] position dset5a dset5b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index 02c7169..733d6fb 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset6a dset6b' ############################# Dataset: </dset6a> and </dset6b> +size [3x2] position dset6a dset6b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt index 3a8ebac..97b74a2 100644 --- a/tools/testfiles/h5diff_70.txt +++ b/tools/testfiles/h5diff_70.txt @@ -13,6 +13,7 @@ Dataset: </dset> and </dset> Group: </g1> and </g1> 0 differences found Attribute: <string of </g1>> and <string of </g1>> +size [2] position string of </g1> string of </g1> difference ------------------------------------------------------------ [ 0 ] a z @@ -21,18 +22,21 @@ position string of </g1> string of </g1> difference [ 1 ] e z 4 differences found Attribute: <bitfield of </g1>> and <bitfield of </g1>> +size [2] position bitfield of </g1> bitfield of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <opaque of </g1>> and <opaque of </g1>> +size [2] position opaque of </g1> opaque of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <compound of </g1>> and <compound of </g1>> +size [2] position compound of </g1> compound of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -41,12 +45,14 @@ position compound of </g1> compound of </g1> difference [ 1 ] 4 0 4 4 differences found Attribute: <enum of </g1>> and <enum of </g1>> +size [2] position enum of </g1> enum of </g1> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN 2 differences found Attribute: <vlen of </g1>> and <vlen of </g1>> +size [2] position vlen of </g1> vlen of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -54,6 +60,7 @@ position vlen of </g1> vlen of </g1> difference [ 1 ] 3 0 3 3 differences found Attribute: <array of </g1>> and <array of </g1>> +size [2] position array of </g1> array of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -64,18 +71,21 @@ position array of </g1> array of </g1> difference [ 1 ] 6 0 6 6 differences found Attribute: <integer of </g1>> and <integer of </g1>> +size [2] position integer of </g1> integer of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <float of </g1>> and <float of </g1>> +size [2] position float of </g1> float of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <string2D of </g1>> and <string2D of </g1>> +size [3x2] position string2D of </g1> string2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] a z @@ -92,6 +102,7 @@ position string2D of </g1> string2D of </g1> difference [ 2 1 ] l z 12 differences found Attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>> +size [3x2] position bitfield2D of </g1> bitfield2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -102,6 +113,7 @@ position bitfield2D of </g1> bitfield2D of </g1> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <opaque2D of </g1>> and <opaque2D of </g1>> +size [3x2] position opaque2D of </g1> opaque2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -112,6 +124,7 @@ position opaque2D of </g1> opaque2D of </g1> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <compound2D of </g1>> and <compound2D of </g1>> +size [3x2] position compound2D of </g1> compound2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -128,6 +141,7 @@ position compound2D of </g1> compound2D of </g1> difference [ 2 1 ] 12 0 12 12 differences found Attribute: <enum2D of </g1>> and <enum2D of </g1>> +size [3x2] position enum2D of </g1> enum2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN @@ -138,6 +152,7 @@ position enum2D of </g1> enum2D of </g1> difference [ 2 1 ] RED GREEN 6 differences found Attribute: <vlen2D of </g1>> and <vlen2D of </g1>> +size [3x2] position vlen2D of </g1> vlen2D of </g1> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -153,6 +168,7 @@ position vlen2D of </g1> vlen2D of </g1> difference [ 2 1 ] 11 0 11 11 differences found Attribute: <array2D of </g1>> and <array2D of </g1>> +size [3x2] position array2D of </g1> array2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -175,6 +191,7 @@ position array2D of </g1> array2D of </g1> difference [ 2 1 ] 18 0 18 18 differences found Attribute: <integer2D of </g1>> and <integer2D of </g1>> +size [3x2] position integer2D of </g1> integer2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -185,6 +202,7 @@ position integer2D of </g1> integer2D of </g1> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <float2D of </g1>> and <float2D of </g1>> +size [3x2] position float2D of </g1> float2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -195,6 +213,7 @@ position float2D of </g1> float2D of </g1> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <string3D of </g1>> and <string3D of </g1>> +size [4x3x2] position string3D of </g1> string3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -246,6 +265,7 @@ position string3D of </g1> string3D of </g1> difference [ 3 2 1 ] Z z 47 differences found Attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>> +size [4x3x2] position bitfield3D of </g1> bitfield3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -274,6 +294,7 @@ position bitfield3D of </g1> bitfield3D of </g1> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <opaque3D of </g1>> and <opaque3D of </g1>> +size [4x3x2] position opaque3D of </g1> opaque3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -302,6 +323,7 @@ position opaque3D of </g1> opaque3D of </g1> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <compound3D of </g1>> and <compound3D of </g1>> +size [4x3x2] position compound3D of </g1> compound3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -354,6 +376,7 @@ position compound3D of </g1> compound3D of </g1> difference [ 3 2 1 ] 48 0 48 48 differences found Attribute: <enum3D of </g1>> and <enum3D of </g1>> +size [4x3x2] position enum3D of </g1> enum3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED @@ -382,6 +405,7 @@ position enum3D of </g1> enum3D of </g1> difference [ 3 2 1 ] GREEN RED 24 differences found Attribute: <vlen3D of </g1>> and <vlen3D of </g1>> +size [4x3x2] position vlen3D of </g1> vlen3D of </g1> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -445,6 +469,7 @@ position vlen3D of </g1> vlen3D of </g1> difference [ 3 2 1 ] 59 0 59 59 differences found Attribute: <array3D of </g1>> and <array3D of </g1>> +size [4x3x2] position array3D of </g1> array3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -521,6 +546,7 @@ position array3D of </g1> array3D of </g1> difference [ 3 2 1 ] 72 0 72 72 differences found Attribute: <integer3D of </g1>> and <integer3D of </g1>> +size [4x3x2] position integer3D of </g1> integer3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -549,6 +575,7 @@ position integer3D of </g1> integer3D of </g1> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <float3D of </g1>> and <float3D of </g1>> +size [4x3x2] position float3D of </g1> float3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -579,6 +606,7 @@ position float3D of </g1> float3D of </g1> difference Group: </> and </> 0 differences found Attribute: <string of </>> and <string of </>> +size [2] position string of </> string of </> difference ------------------------------------------------------------ [ 0 ] a z @@ -587,18 +615,21 @@ position string of </> string of </> difference [ 1 ] e z 4 differences found Attribute: <bitfield of </>> and <bitfield of </>> +size [2] position bitfield of </> bitfield of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <opaque of </>> and <opaque of </>> +size [2] position opaque of </> opaque of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <compound of </>> and <compound of </>> +size [2] position compound of </> compound of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -607,12 +638,14 @@ position compound of </> compound of </> difference [ 1 ] 4 0 4 4 differences found Attribute: <enum of </>> and <enum of </>> +size [2] position enum of </> enum of </> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN 2 differences found Attribute: <vlen of </>> and <vlen of </>> +size [2] position vlen of </> vlen of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -620,6 +653,7 @@ position vlen of </> vlen of </> difference [ 1 ] 3 0 3 3 differences found Attribute: <array of </>> and <array of </>> +size [2] position array of </> array of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -630,18 +664,21 @@ position array of </> array of </> difference [ 1 ] 6 0 6 6 differences found Attribute: <integer of </>> and <integer of </>> +size [2] position integer of </> integer of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <float of </>> and <float of </>> +size [2] position float of </> float of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <string2D of </>> and <string2D of </>> +size [3x2] position string2D of </> string2D of </> difference ------------------------------------------------------------ [ 0 0 ] a z @@ -658,6 +695,7 @@ position string2D of </> string2D of </> difference [ 2 1 ] l z 12 differences found Attribute: <bitfield2D of </>> and <bitfield2D of </>> +size [3x2] position bitfield2D of </> bitfield2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -668,6 +706,7 @@ position bitfield2D of </> bitfield2D of </> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <opaque2D of </>> and <opaque2D of </>> +size [3x2] position opaque2D of </> opaque2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -678,6 +717,7 @@ position opaque2D of </> opaque2D of </> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <compound2D of </>> and <compound2D of </>> +size [3x2] position compound2D of </> compound2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -694,6 +734,7 @@ position compound2D of </> compound2D of </> difference [ 2 1 ] 12 0 12 12 differences found Attribute: <enum2D of </>> and <enum2D of </>> +size [3x2] position enum2D of </> enum2D of </> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN @@ -704,6 +745,7 @@ position enum2D of </> enum2D of </> difference [ 2 1 ] RED GREEN 6 differences found Attribute: <vlen2D of </>> and <vlen2D of </>> +size [3x2] position vlen2D of </> vlen2D of </> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -719,6 +761,7 @@ position vlen2D of </> vlen2D of </> difference [ 2 1 ] 11 0 11 11 differences found Attribute: <array2D of </>> and <array2D of </>> +size [3x2] position array2D of </> array2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -741,6 +784,7 @@ position array2D of </> array2D of </> difference [ 2 1 ] 18 0 18 18 differences found Attribute: <integer2D of </>> and <integer2D of </>> +size [3x2] position integer2D of </> integer2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -751,6 +795,7 @@ position integer2D of </> integer2D of </> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <float2D of </>> and <float2D of </>> +size [3x2] position float2D of </> float2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -761,6 +806,7 @@ position float2D of </> float2D of </> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <string3D of </>> and <string3D of </>> +size [4x3x2] position string3D of </> string3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -812,6 +858,7 @@ position string3D of </> string3D of </> difference [ 3 2 1 ] Z z 47 differences found Attribute: <bitfield3D of </>> and <bitfield3D of </>> +size [4x3x2] position bitfield3D of </> bitfield3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -840,6 +887,7 @@ position bitfield3D of </> bitfield3D of </> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <opaque3D of </>> and <opaque3D of </>> +size [4x3x2] position opaque3D of </> opaque3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -868,6 +916,7 @@ position opaque3D of </> opaque3D of </> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <compound3D of </>> and <compound3D of </>> +size [4x3x2] position compound3D of </> compound3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -920,6 +969,7 @@ position compound3D of </> compound3D of </> difference [ 3 2 1 ] 48 0 48 48 differences found Attribute: <enum3D of </>> and <enum3D of </>> +size [4x3x2] position enum3D of </> enum3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED @@ -948,6 +998,7 @@ position enum3D of </> enum3D of </> difference [ 3 2 1 ] GREEN RED 24 differences found Attribute: <vlen3D of </>> and <vlen3D of </>> +size [4x3x2] position vlen3D of </> vlen3D of </> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -1011,6 +1062,7 @@ position vlen3D of </> vlen3D of </> difference [ 3 2 1 ] 59 0 59 59 differences found Attribute: <array3D of </>> and <array3D of </>> +size [4x3x2] position array3D of </> array3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -1087,6 +1139,7 @@ position array3D of </> array3D of </> difference [ 3 2 1 ] 72 0 72 72 differences found Attribute: <integer3D of </>> and <integer3D of </>> +size [4x3x2] position integer3D of </> integer3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -1115,6 +1168,7 @@ position integer3D of </> integer3D of </> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <float3D of </>> and <float3D of </>> +size [4x3x2] position float3D of </> float3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt index 7a85488..c51a357 100644 --- a/tools/testfiles/h5diff_80.txt +++ b/tools/testfiles/h5diff_80.txt @@ -40,6 +40,7 @@ file1 file2 x x /refreg Dataset: </dset> and </dset> +size [2] position dset dset difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -50,6 +51,7 @@ Dataset: </dsetref> and </dsetref> Group: </g1> and </g1> 0 differences found Dataset: </g1/array> and </g1/array> +size [2] position array array difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -60,6 +62,7 @@ position array array difference [ 1 ] 6 0 6 6 differences found Dataset: </g1/array2D> and </g1/array2D> +size [3x2] position array2D array2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -82,6 +85,7 @@ position array2D array2D difference [ 2 1 ] 18 0 18 18 differences found Dataset: </g1/array3D> and </g1/array3D> +size [4x3x2] position array3D array3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -158,12 +162,14 @@ position array3D array3D difference [ 3 2 1 ] 72 0 72 72 differences found Dataset: </g1/bitfield> and </g1/bitfield> +size [2] position bitfield bitfield difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Dataset: </g1/bitfield2D> and </g1/bitfield2D> +size [3x2] position bitfield2D bitfield2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -174,6 +180,7 @@ position bitfield2D bitfield2D difference [ 2 1 ] 6 0 6 6 differences found Dataset: </g1/bitfield3D> and </g1/bitfield3D> +size [4x3x2] position bitfield3D bitfield3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -202,6 +209,7 @@ position bitfield3D bitfield3D difference [ 3 2 1 ] 24 0 24 24 differences found Dataset: </g1/compound> and </g1/compound> +size [2] position compound compound difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -210,6 +218,7 @@ position compound compound difference [ 1 ] 4 0 4 4 differences found Dataset: </g1/compound2D> and </g1/compound2D> +size [3x2] position compound2D compound2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -226,6 +235,7 @@ position compound2D compound2D difference [ 2 1 ] 12 0 12 12 differences found Dataset: </g1/compound3D> and </g1/compound3D> +size [4x3x2] position compound3D compound3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -278,6 +288,7 @@ position compound3D compound3D difference [ 3 2 1 ] 48 0 48 48 differences found Dataset: </g1/enum> and </g1/enum> +size [2] position enum enum difference ------------------------------------------------------------ [ 0 ] RED GREEN @@ -289,12 +300,14 @@ Dataset: </g1/enum3D> and </g1/enum3D> </g1/enum3D> and </g1/enum3D> are empty datasets 0 differences found Dataset: </g1/float> and </g1/float> +size [2] position float float difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Dataset: </g1/float2D> and </g1/float2D> +size [3x2] position float2D float2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -305,6 +318,7 @@ position float2D float2D difference [ 2 1 ] 6 0 6 6 differences found Dataset: </g1/float3D> and </g1/float3D> +size [4x3x2] position float3D float3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -333,12 +347,14 @@ position float3D float3D difference [ 3 2 1 ] 24 0 24 24 differences found Dataset: </g1/integer> and </g1/integer> +size [2] position integer integer difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Dataset: </g1/integer2D> and </g1/integer2D> +size [3x2] position integer2D integer2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -349,6 +365,7 @@ position integer2D integer2D difference [ 2 1 ] 6 0 6 6 differences found Dataset: </g1/integer3D> and </g1/integer3D> +size [4x3x2] position integer3D integer3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -377,12 +394,14 @@ position integer3D integer3D difference [ 3 2 1 ] 24 0 24 24 differences found Dataset: </g1/opaque> and </g1/opaque> +size [2] position opaque opaque difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Dataset: </g1/opaque2D> and </g1/opaque2D> +size [3x2] position opaque2D opaque2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -393,6 +412,7 @@ position opaque2D opaque2D difference [ 2 1 ] 6 0 6 6 differences found Dataset: </g1/opaque3D> and </g1/opaque3D> +size [4x3x2] position opaque3D opaque3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -421,140 +441,173 @@ position opaque3D opaque3D difference [ 3 2 1 ] 24 0 24 24 differences found Dataset: </g1/reference> and </g1/reference> +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 4 differences found Dataset: </g1/reference2D> and </g1/reference2D> +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 12 differences found Dataset: </g1/reference3D> and </g1/reference3D> +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 48 differences found Dataset: </g1/string> and </g1/string> +size [2] position string string difference ------------------------------------------------------------ [ 0 ] a z @@ -563,6 +616,7 @@ position string string difference [ 1 ] e z 4 differences found Dataset: </g1/string2D> and </g1/string2D> +size [3x2] position string2D string2D difference ------------------------------------------------------------ [ 0 0 ] a z @@ -579,6 +633,7 @@ position string2D string2D difference [ 2 1 ] l z 12 differences found Dataset: </g1/string3D> and </g1/string3D> +size [4x3x2] position string3D string3D difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -630,6 +685,7 @@ position string3D string3D difference [ 3 2 1 ] Z z 47 differences found Dataset: </g1/vlen> and </g1/vlen> +size [2] position vlen vlen difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -637,6 +693,7 @@ position vlen vlen difference [ 1 ] 3 0 3 3 differences found Dataset: </g1/vlen2D> and </g1/vlen2D> +size [3x2] position vlen2D vlen2D difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -652,6 +709,7 @@ position vlen2D vlen2D difference [ 2 1 ] 11 0 11 11 differences found Dataset: </g1/vlen3D> and </g1/vlen3D> +size [4x3x2] position vlen3D vlen3D difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 |