summaryrefslogtreecommitdiffstats
path: root/tools/testfiles
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2004-07-21 17:50:11 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2004-07-21 17:50:11 (GMT)
commit7dc938f649657f0b6b7f269374526365f8d87e14 (patch)
treed990647d58b719c6a49737ded36e9a4241e53863 /tools/testfiles
parentc157f8636889acb3fef0769512091f1d2749bdae (diff)
downloadhdf5-7dc938f649657f0b6b7f269374526365f8d87e14.zip
hdf5-7dc938f649657f0b6b7f269374526365f8d87e14.tar.gz
hdf5-7dc938f649657f0b6b7f269374526365f8d87e14.tar.bz2
[svn-r8911] Purpose:
bug fixes Description: the return error code for a function was not initialized. in HP-UX it happened that this variable was initialized to -1 causing the function to return with an error condtion solution : initialized the variable to 0 the name of the dataset was printed after the differences in verbose mode and report when differences were found solution : check first if differences were found and then print the name of dataset and differences in verbose mode always print the name first Solution: Platforms tested: linux HP-UX solaris AIX Misc. update:
Diffstat (limited to 'tools/testfiles')
-rw-r--r--tools/testfiles/h5diff_13.txt2
-rw-r--r--tools/testfiles/h5diff_14.txt2
-rw-r--r--tools/testfiles/h5diff_15.txt2
-rw-r--r--tools/testfiles/h5diff_16.txt2
-rw-r--r--tools/testfiles/h5diff_17.txt2
-rw-r--r--tools/testfiles/h5diff_50.txt2
-rw-r--r--tools/testfiles/h5diff_51.txt2
-rw-r--r--tools/testfiles/h5diff_52.txt2
-rw-r--r--tools/testfiles/h5diff_53.txt2
-rw-r--r--tools/testfiles/h5diff_54.txt2
-rw-r--r--tools/testfiles/h5diff_55.txt2
-rw-r--r--tools/testfiles/h5diff_56.txt2
-rw-r--r--tools/testfiles/h5diff_57.txt2
-rw-r--r--tools/testfiles/h5diff_70.txt110
-rw-r--r--tools/testfiles/h5diff_80.txt62
15 files changed, 99 insertions, 99 deletions
diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt
index 8d5c69e..53f44c1 100644
--- a/tools/testfiles/h5diff_13.txt
+++ b/tools/testfiles/h5diff_13.txt
@@ -1,11 +1,11 @@
#############################
Expected output for 'h5diff file1.h5 file2.h5 -r'
#############################
+Dataset: </g1/dset1> and </g1/dset1>
position dset1 dset1 difference
------------------------------------------------------------
[ 0 1 ] 1.000000 1.100000 0.100000
[ 1 0 ] 1.000000 1.010000 0.010000
[ 1 1 ] 1.000000 1.001000 0.001000
[ 2 0 ] 1.000000 1.000100 0.000100
-Dataset: </g1/dset1> and </g1/dset1>
4 differences found
diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt
index 33683d3..15e4dee 100644
--- a/tools/testfiles/h5diff_14.txt
+++ b/tools/testfiles/h5diff_14.txt
@@ -1,11 +1,11 @@
#############################
Expected output for 'h5diff file1.h5 file2.h5 -r g1/dset1 g1/dset2'
#############################
+Dataset: </g1/dset1> and </g1/dset2>
position dset1 dset2 difference
------------------------------------------------------------
[ 0 1 ] 1.000000 1.100000 0.100000
[ 1 0 ] 1.000000 1.010000 0.010000
[ 1 1 ] 1.000000 1.001000 0.001000
[ 2 0 ] 1.000000 1.000100 0.000100
-Dataset: </g1/dset1> and </g1/dset2>
4 differences found
diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt
index e2aeb88..47789c4 100644
--- a/tools/testfiles/h5diff_15.txt
+++ b/tools/testfiles/h5diff_15.txt
@@ -1,6 +1,7 @@
#############################
Expected output for 'h5diff file1.h5 file2.h5 -r -d 5 g1/dset3 g1/dset4'
#############################
+Dataset: </g1/dset3> and </g1/dset4>
position dset3 dset4 difference
------------------------------------------------------------
[ 0 0 ] 100.000000 110.000000 10.000000
@@ -9,5 +10,4 @@ position dset3 dset4 difference
[ 1 1 ] 100.000000 80.000000 20.000000
[ 2 0 ] 100.000000 140.000000 40.000000
[ 2 1 ] 100.000000 200.000000 100.000000
-Dataset: </g1/dset3> and </g1/dset4>
6 differences found
diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt
index 1aa2f72..5bff6fb 100644
--- a/tools/testfiles/h5diff_16.txt
+++ b/tools/testfiles/h5diff_16.txt
@@ -1,6 +1,7 @@
#############################
Expected output for 'h5diff file1.h5 file2.h5 -r -p 0.05 g1/dset3 g1/dset4'
#############################
+Dataset: </g1/dset3> and </g1/dset4>
position dset3 dset4 difference relative
------------------------------------------------------------------------
[ 0 0 ] 100 110 10 0.1
@@ -9,5 +10,4 @@ position dset3 dset4 difference relative
[ 1 1 ] 100 80 20 0.2
[ 2 0 ] 100 140 40 0.4
[ 2 1 ] 100 200 100 1
-Dataset: </g1/dset3> and </g1/dset4>
6 differences found
diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt
index 6f7a360..3ba4b74 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/testfiles/h5diff_17.txt
@@ -12,12 +12,12 @@ file1 file2
x /g2
Group: </g1> and </g1>
+Dataset: </g1/dset1> and </g1/dset1>
position dset1 dset1 difference
------------------------------------------------------------
[ 0 1 ] 1.000000 1.100000 0.100000
[ 1 0 ] 1.000000 1.010000 0.010000
[ 1 1 ] 1.000000 1.001000 0.001000
[ 2 0 ] 1.000000 1.000100 0.000100
-Dataset: </g1/dset1> and </g1/dset1>
Group: </> and </>
4 differences found
diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt
index af07a2a..0827f0d 100644
--- a/tools/testfiles/h5diff_50.txt
+++ b/tools/testfiles/h5diff_50.txt
@@ -1,6 +1,7 @@
#############################
Expected output for 'h5diff file4.h5 file4.h5 -v dset0a dset0b'
#############################
+Dataset: </dset0a> and </dset0b>
Warning: Different storage datatype
</dset0a> has file datatype H5T_STD_I16LE
</dset0b> has file datatype H5T_STD_I32LE
@@ -13,5 +14,4 @@ position dset0a dset0b difference
[ 1 1 ] 1 4 3
[ 2 0 ] 1 5 4
[ 2 1 ] 1 6 5
-Dataset: </dset0a> and </dset0b>
4 differences found
diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt
index 216c921..d63f7da 100644
--- a/tools/testfiles/h5diff_51.txt
+++ b/tools/testfiles/h5diff_51.txt
@@ -1,11 +1,11 @@
#############################
Expected output for 'h5diff file4.h5 file4.h5 -v dset1a dset1b'
#############################
+Dataset: </dset1a> and </dset1b>
position dset1a dset1b difference
------------------------------------------------------------
[ 1 0 ] 1 3 2
[ 1 1 ] 1 4 3
[ 2 0 ] 1 5 4
[ 2 1 ] 1 6 5
-Dataset: </dset1a> and </dset1b>
4 differences found
diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt
index f1e824f..2742164 100644
--- a/tools/testfiles/h5diff_52.txt
+++ b/tools/testfiles/h5diff_52.txt
@@ -1,11 +1,11 @@
#############################
Expected output for 'h5diff file4.h5 file4.h5 -v dset2a dset2b'
#############################
+Dataset: </dset2a> and </dset2b>
position dset2a dset2b difference
------------------------------------------------------------
[ 1 0 ] 1 3 2
[ 1 1 ] 1 4 3
[ 2 0 ] 1 5 4
[ 2 1 ] 1 6 5
-Dataset: </dset2a> and </dset2b>
4 differences found
diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt
index 115985a..814ae9a 100644
--- a/tools/testfiles/h5diff_53.txt
+++ b/tools/testfiles/h5diff_53.txt
@@ -1,11 +1,11 @@
#############################
Expected output for 'h5diff file4.h5 file4.h5 -v dset3a dset4b'
#############################
+Dataset: </dset3a> and </dset4b>
position dset3a dset4b difference
------------------------------------------------------------
[ 1 0 ] 1 3 2
[ 1 1 ] 1 4 3
[ 2 0 ] 1 5 4
[ 2 1 ] 1 6 5
-Dataset: </dset3a> and </dset4b>
4 differences found
diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt
index 42f3d38..65074cf 100644
--- a/tools/testfiles/h5diff_54.txt
+++ b/tools/testfiles/h5diff_54.txt
@@ -1,11 +1,11 @@
#############################
Expected output for 'h5diff file4.h5 file4.h5 -v dset4a dset4b'
#############################
+Dataset: </dset4a> and </dset4b>
position dset4a dset4b difference
------------------------------------------------------------
[ 1 0 ] 1 3 2
[ 1 1 ] 1 4 3
[ 2 0 ] 1 5 4
[ 2 1 ] 1 6 5
-Dataset: </dset4a> and </dset4b>
4 differences found
diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt
index b52d080..ba97356 100644
--- a/tools/testfiles/h5diff_55.txt
+++ b/tools/testfiles/h5diff_55.txt
@@ -1,11 +1,11 @@
#############################
Expected output for 'h5diff file4.h5 file4.h5 -v dset5a dset5b'
#############################
+Dataset: </dset5a> and </dset5b>
position dset5a dset5b difference
------------------------------------------------------------
[ 1 0 ] 1.000000 3.000000 2.000000
[ 1 1 ] 1.000000 4.000000 3.000000
[ 2 0 ] 1.000000 5.000000 4.000000
[ 2 1 ] 1.000000 6.000000 5.000000
-Dataset: </dset5a> and </dset5b>
4 differences found
diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt
index 888aebb..1a00da1 100644
--- a/tools/testfiles/h5diff_56.txt
+++ b/tools/testfiles/h5diff_56.txt
@@ -1,11 +1,11 @@
#############################
Expected output for 'h5diff file4.h5 file4.h5 -v dset6a dset6b'
#############################
+Dataset: </dset6a> and </dset6b>
position dset6a dset6b difference
------------------------------------------------------------
[ 1 0 ] 1.000000 3.000000 2.000000
[ 1 1 ] 1.000000 4.000000 3.000000
[ 2 0 ] 1.000000 5.000000 4.000000
[ 2 1 ] 1.000000 6.000000 5.000000
-Dataset: </dset6a> and </dset6b>
4 differences found
diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt
index 0502f82..b4424a5 100644
--- a/tools/testfiles/h5diff_57.txt
+++ b/tools/testfiles/h5diff_57.txt
@@ -1,6 +1,7 @@
#############################
Expected output for 'h5diff file4.h5 file4.h5 -v dset7a dset7b'
#############################
+Dataset: </dset7a> and </dset7b>
Warning: Different storage datatype
</dset7a> has file datatype H5T_STD_I8LE
</dset7b> has file datatype H5T_STD_U8LE
@@ -8,5 +9,4 @@ Warning: Different storage datatype
</dset7a> has file datatype H5T_STD_I8LE
</dset7b> has file datatype H5T_STD_U8LE
Comparison not supported: </dset7a> has sign H5T_SGN_2 and </dset7b> has sign H5T_SGN_NONE
-Dataset: </dset7a> and </dset7b>
0 differences found
diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt
index 0fc1e09..a44b4de 100644
--- a/tools/testfiles/h5diff_70.txt
+++ b/tools/testfiles/h5diff_70.txt
@@ -7,50 +7,51 @@ file1 file2
x x /dset
x x /g1
-</dset> and </dset> are empty datasets
Dataset: </dset> and </dset>
+</dset> and </dset> are empty datasets
Group: </g1> and </g1>
+Attribute: <string of </g1>> and <string of </g1>>
position string of </g1> string of </g1> difference
------------------------------------------------------------
[ 0 ] a z
[ 0 ] b z
[ 1 ] d z
[ 1 ] e z
-Attribute: <string of </g1>> and <string of </g1>>
4 differences found
+Attribute: <bitfield of </g1>> and <bitfield of </g1>>
position bitfield of </g1> bitfield of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Attribute: <bitfield of </g1>> and <bitfield of </g1>>
2 differences found
+Attribute: <opaque of </g1>> and <opaque of </g1>>
position opaque of </g1> opaque of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Attribute: <opaque of </g1>> and <opaque of </g1>>
2 differences found
+Attribute: <compound of </g1>> and <compound of </g1>>
position compound of </g1> compound of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2.000000 0.000000 2.000000
[ 1 ] 3 0 3
[ 1 ] 4.000000 0.000000 4.000000
-Attribute: <compound of </g1>> and <compound of </g1>>
4 differences found
+Attribute: <enum of </g1>> and <enum of </g1>>
position enum of </g1> enum of </g1> difference
------------------------------------------------------------
[ 0 ] RED GREEN
[ 1 ] RED GREEN
-Attribute: <enum of </g1>> and <enum of </g1>>
2 differences found
+Attribute: <vlen of </g1>> and <vlen of </g1>>
position vlen of </g1> vlen of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
[ 1 ] 3 0 3
-Attribute: <vlen of </g1>> and <vlen of </g1>>
3 differences found
+Attribute: <array of </g1>> and <array of </g1>>
position array of </g1> array of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -59,20 +60,20 @@ position array of </g1> array of </g1> difference
[ 1 ] 4 0 4
[ 1 ] 5 0 5
[ 1 ] 6 0 6
-Attribute: <array of </g1>> and <array of </g1>>
6 differences found
+Attribute: <integer of </g1>> and <integer of </g1>>
position integer of </g1> integer of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Attribute: <integer of </g1>> and <integer of </g1>>
2 differences found
+Attribute: <float of </g1>> and <float of </g1>>
position float of </g1> float of </g1> difference
------------------------------------------------------------
[ 0 ] 1.000000 0.000000 1.000000
[ 1 ] 2.000000 0.000000 2.000000
-Attribute: <float of </g1>> and <float of </g1>>
2 differences found
+Attribute: <string2D of </g1>> and <string2D of </g1>>
position string2D of </g1> string2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] a z
@@ -87,8 +88,8 @@ position string2D of </g1> string2D of </g1> difference
[ 2 0 ] j z
[ 2 1 ] k z
[ 2 1 ] l z
-Attribute: <string2D of </g1>> and <string2D of </g1>>
12 differences found
+Attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>>
position bitfield2D of </g1> bitfield2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -97,8 +98,8 @@ position bitfield2D of </g1> bitfield2D of </g1> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
-Attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>>
6 differences found
+Attribute: <opaque2D of </g1>> and <opaque2D of </g1>>
position opaque2D of </g1> opaque2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -107,8 +108,8 @@ position opaque2D of </g1> opaque2D of </g1> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
-Attribute: <opaque2D of </g1>> and <opaque2D of </g1>>
6 differences found
+Attribute: <compound2D of </g1>> and <compound2D of </g1>>
position compound2D of </g1> compound2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -123,8 +124,8 @@ position compound2D of </g1> compound2D of </g1> difference
[ 2 0 ] 10.000000 0.000000 10.000000
[ 2 1 ] 11 0 11
[ 2 1 ] 12.000000 0.000000 12.000000
-Attribute: <compound2D of </g1>> and <compound2D of </g1>>
12 differences found
+Attribute: <enum2D of </g1>> and <enum2D of </g1>>
position enum2D of </g1> enum2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] RED GREEN
@@ -133,8 +134,8 @@ position enum2D of </g1> enum2D of </g1> difference
[ 1 1 ] RED GREEN
[ 2 0 ] RED GREEN
[ 2 1 ] RED GREEN
-Attribute: <enum2D of </g1>> and <enum2D of </g1>>
6 differences found
+Attribute: <vlen2D of </g1>> and <vlen2D of </g1>>
position vlen2D of </g1> vlen2D of </g1> difference
------------------------------------------------------------
[ 0 1 ] 1 0 1
@@ -148,8 +149,8 @@ position vlen2D of </g1> vlen2D of </g1> difference
[ 2 1 ] 9 0 9
[ 2 1 ] 10 0 10
[ 2 1 ] 11 0 11
-Attribute: <vlen2D of </g1>> and <vlen2D of </g1>>
11 differences found
+Attribute: <array2D of </g1>> and <array2D of </g1>>
position array2D of </g1> array2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -170,8 +171,8 @@ position array2D of </g1> array2D of </g1> difference
[ 2 1 ] 16 0 16
[ 2 1 ] 17 0 17
[ 2 1 ] 18 0 18
-Attribute: <array2D of </g1>> and <array2D of </g1>>
18 differences found
+Attribute: <integer2D of </g1>> and <integer2D of </g1>>
position integer2D of </g1> integer2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -180,8 +181,8 @@ position integer2D of </g1> integer2D of </g1> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
-Attribute: <integer2D of </g1>> and <integer2D of </g1>>
6 differences found
+Attribute: <float2D of </g1>> and <float2D of </g1>>
position float2D of </g1> float2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1.000000 0.000000 1.000000
@@ -190,8 +191,8 @@ position float2D of </g1> float2D of </g1> difference
[ 1 1 ] 4.000000 0.000000 4.000000
[ 2 0 ] 5.000000 0.000000 5.000000
[ 2 1 ] 6.000000 0.000000 6.000000
-Attribute: <float2D of </g1>> and <float2D of </g1>>
6 differences found
+Attribute: <string3D of </g1>> and <string3D of </g1>>
position string3D of </g1> string3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] a z
@@ -241,8 +242,8 @@ position string3D of </g1> string3D of </g1> difference
[ 3 2 0 ] W z
[ 3 2 1 ] X z
[ 3 2 1 ] Z z
-Attribute: <string3D of </g1>> and <string3D of </g1>>
47 differences found
+Attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>>
position bitfield3D of </g1> bitfield3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -269,8 +270,8 @@ position bitfield3D of </g1> bitfield3D of </g1> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
-Attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>>
24 differences found
+Attribute: <opaque3D of </g1>> and <opaque3D of </g1>>
position opaque3D of </g1> opaque3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -297,8 +298,8 @@ position opaque3D of </g1> opaque3D of </g1> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
-Attribute: <opaque3D of </g1>> and <opaque3D of </g1>>
24 differences found
+Attribute: <compound3D of </g1>> and <compound3D of </g1>>
position compound3D of </g1> compound3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -349,8 +350,8 @@ position compound3D of </g1> compound3D of </g1> difference
[ 3 2 0 ] 46.000000 0.000000 46.000000
[ 3 2 1 ] 47 0 47
[ 3 2 1 ] 48.000000 0.000000 48.000000
-Attribute: <compound3D of </g1>> and <compound3D of </g1>>
48 differences found
+Attribute: <enum3D of </g1>> and <enum3D of </g1>>
position enum3D of </g1> enum3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] GREEN RED
@@ -377,8 +378,8 @@ position enum3D of </g1> enum3D of </g1> difference
[ 3 1 1 ] GREEN RED
[ 3 2 0 ] GREEN RED
[ 3 2 1 ] GREEN RED
-Attribute: <enum3D of </g1>> and <enum3D of </g1>>
24 differences found
+Attribute: <vlen3D of </g1>> and <vlen3D of </g1>>
position vlen3D of </g1> vlen3D of </g1> difference
------------------------------------------------------------
[ 0 0 1 ] 1 0 1
@@ -440,8 +441,8 @@ position vlen3D of </g1> vlen3D of </g1> difference
[ 3 2 1 ] 57 0 57
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
-Attribute: <vlen3D of </g1>> and <vlen3D of </g1>>
59 differences found
+Attribute: <array3D of </g1>> and <array3D of </g1>>
position array3D of </g1> array3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -516,8 +517,8 @@ position array3D of </g1> array3D of </g1> difference
[ 3 2 1 ] 70 0 70
[ 3 2 1 ] 71 0 71
[ 3 2 1 ] 72 0 72
-Attribute: <array3D of </g1>> and <array3D of </g1>>
72 differences found
+Attribute: <integer3D of </g1>> and <integer3D of </g1>>
position integer3D of </g1> integer3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -544,8 +545,8 @@ position integer3D of </g1> integer3D of </g1> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
-Attribute: <integer3D of </g1>> and <integer3D of </g1>>
24 differences found
+Attribute: <float3D of </g1>> and <float3D of </g1>>
position float3D of </g1> float3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1.000000 0.000000 1.000000
@@ -572,50 +573,50 @@ position float3D of </g1> float3D of </g1> difference
[ 3 1 1 ] 22.000000 0.000000 22.000000
[ 3 2 0 ] 23.000000 0.000000 23.000000
[ 3 2 1 ] 24.000000 0.000000 24.000000
-Attribute: <float3D of </g1>> and <float3D of </g1>>
24 differences found
Group: </> and </>
+Attribute: <string of </>> and <string of </>>
position string of </> string of </> difference
------------------------------------------------------------
[ 0 ] a z
[ 0 ] b z
[ 1 ] d z
[ 1 ] e z
-Attribute: <string of </>> and <string of </>>
4 differences found
+Attribute: <bitfield of </>> and <bitfield of </>>
position bitfield of </> bitfield of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Attribute: <bitfield of </>> and <bitfield of </>>
2 differences found
+Attribute: <opaque of </>> and <opaque of </>>
position opaque of </> opaque of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Attribute: <opaque of </>> and <opaque of </>>
2 differences found
+Attribute: <compound of </>> and <compound of </>>
position compound of </> compound of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2.000000 0.000000 2.000000
[ 1 ] 3 0 3
[ 1 ] 4.000000 0.000000 4.000000
-Attribute: <compound of </>> and <compound of </>>
4 differences found
+Attribute: <enum of </>> and <enum of </>>
position enum of </> enum of </> difference
------------------------------------------------------------
[ 0 ] RED GREEN
[ 1 ] RED GREEN
-Attribute: <enum of </>> and <enum of </>>
2 differences found
+Attribute: <vlen of </>> and <vlen of </>>
position vlen of </> vlen of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
[ 1 ] 3 0 3
-Attribute: <vlen of </>> and <vlen of </>>
3 differences found
+Attribute: <array of </>> and <array of </>>
position array of </> array of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -624,20 +625,20 @@ position array of </> array of </> difference
[ 1 ] 4 0 4
[ 1 ] 5 0 5
[ 1 ] 6 0 6
-Attribute: <array of </>> and <array of </>>
6 differences found
+Attribute: <integer of </>> and <integer of </>>
position integer of </> integer of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Attribute: <integer of </>> and <integer of </>>
2 differences found
+Attribute: <float of </>> and <float of </>>
position float of </> float of </> difference
------------------------------------------------------------
[ 0 ] 1.000000 0.000000 1.000000
[ 1 ] 2.000000 0.000000 2.000000
-Attribute: <float of </>> and <float of </>>
2 differences found
+Attribute: <string2D of </>> and <string2D of </>>
position string2D of </> string2D of </> difference
------------------------------------------------------------
[ 0 0 ] a z
@@ -652,8 +653,8 @@ position string2D of </> string2D of </> difference
[ 2 0 ] j z
[ 2 1 ] k z
[ 2 1 ] l z
-Attribute: <string2D of </>> and <string2D of </>>
12 differences found
+Attribute: <bitfield2D of </>> and <bitfield2D of </>>
position bitfield2D of </> bitfield2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -662,8 +663,8 @@ position bitfield2D of </> bitfield2D of </> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
-Attribute: <bitfield2D of </>> and <bitfield2D of </>>
6 differences found
+Attribute: <opaque2D of </>> and <opaque2D of </>>
position opaque2D of </> opaque2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -672,8 +673,8 @@ position opaque2D of </> opaque2D of </> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
-Attribute: <opaque2D of </>> and <opaque2D of </>>
6 differences found
+Attribute: <compound2D of </>> and <compound2D of </>>
position compound2D of </> compound2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -688,8 +689,8 @@ position compound2D of </> compound2D of </> difference
[ 2 0 ] 10.000000 0.000000 10.000000
[ 2 1 ] 11 0 11
[ 2 1 ] 12.000000 0.000000 12.000000
-Attribute: <compound2D of </>> and <compound2D of </>>
12 differences found
+Attribute: <enum2D of </>> and <enum2D of </>>
position enum2D of </> enum2D of </> difference
------------------------------------------------------------
[ 0 0 ] RED GREEN
@@ -698,8 +699,8 @@ position enum2D of </> enum2D of </> difference
[ 1 1 ] RED GREEN
[ 2 0 ] RED GREEN
[ 2 1 ] RED GREEN
-Attribute: <enum2D of </>> and <enum2D of </>>
6 differences found
+Attribute: <vlen2D of </>> and <vlen2D of </>>
position vlen2D of </> vlen2D of </> difference
------------------------------------------------------------
[ 0 1 ] 1 0 1
@@ -713,8 +714,8 @@ position vlen2D of </> vlen2D of </> difference
[ 2 1 ] 9 0 9
[ 2 1 ] 10 0 10
[ 2 1 ] 11 0 11
-Attribute: <vlen2D of </>> and <vlen2D of </>>
11 differences found
+Attribute: <array2D of </>> and <array2D of </>>
position array2D of </> array2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -735,8 +736,8 @@ position array2D of </> array2D of </> difference
[ 2 1 ] 16 0 16
[ 2 1 ] 17 0 17
[ 2 1 ] 18 0 18
-Attribute: <array2D of </>> and <array2D of </>>
18 differences found
+Attribute: <integer2D of </>> and <integer2D of </>>
position integer2D of </> integer2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -745,8 +746,8 @@ position integer2D of </> integer2D of </> difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
-Attribute: <integer2D of </>> and <integer2D of </>>
6 differences found
+Attribute: <float2D of </>> and <float2D of </>>
position float2D of </> float2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1.000000 0.000000 1.000000
@@ -755,8 +756,8 @@ position float2D of </> float2D of </> difference
[ 1 1 ] 4.000000 0.000000 4.000000
[ 2 0 ] 5.000000 0.000000 5.000000
[ 2 1 ] 6.000000 0.000000 6.000000
-Attribute: <float2D of </>> and <float2D of </>>
6 differences found
+Attribute: <string3D of </>> and <string3D of </>>
position string3D of </> string3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] a z
@@ -806,8 +807,8 @@ position string3D of </> string3D of </> difference
[ 3 2 0 ] W z
[ 3 2 1 ] X z
[ 3 2 1 ] Z z
-Attribute: <string3D of </>> and <string3D of </>>
47 differences found
+Attribute: <bitfield3D of </>> and <bitfield3D of </>>
position bitfield3D of </> bitfield3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -834,8 +835,8 @@ position bitfield3D of </> bitfield3D of </> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
-Attribute: <bitfield3D of </>> and <bitfield3D of </>>
24 differences found
+Attribute: <opaque3D of </>> and <opaque3D of </>>
position opaque3D of </> opaque3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -862,8 +863,8 @@ position opaque3D of </> opaque3D of </> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
-Attribute: <opaque3D of </>> and <opaque3D of </>>
24 differences found
+Attribute: <compound3D of </>> and <compound3D of </>>
position compound3D of </> compound3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -914,8 +915,8 @@ position compound3D of </> compound3D of </> difference
[ 3 2 0 ] 46.000000 0.000000 46.000000
[ 3 2 1 ] 47 0 47
[ 3 2 1 ] 48.000000 0.000000 48.000000
-Attribute: <compound3D of </>> and <compound3D of </>>
48 differences found
+Attribute: <enum3D of </>> and <enum3D of </>>
position enum3D of </> enum3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] GREEN RED
@@ -942,8 +943,8 @@ position enum3D of </> enum3D of </> difference
[ 3 1 1 ] GREEN RED
[ 3 2 0 ] GREEN RED
[ 3 2 1 ] GREEN RED
-Attribute: <enum3D of </>> and <enum3D of </>>
24 differences found
+Attribute: <vlen3D of </>> and <vlen3D of </>>
position vlen3D of </> vlen3D of </> difference
------------------------------------------------------------
[ 0 0 1 ] 1 0 1
@@ -1005,8 +1006,8 @@ position vlen3D of </> vlen3D of </> difference
[ 3 2 1 ] 57 0 57
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
-Attribute: <vlen3D of </>> and <vlen3D of </>>
59 differences found
+Attribute: <array3D of </>> and <array3D of </>>
position array3D of </> array3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -1081,8 +1082,8 @@ position array3D of </> array3D of </> difference
[ 3 2 1 ] 70 0 70
[ 3 2 1 ] 71 0 71
[ 3 2 1 ] 72 0 72
-Attribute: <array3D of </>> and <array3D of </>>
72 differences found
+Attribute: <integer3D of </>> and <integer3D of </>>
position integer3D of </> integer3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -1109,8 +1110,8 @@ position integer3D of </> integer3D of </> difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
-Attribute: <integer3D of </>> and <integer3D of </>>
24 differences found
+Attribute: <float3D of </>> and <float3D of </>>
position float3D of </> float3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1.000000 0.000000 1.000000
@@ -1137,6 +1138,5 @@ position float3D of </> float3D of </> difference
[ 3 1 1 ] 22.000000 0.000000 22.000000
[ 3 2 0 ] 23.000000 0.000000 23.000000
[ 3 2 1 ] 24.000000 0.000000 24.000000
-Attribute: <float3D of </>> and <float3D of </>>
24 differences found
0 differences found
diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt
index 420b2dc..8f7adca 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/testfiles/h5diff_80.txt
@@ -37,12 +37,13 @@ file1 file2
x x /g1/vlen2D
x x /g1/vlen3D
+Dataset: </dset> and </dset>
position dset dset difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Dataset: </dset> and </dset>
Group: </g1> and </g1>
+Dataset: </g1/array> and </g1/array>
position array array difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -51,7 +52,7 @@ position array array difference
[ 1 ] 4 0 4
[ 1 ] 5 0 5
[ 1 ] 6 0 6
-Dataset: </g1/array> and </g1/array>
+Dataset: </g1/array2D> and </g1/array2D>
position array2D array2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -72,7 +73,7 @@ position array2D array2D difference
[ 2 1 ] 16 0 16
[ 2 1 ] 17 0 17
[ 2 1 ] 18 0 18
-Dataset: </g1/array2D> and </g1/array2D>
+Dataset: </g1/array3D> and </g1/array3D>
position array3D array3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -147,12 +148,12 @@ position array3D array3D difference
[ 3 2 1 ] 70 0 70
[ 3 2 1 ] 71 0 71
[ 3 2 1 ] 72 0 72
-Dataset: </g1/array3D> and </g1/array3D>
+Dataset: </g1/bitfield> and </g1/bitfield>
position bitfield bitfield difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Dataset: </g1/bitfield> and </g1/bitfield>
+Dataset: </g1/bitfield2D> and </g1/bitfield2D>
position bitfield2D bitfield2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -161,7 +162,7 @@ position bitfield2D bitfield2D difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
-Dataset: </g1/bitfield2D> and </g1/bitfield2D>
+Dataset: </g1/bitfield3D> and </g1/bitfield3D>
position bitfield3D bitfield3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -188,14 +189,14 @@ position bitfield3D bitfield3D difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
-Dataset: </g1/bitfield3D> and </g1/bitfield3D>
+Dataset: </g1/compound> and </g1/compound>
position compound compound difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2.000000 0.000000 2.000000
[ 1 ] 3 0 3
[ 1 ] 4.000000 0.000000 4.000000
-Dataset: </g1/compound> and </g1/compound>
+Dataset: </g1/compound2D> and </g1/compound2D>
position compound2D compound2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -210,7 +211,7 @@ position compound2D compound2D difference
[ 2 0 ] 10.000000 0.000000 10.000000
[ 2 1 ] 11 0 11
[ 2 1 ] 12.000000 0.000000 12.000000
-Dataset: </g1/compound2D> and </g1/compound2D>
+Dataset: </g1/compound3D> and </g1/compound3D>
position compound3D compound3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -261,20 +262,20 @@ position compound3D compound3D difference
[ 3 2 0 ] 46.000000 0.000000 46.000000
[ 3 2 1 ] 47 0 47
[ 3 2 1 ] 48.000000 0.000000 48.000000
-Dataset: </g1/compound3D> and </g1/compound3D>
+Dataset: </g1/enum> and </g1/enum>
position enum enum difference
------------------------------------------------------------
[ 0 ] RED GREEN
-Dataset: </g1/enum> and </g1/enum>
-</g1/enum2D> and </g1/enum2D> are empty datasets
Dataset: </g1/enum2D> and </g1/enum2D>
-</g1/enum3D> and </g1/enum3D> are empty datasets
+</g1/enum2D> and </g1/enum2D> are empty datasets
Dataset: </g1/enum3D> and </g1/enum3D>
+</g1/enum3D> and </g1/enum3D> are empty datasets
+Dataset: </g1/float> and </g1/float>
position float float difference
------------------------------------------------------------
[ 0 ] 1.000000 0.000000 1.000000
[ 1 ] 2.000000 0.000000 2.000000
-Dataset: </g1/float> and </g1/float>
+Dataset: </g1/float2D> and </g1/float2D>
position float2D float2D difference
------------------------------------------------------------
[ 0 0 ] 1.000000 0.000000 1.000000
@@ -283,7 +284,7 @@ position float2D float2D difference
[ 1 1 ] 4.000000 0.000000 4.000000
[ 2 0 ] 5.000000 0.000000 5.000000
[ 2 1 ] 6.000000 0.000000 6.000000
-Dataset: </g1/float2D> and </g1/float2D>
+Dataset: </g1/float3D> and </g1/float3D>
position float3D float3D difference
------------------------------------------------------------
[ 0 0 0 ] 1.000000 0.000000 1.000000
@@ -310,12 +311,12 @@ position float3D float3D difference
[ 3 1 1 ] 22.000000 0.000000 22.000000
[ 3 2 0 ] 23.000000 0.000000 23.000000
[ 3 2 1 ] 24.000000 0.000000 24.000000
-Dataset: </g1/float3D> and </g1/float3D>
+Dataset: </g1/integer> and </g1/integer>
position integer integer difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Dataset: </g1/integer> and </g1/integer>
+Dataset: </g1/integer2D> and </g1/integer2D>
position integer2D integer2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -324,7 +325,7 @@ position integer2D integer2D difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
-Dataset: </g1/integer2D> and </g1/integer2D>
+Dataset: </g1/integer3D> and </g1/integer3D>
position integer3D integer3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -351,12 +352,12 @@ position integer3D integer3D difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
-Dataset: </g1/integer3D> and </g1/integer3D>
+Dataset: </g1/opaque> and </g1/opaque>
position opaque opaque difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Dataset: </g1/opaque> and </g1/opaque>
+Dataset: </g1/opaque2D> and </g1/opaque2D>
position opaque2D opaque2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -365,7 +366,7 @@ position opaque2D opaque2D difference
[ 1 1 ] 4 0 4
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
-Dataset: </g1/opaque2D> and </g1/opaque2D>
+Dataset: </g1/opaque3D> and </g1/opaque3D>
position opaque3D opaque3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -392,7 +393,7 @@ position opaque3D opaque3D difference
[ 3 1 1 ] 22 0 22
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
-Dataset: </g1/opaque3D> and </g1/opaque3D>
+Dataset: </g1/reference> and </g1/reference>
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -401,7 +402,7 @@ position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Dataset: </g1/reference> and </g1/reference>
+Dataset: </g1/reference2D> and </g1/reference2D>
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -426,7 +427,7 @@ position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Dataset: </g1/reference2D> and </g1/reference2D>
+Dataset: </g1/reference3D> and </g1/reference3D>
position difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -523,14 +524,14 @@ position difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
-Dataset: </g1/reference3D> and </g1/reference3D>
+Dataset: </g1/string> and </g1/string>
position string string difference
------------------------------------------------------------
[ 0 ] a z
[ 0 ] b z
[ 1 ] d z
[ 1 ] e z
-Dataset: </g1/string> and </g1/string>
+Dataset: </g1/string2D> and </g1/string2D>
position string2D string2D difference
------------------------------------------------------------
[ 0 0 ] a z
@@ -545,7 +546,7 @@ position string2D string2D difference
[ 2 0 ] j z
[ 2 1 ] k z
[ 2 1 ] l z
-Dataset: </g1/string2D> and </g1/string2D>
+Dataset: </g1/string3D> and </g1/string3D>
position string3D string3D difference
------------------------------------------------------------
[ 0 0 0 ] a z
@@ -595,13 +596,13 @@ position string3D string3D difference
[ 3 2 0 ] W z
[ 3 2 1 ] X z
[ 3 2 1 ] Z z
-Dataset: </g1/string3D> and </g1/string3D>
+Dataset: </g1/vlen> and </g1/vlen>
position vlen vlen difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
[ 1 ] 3 0 3
-Dataset: </g1/vlen> and </g1/vlen>
+Dataset: </g1/vlen2D> and </g1/vlen2D>
position vlen2D vlen2D difference
------------------------------------------------------------
[ 0 1 ] 1 0 1
@@ -615,7 +616,7 @@ position vlen2D vlen2D difference
[ 2 1 ] 9 0 9
[ 2 1 ] 10 0 10
[ 2 1 ] 11 0 11
-Dataset: </g1/vlen2D> and </g1/vlen2D>
+Dataset: </g1/vlen3D> and </g1/vlen3D>
position vlen3D vlen3D difference
------------------------------------------------------------
[ 0 0 1 ] 1 0 1
@@ -677,6 +678,5 @@ position vlen3D vlen3D difference
[ 3 2 1 ] 57 0 57
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
-Dataset: </g1/vlen3D> and </g1/vlen3D>
Group: </> and </>
491 differences found
generated by cgit v0.12 at 2024-11-05 08:07:14 (GMT)