summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/lib/h5diff.c48
-rw-r--r--tools/lib/h5diff.h8
-rw-r--r--tools/lib/h5diff_array.c14
-rw-r--r--tools/lib/h5diff_attr.c4
-rw-r--r--tools/lib/h5diff_dset.c137
-rw-r--r--tools/testfiles/h5diff_100.txt8
-rw-r--r--tools/testfiles/h5diff_101.txt4
-rw-r--r--tools/testfiles/h5diff_102.txt4
-rw-r--r--tools/testfiles/h5diff_11.txt3
-rw-r--r--tools/testfiles/h5diff_12.txt3
-rw-r--r--tools/testfiles/h5diff_13.txt4
-rw-r--r--tools/testfiles/h5diff_14.txt4
-rw-r--r--tools/testfiles/h5diff_15.txt4
-rw-r--r--tools/testfiles/h5diff_16.txt4
-rw-r--r--tools/testfiles/h5diff_17.txt12
-rw-r--r--tools/testfiles/h5diff_191.txt4
-rw-r--r--tools/testfiles/h5diff_192.txt4
-rw-r--r--tools/testfiles/h5diff_23.txt4
-rw-r--r--tools/testfiles/h5diff_24.txt4
-rw-r--r--tools/testfiles/h5diff_25.txt4
-rw-r--r--tools/testfiles/h5diff_26.txt4
-rw-r--r--tools/testfiles/h5diff_27.txt4
-rw-r--r--tools/testfiles/h5diff_28.txt4
-rw-r--r--tools/testfiles/h5diff_50.txt6
-rw-r--r--tools/testfiles/h5diff_51.txt4
-rw-r--r--tools/testfiles/h5diff_52.txt4
-rw-r--r--tools/testfiles/h5diff_53.txt4
-rw-r--r--tools/testfiles/h5diff_54.txt4
-rw-r--r--tools/testfiles/h5diff_55.txt4
-rw-r--r--tools/testfiles/h5diff_56.txt4
-rw-r--r--tools/testfiles/h5diff_57.txt5
-rw-r--r--tools/testfiles/h5diff_58.txt3
-rw-r--r--tools/testfiles/h5diff_607.txt3
-rw-r--r--tools/testfiles/h5diff_608.txt3
-rw-r--r--tools/testfiles/h5diff_610.txt3
-rw-r--r--tools/testfiles/h5diff_616.txt3
-rw-r--r--tools/testfiles/h5diff_617.txt3
-rw-r--r--tools/testfiles/h5diff_619.txt3
-rw-r--r--tools/testfiles/h5diff_625.txt3
-rw-r--r--tools/testfiles/h5diff_626.txt3
-rw-r--r--tools/testfiles/h5diff_627.txt3
-rw-r--r--tools/testfiles/h5diff_628.txt3
-rw-r--r--tools/testfiles/h5diff_70.txt281
-rw-r--r--tools/testfiles/h5diff_80.txt165
44 files changed, 394 insertions, 413 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 24ec1b9..2f850a6 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -39,7 +39,7 @@
/*-------------------------------------------------------------------------
* Function: print_objname
*
- * Purpose: print object name only when:
+ * Purpose: check if object name is to be printed, only when:
* 1) verbose mode
* 2) when diff was found (normal mode)
*-------------------------------------------------------------------------
@@ -50,6 +50,22 @@ print_objname (diff_opt_t * options, hsize_t nfound)
return ((options->m_verbose || nfound) && !options->m_quiet) ? 1 : 0;
}
+/*-------------------------------------------------------------------------
+ * Function: do_print_objname
+ *
+ * Purpose: print object name
+ *
+ *-------------------------------------------------------------------------
+ */
+void
+do_print_objname (const char *OBJ, const char *path1, const char *path2)
+{
+ parallel_print("%s:\n<%s> and <%s> ", OBJ, path1, path2);
+}
+
+
+
+
#ifdef H5_HAVE_PARALLEL
/*-------------------------------------------------------------------------
* Function: phdiff_dismiss_workers
@@ -893,10 +909,10 @@ hsize_t diff (hid_t file1_id,
hid_t type2_id=(-1);
hid_t grp1_id=(-1);
hid_t grp2_id=(-1);
- int ret;
- H5G_stat_t sb1;
- H5G_stat_t sb2;
- hsize_t nfound = 0;
+ int ret;
+ H5G_stat_t sb1;
+ H5G_stat_t sb2;
+ hsize_t nfound=0;
switch (type)
{
@@ -913,8 +929,8 @@ hsize_t diff (hid_t file1_id,
if (options->m_verbose)
{
if (print_objname (options, (hsize_t)1))
- parallel_print("Dataset: <%s> and <%s>\n", path1, path2);
- nfound = diff_dataset (file1_id, file2_id, path1, path2, options);
+ do_print_objname ("dataset", path1, path2);
+ nfound = diff_dataset (file1_id, file2_id, path1, path2, options, 1);
/* always print the number of differences found */
print_found(nfound);
}
@@ -928,14 +944,14 @@ hsize_t diff (hid_t file1_id,
{
/* shut up temporarily */
options->m_quiet = 1;
- nfound = diff_dataset (file1_id, file2_id, path1, path2, options);
+ nfound = diff_dataset (file1_id, file2_id, path1, path2, options, 0);
/* print again */
options->m_quiet = 0;
if (nfound)
{
if (print_objname (options, nfound))
- parallel_print("Dataset: <%s> and <%s>\n", path1, path2);
- nfound = diff_dataset (file1_id, file2_id, path1, path2, options);
+ do_print_objname ("dataset", path1, path2);
+ nfound = diff_dataset (file1_id, file2_id, path1, path2, options, 1);
/* print the number of differences found only when found
this is valid for the default mode and report mode */
print_found(nfound);
@@ -948,7 +964,7 @@ hsize_t diff (hid_t file1_id,
*/
else
{
- nfound = diff_dataset (file1_id, file2_id, path1, path2, options);
+ nfound = diff_dataset (file1_id, file2_id, path1, path2, options, 0);
}
} /*else verbose */
@@ -971,7 +987,7 @@ hsize_t diff (hid_t file1_id,
nfound = (ret > 0) ? 0 : 1;
if (print_objname (options, nfound))
- parallel_print("Datatype: <%s> and <%s>\n", path1, path2);
+ do_print_objname ("datatype", path1, path2);
/* always print the number of differences found in verbose mode */
if (options->m_verbose)
@@ -1008,7 +1024,7 @@ hsize_t diff (hid_t file1_id,
nfound = (ret != 0) ? 1 : 0;
if (print_objname (options, nfound))
- parallel_print("Group: <%s> and <%s>\n", path1, path2);
+ do_print_objname ("group", path1, path2);
/* always print the number of differences found in verbose mode */
if (options->m_verbose)
@@ -1058,7 +1074,7 @@ hsize_t diff (hid_t file1_id,
nfound = (ret != 0) ? 1 : 0;
if (print_objname (options, nfound))
- parallel_print("Soft Link: <%s> and <%s>\n", path1, path2);
+ do_print_objname ("soft link", path1, path2);
/* always print the number of differences found in verbose mode */
if (options->m_verbose)
@@ -1124,7 +1140,7 @@ hsize_t diff (hid_t file1_id,
nfound = (ret != 0) ? 1 : 0;
if (print_objname (options, nfound))
- parallel_print("External Link: <%s> and <%s>\n", path1, path2);
+ do_print_objname ("external link", path1, path2);
}
else
{
@@ -1141,7 +1157,7 @@ hsize_t diff (hid_t file1_id,
nfound = 0;
if (print_objname (options, nfound))
- parallel_print("User-defined Link: <%s> and <%s>\n", path1, path2);
+ do_print_objname ("user defined link", path1, path2);
}
/* always print the number of differences found in verbose mode */
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 4722c82..95fc400 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -76,13 +76,15 @@ hsize_t diff_dataset( hid_t file1_id,
hid_t file2_id,
const char *obj1_name,
const char *obj2_name,
- diff_opt_t *options );
+ diff_opt_t *options,
+ int print_dims);
hsize_t diff_datasetid( hid_t dset1_id,
hid_t dset2_id,
const char *obj1_name,
const char *obj2_name,
- diff_opt_t *options );
+ diff_opt_t *options,
+ int print_dims);
hsize_t diff( hid_t file1_id,
const char *path1,
@@ -160,6 +162,8 @@ const char* get_class(H5T_class_t tclass);
const char* get_sign(H5T_sign_t sign);
void print_dims( int r, hsize_t *d );
int print_objname(diff_opt_t *options, hsize_t nfound);
+void do_print_objname (const char *OBJ, const char *path1, const char *path2);
+
hsize_t diff_datum(void *_mem1,
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 1e0417c..bf26370 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -170,17 +170,6 @@ void print_pos( int *ph, /* print header */
{
*ph=0;
- /* print size of array */
- parallel_print("size [" );
- for ( i = 0; i < rank-1; i++)
- {
- parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[i]);
- parallel_print("x");
- }
- parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[rank-1]);
- parallel_print("]\n" );
-
-
if (pp)
{
parallel_print("%-15s %-15s %-15s %-15s %-15s\n",
@@ -800,7 +789,8 @@ hsize_t diff_datum(void *_mem1,
obj2_id,
NULL,
NULL,
- options);
+ options,
+ 0);
break;
default:
parallel_print("Warning: Comparison not possible of object types referenced: <%s> and <%s>",
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index e10a023..346d64f 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -200,7 +200,7 @@ int diff_attr(hid_t loc1_id,
/* always print name */
if (options->m_verbose)
{
- parallel_print( "Attribute: <%s> and <%s>\n",np1,np2);
+ do_print_objname ("attribute", np1, np2);
nfound = diff_array(buf1,
buf2,
nelmts1,
@@ -239,7 +239,7 @@ int diff_attr(hid_t loc1_id,
options->m_quiet=0;
if (nfound)
{
- parallel_print( "Attribute: <%s> and <%s>\n",np1,np2);
+ do_print_objname ("attribute", np1, np2);
nfound = diff_array(buf1,
buf2,
nelmts1,
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 8e23ff9..e913e79 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -18,60 +18,28 @@
#include "H5private.h"
#include "h5tools.h"
-
/*-------------------------------------------------------------------------
- * Function: print_sizes
+ * Function: print_size
*
- * Purpose: Print datatype sizes
+ * Purpose: print dimensions
*
*-------------------------------------------------------------------------
*/
-#if defined (H5DIFF_DEBUG)
-void print_sizes( const char *obj1,
- const char *obj2,
- hid_t f_tid1,
- hid_t f_tid2,
- hid_t m_tid1,
- hid_t m_tid2 )
+void
+print_size (int rank, hsize_t *dims)
{
- size_t f_size1, f_size2; /* size of type in file */
- size_t m_size1, m_size2; /* size of type in memory */
-
- f_size1 = H5Tget_size( f_tid1 );
- f_size2 = H5Tget_size( f_tid2 );
- m_size1 = H5Tget_size( m_tid1 );
- m_size2 = H5Tget_size( m_tid2 );
-
- printf("\n");
- printf("------------------\n");
- printf("sizeof(char) %u\n", sizeof(char) );
- printf("sizeof(short) %u\n", sizeof(short) );
- printf("sizeof(int) %u\n", sizeof(int) );
- printf("sizeof(long) %u\n", sizeof(long) );
- printf("<%s> ------------------\n", obj1);
- printf("type on file ");
- print_type(f_tid1);
- printf("\n");
- printf("size on file %u\n", f_size1 );
-
- printf("type on memory ");
- print_type(m_tid1);
- printf("\n");
- printf("size on memory %u\n", m_size1 );
+ int i;
- printf("<%s> ------------------\n", obj2);
- printf("type on file ");
- print_type(f_tid2);
- printf("\n");
- printf("size on file %u\n", f_size2 );
-
- printf("type on memory ");
- print_type(m_tid2);
- printf("\n");
- printf("size on memory %u\n", m_size2 );
- printf("\n");
+ parallel_print("[" );
+ for ( i = 0; i < rank-1; i++)
+ {
+ parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[i]);
+ parallel_print("x");
+ }
+ parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[rank-1]);
+ parallel_print("]\n" );
+
}
-#endif /* H5DIFF_DEBUG */
@@ -93,7 +61,8 @@ hsize_t diff_dataset( hid_t file1_id,
hid_t file2_id,
const char *obj1_name,
const char *obj2_name,
- diff_opt_t *options )
+ diff_opt_t *options,
+ int print_dims)
{
hid_t did1=-1;
hid_t did2=-1;
@@ -141,7 +110,8 @@ hsize_t diff_dataset( hid_t file1_id,
did2,
obj1_name,
obj2_name,
- options);
+ options,
+ print_dims);
}
/*-------------------------------------------------------------------------
* close
@@ -190,7 +160,8 @@ hsize_t diff_datasetid( hid_t did1,
hid_t did2,
const char *obj1_name,
const char *obj2_name,
- diff_opt_t *options )
+ diff_opt_t *options,
+ int print_dims)
{
hid_t sid1=-1;
hid_t sid2=-1;
@@ -260,6 +231,13 @@ hsize_t diff_datasetid( hid_t did1,
if ( (f_tid2 = H5Dget_type(did2)) < 0 )
goto error;
+
+ /*-------------------------------------------------------------------------
+ * print dimensions
+ *-------------------------------------------------------------------------
+ */
+ if (print_dims)
+ print_size (rank1, dims1);
/*-------------------------------------------------------------------------
* check for empty datasets
@@ -730,7 +708,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */
if ( (H5Tequal(f_tid1, f_tid2)==0) && options->m_verbose && obj1_name)
{
- printf("warning: different storage datatype\n");
+ printf("Warning: different storage datatype\n");
printf("<%s> has file datatype ", obj1_name);
print_type(f_tid1);
printf("\n");
@@ -807,7 +785,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */
if (maxdim1 && maxdim2 && maxdim_diff==1 && obj1_name )
{
if (options->m_verbose) {
- printf( "warning: different maximum dimensions\n");
+ printf( "Warning: different maximum dimensions\n");
printf("<%s> has max dimensions ", obj1_name);
print_dims(rank1,maxdim1);
printf("\n");
@@ -819,3 +797,60 @@ int diff_can_type( hid_t f_tid1, /* file data type */
return 1;
}
+
+
+
+
+/*-------------------------------------------------------------------------
+ * Function: print_sizes
+ *
+ * Purpose: Print datatype sizes
+ *
+ *-------------------------------------------------------------------------
+ */
+#if defined (H5DIFF_DEBUG)
+void print_sizes( const char *obj1,
+ const char *obj2,
+ hid_t f_tid1,
+ hid_t f_tid2,
+ hid_t m_tid1,
+ hid_t m_tid2 )
+{
+ size_t f_size1, f_size2; /* size of type in file */
+ size_t m_size1, m_size2; /* size of type in memory */
+
+ f_size1 = H5Tget_size( f_tid1 );
+ f_size2 = H5Tget_size( f_tid2 );
+ m_size1 = H5Tget_size( m_tid1 );
+ m_size2 = H5Tget_size( m_tid2 );
+
+ printf("\n");
+ printf("------------------\n");
+ printf("sizeof(char) %u\n", sizeof(char) );
+ printf("sizeof(short) %u\n", sizeof(short) );
+ printf("sizeof(int) %u\n", sizeof(int) );
+ printf("sizeof(long) %u\n", sizeof(long) );
+ printf("<%s> ------------------\n", obj1);
+ printf("type on file ");
+ print_type(f_tid1);
+ printf("\n");
+ printf("size on file %u\n", f_size1 );
+
+ printf("type on memory ");
+ print_type(m_tid1);
+ printf("\n");
+ printf("size on memory %u\n", m_size1 );
+
+ printf("<%s> ------------------\n", obj2);
+ printf("type on file ");
+ print_type(f_tid2);
+ printf("\n");
+ printf("size on file %u\n", f_size2 );
+
+ printf("type on memory ");
+ print_type(m_tid2);
+ printf("\n");
+ printf("size on memory %u\n", m_size2 );
+ printf("\n");
+}
+#endif /* H5DIFF_DEBUG */
diff --git a/tools/testfiles/h5diff_100.txt b/tools/testfiles/h5diff_100.txt
index 2e04520..431b3c0 100644
--- a/tools/testfiles/h5diff_100.txt
+++ b/tools/testfiles/h5diff_100.txt
@@ -6,8 +6,8 @@ file1 file2
---------------------------------------
x x /big
-Dataset: </big> and </big>
-size [1073741824]
+dataset:
+</big> and </big> [1073741824]
position big big difference
------------------------------------------------------------
[ 268435456 ] 31 0 31
@@ -1035,5 +1035,5 @@ position big big difference
[ 268436478 ] 31 0 31
[ 268436479 ] 31 0 31
1024 differences found
-Group: </> and </>
-0 differences found
+group:
+</> and </> 0 differences found
diff --git a/tools/testfiles/h5diff_101.txt b/tools/testfiles/h5diff_101.txt
index 074445c..a2e27c7 100644
--- a/tools/testfiles/h5diff_101.txt
+++ b/tools/testfiles/h5diff_101.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/d1 g1/d2 -v'
#############################
-Dataset: </g1/d1> and </g1/d2>
-size [3x2]
+dataset:
+</g1/d1> and </g1/d2> [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 c1c31f5..f2d1e34 100644
--- a/tools/testfiles/h5diff_102.txt
+++ b/tools/testfiles/h5diff_102.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/fp1 g1/fp2 -v'
#############################
-Dataset: </g1/fp1> and </g1/fp2>
-size [3x2]
+dataset:
+</g1/fp1> and </g1/fp2> [3x2]
position fp1 fp2 difference
------------------------------------------------------------
[ 0 1 ] 1e-05 2e-05 1e-05
diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt
index c5659f3..712039a 100644
--- a/tools/testfiles/h5diff_11.txt
+++ b/tools/testfiles/h5diff_11.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5'
#############################
-Dataset: </g1/dset1> and </g1/dset1>
+dataset:
+</g1/dset1> and </g1/dset1> [3x2]
5 differences found
diff --git a/tools/testfiles/h5diff_12.txt b/tools/testfiles/h5diff_12.txt
index 882f4b5..683e46e 100644
--- a/tools/testfiles/h5diff_12.txt
+++ b/tools/testfiles/h5diff_12.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2'
#############################
-Dataset: </g1/dset1> and </g1/dset2>
+dataset:
+</g1/dset1> and </g1/dset2> [3x2]
5 differences found
diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt
index 72f2bc1..3b41e8b 100644
--- a/tools/testfiles/h5diff_13.txt
+++ b/tools/testfiles/h5diff_13.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r'
#############################
-Dataset: </g1/dset1> and </g1/dset1>
-size [3x2]
+dataset:
+</g1/dset1> and </g1/dset1> [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 5c18e4e..2a41a78 100644
--- a/tools/testfiles/h5diff_14.txt
+++ b/tools/testfiles/h5diff_14.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r g1/dset1 g1/dset2'
#############################
-Dataset: </g1/dset1> and </g1/dset2>
-size [3x2]
+dataset:
+</g1/dset1> and </g1/dset2> [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 2515065..19ba649 100644
--- a/tools/testfiles/h5diff_15.txt
+++ b/tools/testfiles/h5diff_15.txt
@@ -1,8 +1,8 @@
#############################
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]
+dataset:
+</g1/dset3> and </g1/dset4> [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 78141f7..06271be 100644
--- a/tools/testfiles/h5diff_16.txt
+++ b/tools/testfiles/h5diff_16.txt
@@ -1,8 +1,8 @@
#############################
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]
+dataset:
+</g1/dset9> and </g1/dset10> [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 7c33114..131d113 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/testfiles/h5diff_17.txt
@@ -21,10 +21,10 @@ file1 file2
x /g1/fp2
x /g2
-Group: </g1> and </g1>
-0 differences found
-Dataset: </g1/dset1> and </g1/dset1>
-size [3x2]
+group:
+</g1> and </g1> 0 differences found
+dataset:
+</g1/dset1> and </g1/dset1> [3x2]
position dset1 dset1 difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -33,5 +33,5 @@ position dset1 dset1 difference
[ 1 1 ] 1 1.001 0.001
[ 2 1 ] 0 1 1
5 differences found
-Group: </> and </>
-0 differences found
+group:
+</> and </> 0 differences found
diff --git a/tools/testfiles/h5diff_191.txt b/tools/testfiles/h5diff_191.txt
index 801cca7..8ffacda 100644
--- a/tools/testfiles/h5diff_191.txt
+++ b/tools/testfiles/h5diff_191.txt
@@ -1,8 +1,8 @@
#############################
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]
+dataset:
+</g1/dset5> and </g1/dset6> [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 3173153..62b5ba4 100644
--- a/tools/testfiles/h5diff_192.txt
+++ b/tools/testfiles/h5diff_192.txt
@@ -1,8 +1,8 @@
#############################
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]
+dataset:
+</g1/dset7> and </g1/dset8> [3x2]
position dset7 dset8 difference relative
------------------------------------------------------------------------
[ 1 0 ] 100 103 3 0.030000
diff --git a/tools/testfiles/h5diff_23.txt b/tools/testfiles/h5diff_23.txt
index be9b688..c456710 100644
--- a/tools/testfiles/h5diff_23.txt
+++ b/tools/testfiles/h5diff_23.txt
@@ -1,5 +1,5 @@
#############################
Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v g1 g1'
#############################
-Group: </g1> and </g1>
-0 differences found
+group:
+</g1> and </g1> 0 differences found
diff --git a/tools/testfiles/h5diff_24.txt b/tools/testfiles/h5diff_24.txt
index 9cb2d4d..f50d889 100644
--- a/tools/testfiles/h5diff_24.txt
+++ b/tools/testfiles/h5diff_24.txt
@@ -1,5 +1,5 @@
#############################
Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v t1 t1'
#############################
-Datatype: </t1> and </t1>
-0 differences found
+datatype:
+</t1> and </t1> 0 differences found
diff --git a/tools/testfiles/h5diff_25.txt b/tools/testfiles/h5diff_25.txt
index 9320620..55e1c5c 100644
--- a/tools/testfiles/h5diff_25.txt
+++ b/tools/testfiles/h5diff_25.txt
@@ -1,5 +1,5 @@
#############################
Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v l1 l1'
#############################
-Soft Link: </l1> and </l1>
-0 differences found
+soft link:
+</l1> and </l1> 0 differences found
diff --git a/tools/testfiles/h5diff_26.txt b/tools/testfiles/h5diff_26.txt
index 43a5557..51500da 100644
--- a/tools/testfiles/h5diff_26.txt
+++ b/tools/testfiles/h5diff_26.txt
@@ -1,5 +1,5 @@
#############################
Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v g1 g2'
#############################
-Group: </g1> and </g2>
-1 differences found
+group:
+</g1> and </g2> 1 differences found
diff --git a/tools/testfiles/h5diff_27.txt b/tools/testfiles/h5diff_27.txt
index ff9e9f2..2120c52 100644
--- a/tools/testfiles/h5diff_27.txt
+++ b/tools/testfiles/h5diff_27.txt
@@ -1,5 +1,5 @@
#############################
Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v t1 t2'
#############################
-Datatype: </t1> and </t2>
-1 differences found
+datatype:
+</t1> and </t2> 1 differences found
diff --git a/tools/testfiles/h5diff_28.txt b/tools/testfiles/h5diff_28.txt
index da426d3..3ba1d6c 100644
--- a/tools/testfiles/h5diff_28.txt
+++ b/tools/testfiles/h5diff_28.txt
@@ -1,5 +1,5 @@
#############################
Expected output for 'h5diff h5diff_types.h5 h5diff_types.h5 -v l1 l2'
#############################
-Soft Link: </l1> and </l2>
-1 differences found
+soft link:
+</l1> and </l2> 1 differences found
diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt
index 1607804..d529d66 100644
--- a/tools/testfiles/h5diff_50.txt
+++ b/tools/testfiles/h5diff_50.txt
@@ -1,11 +1,11 @@
#############################
Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset0a dset0b'
#############################
-Dataset: </dset0a> and </dset0b>
-warning: different storage datatype
+dataset:
+</dset0a> and </dset0b> [3x2]
+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 46a82c7..3314a85 100644
--- a/tools/testfiles/h5diff_51.txt
+++ b/tools/testfiles/h5diff_51.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset1a dset1b'
#############################
-Dataset: </dset1a> and </dset1b>
-size [3x2]
+dataset:
+</dset1a> and </dset1b> [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 7e4580f..9f3dee9 100644
--- a/tools/testfiles/h5diff_52.txt
+++ b/tools/testfiles/h5diff_52.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset2a dset2b'
#############################
-Dataset: </dset2a> and </dset2b>
-size [3x2]
+dataset:
+</dset2a> and </dset2b> [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 1651457..fe7bc2c 100644
--- a/tools/testfiles/h5diff_53.txt
+++ b/tools/testfiles/h5diff_53.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset3a dset4b'
#############################
-Dataset: </dset3a> and </dset4b>
-size [3x2]
+dataset:
+</dset3a> and </dset4b> [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 e6fcbe8..d9f4110 100644
--- a/tools/testfiles/h5diff_54.txt
+++ b/tools/testfiles/h5diff_54.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset4a dset4b'
#############################
-Dataset: </dset4a> and </dset4b>
-size [3x2]
+dataset:
+</dset4a> and </dset4b> [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 6ad0808..8a3ceb0 100644
--- a/tools/testfiles/h5diff_55.txt
+++ b/tools/testfiles/h5diff_55.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset5a dset5b'
#############################
-Dataset: </dset5a> and </dset5b>
-size [3x2]
+dataset:
+</dset5a> and </dset5b> [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 733d6fb..ddad5c5 100644
--- a/tools/testfiles/h5diff_56.txt
+++ b/tools/testfiles/h5diff_56.txt
@@ -1,8 +1,8 @@
#############################
Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset6a dset6b'
#############################
-Dataset: </dset6a> and </dset6b>
-size [3x2]
+dataset:
+</dset6a> and </dset6b> [3x2]
position dset6a dset6b difference
------------------------------------------------------------
[ 1 0 ] 1 3 2
diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt
index 6b67914..b873a5b 100644
--- a/tools/testfiles/h5diff_57.txt
+++ b/tools/testfiles/h5diff_57.txt
@@ -1,8 +1,9 @@
#############################
Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset7a dset7b'
#############################
-Dataset: </dset7a> and </dset7b>
-warning: different storage datatype
+dataset:
+</dset7a> and </dset7b> [3x2]
+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
diff --git a/tools/testfiles/h5diff_58.txt b/tools/testfiles/h5diff_58.txt
index 0e42013..f9224ae 100644
--- a/tools/testfiles/h5diff_58.txt
+++ b/tools/testfiles/h5diff_58.txt
@@ -1,7 +1,8 @@
#############################
Expected output for 'h5diff h5diff_dset1.h5 h5diff_dset2.h5 -v refreg'
#############################
-Dataset: </refreg> and </refreg>
+dataset:
+</refreg> and </refreg> [2]
Referenced dataset 5904 5904
------------------------------------------------------------
Region blocks
diff --git a/tools/testfiles/h5diff_607.txt b/tools/testfiles/h5diff_607.txt
index 13c604c..853801e 100644
--- a/tools/testfiles/h5diff_607.txt
+++ b/tools/testfiles/h5diff_607.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 1 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
6 differences found
diff --git a/tools/testfiles/h5diff_608.txt b/tools/testfiles/h5diff_608.txt
index bbcbe28..8f0bb17 100644
--- a/tools/testfiles/h5diff_608.txt
+++ b/tools/testfiles/h5diff_608.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 1 -d 2 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
6 differences found
diff --git a/tools/testfiles/h5diff_610.txt b/tools/testfiles/h5diff_610.txt
index 13c604c..853801e 100644
--- a/tools/testfiles/h5diff_610.txt
+++ b/tools/testfiles/h5diff_610.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -d 1 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
6 differences found
diff --git a/tools/testfiles/h5diff_616.txt b/tools/testfiles/h5diff_616.txt
index ce9ac47..dacba1c 100644
--- a/tools/testfiles/h5diff_616.txt
+++ b/tools/testfiles/h5diff_616.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0.21 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
2 differences found
diff --git a/tools/testfiles/h5diff_617.txt b/tools/testfiles/h5diff_617.txt
index 016450a..7608383 100644
--- a/tools/testfiles/h5diff_617.txt
+++ b/tools/testfiles/h5diff_617.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
2 differences found
diff --git a/tools/testfiles/h5diff_619.txt b/tools/testfiles/h5diff_619.txt
index f4de362..201b828 100644
--- a/tools/testfiles/h5diff_619.txt
+++ b/tools/testfiles/h5diff_619.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -p 0.005 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
6 differences found
diff --git a/tools/testfiles/h5diff_625.txt b/tools/testfiles/h5diff_625.txt
index bf5bc08..7cb840b 100644
--- a/tools/testfiles/h5diff_625.txt
+++ b/tools/testfiles/h5diff_625.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 2 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
2 differences found
diff --git a/tools/testfiles/h5diff_626.txt b/tools/testfiles/h5diff_626.txt
index 19acaba..db2a825 100644
--- a/tools/testfiles/h5diff_626.txt
+++ b/tools/testfiles/h5diff_626.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 2 -n 3 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
3 differences found
diff --git a/tools/testfiles/h5diff_627.txt b/tools/testfiles/h5diff_627.txt
index 00a686b..74aea46 100644
--- a/tools/testfiles/h5diff_627.txt
+++ b/tools/testfiles/h5diff_627.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 200 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
6 differences found
diff --git a/tools/testfiles/h5diff_628.txt b/tools/testfiles/h5diff_628.txt
index 643fcf4..f3ea626 100644
--- a/tools/testfiles/h5diff_628.txt
+++ b/tools/testfiles/h5diff_628.txt
@@ -1,5 +1,6 @@
#############################
Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -n 1 g1/dset3 g1/dset4'
#############################
-Dataset: </g1/dset3> and </g1/dset4>
+dataset:
+</g1/dset3> and </g1/dset4> [3x2]
1 differences found
diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt
index 97b74a2..c673d79 100644
--- a/tools/testfiles/h5diff_70.txt
+++ b/tools/testfiles/h5diff_70.txt
@@ -7,61 +7,55 @@ file1 file2
x x /dset
x x /g1
-Dataset: </dset> and </dset>
+dataset:
+</dset> and </dset> [2]
</dset> and </dset> are empty datasets
0 differences found
-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
+group:
+</g1> and </g1> 0 differences found
+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
4 differences found
-Attribute: <bitfield of </g1>> and <bitfield of </g1>>
-size [2]
-position bitfield of </g1> bitfield of </g1> difference
+attribute:
+<bitfield of </g1>> and <bitfield of </g1>> 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
+attribute:
+<opaque of </g1>> and <opaque of </g1>> 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
+attribute:
+<compound of </g1>> and <compound of </g1>> position compound of </g1> compound of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2 0 2
[ 1 ] 3 0 3
[ 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
+attribute:
+<enum of </g1>> and <enum of </g1>> 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
+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
3 differences found
-Attribute: <array of </g1>> and <array of </g1>>
-size [2]
-position array of </g1> array of </g1> difference
+attribute:
+<array of </g1>> and <array of </g1>> position array of </g1> array of </g1> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2 0 2
@@ -70,23 +64,20 @@ position array of </g1> array of </g1> difference
[ 1 ] 5 0 5
[ 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
+attribute:
+<integer of </g1>> and <integer of </g1>> 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
+attribute:
+<float of </g1>> and <float of </g1>> 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
+attribute:
+<string2D of </g1>> and <string2D of </g1>> position string2D of </g1> string2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] a z
[ 0 0 ] b z
@@ -101,9 +92,8 @@ position string2D of </g1> string2D of </g1> difference
[ 2 1 ] k z
[ 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
+attribute:
+<bitfield2D of </g1>> and <bitfield2D of </g1>> position bitfield2D of </g1> bitfield2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 1 ] 2 0 2
@@ -112,9 +102,8 @@ position bitfield2D of </g1> bitfield2D of </g1> difference
[ 2 0 ] 5 0 5
[ 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
+attribute:
+<opaque2D of </g1>> and <opaque2D of </g1>> position opaque2D of </g1> opaque2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 1 ] 2 0 2
@@ -123,9 +112,8 @@ position opaque2D of </g1> opaque2D of </g1> difference
[ 2 0 ] 5 0 5
[ 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
+attribute:
+<compound2D of </g1>> and <compound2D of </g1>> position compound2D of </g1> compound2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 0 ] 2 0 2
@@ -140,9 +128,8 @@ position compound2D of </g1> compound2D of </g1> difference
[ 2 1 ] 11 0 11
[ 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
+attribute:
+<enum2D of </g1>> and <enum2D of </g1>> position enum2D of </g1> enum2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] RED GREEN
[ 0 1 ] RED GREEN
@@ -151,9 +138,8 @@ position enum2D of </g1> enum2D of </g1> difference
[ 2 0 ] RED GREEN
[ 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
+attribute:
+<vlen2D of </g1>> and <vlen2D of </g1>> position vlen2D of </g1> vlen2D of </g1> difference
------------------------------------------------------------
[ 0 1 ] 1 0 1
[ 1 0 ] 2 0 2
@@ -167,9 +153,8 @@ position vlen2D of </g1> vlen2D of </g1> difference
[ 2 1 ] 10 0 10
[ 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
+attribute:
+<array2D of </g1>> and <array2D of </g1>> position array2D of </g1> array2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 0 ] 2 0 2
@@ -190,9 +175,8 @@ position array2D of </g1> array2D of </g1> difference
[ 2 1 ] 17 0 17
[ 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
+attribute:
+<integer2D of </g1>> and <integer2D of </g1>> position integer2D of </g1> integer2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 1 ] 2 0 2
@@ -201,9 +185,8 @@ position integer2D of </g1> integer2D of </g1> difference
[ 2 0 ] 5 0 5
[ 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
+attribute:
+<float2D of </g1>> and <float2D of </g1>> position float2D of </g1> float2D of </g1> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 1 ] 2 0 2
@@ -212,9 +195,8 @@ position float2D of </g1> float2D of </g1> difference
[ 2 0 ] 5 0 5
[ 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
+attribute:
+<string3D of </g1>> and <string3D of </g1>> position string3D of </g1> string3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] a z
[ 0 0 0 ] b z
@@ -264,9 +246,8 @@ position string3D of </g1> string3D of </g1> difference
[ 3 2 1 ] X z
[ 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
+attribute:
+<bitfield3D of </g1>> and <bitfield3D of </g1>> position bitfield3D of </g1> bitfield3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 1 ] 2 0 2
@@ -293,9 +274,8 @@ position bitfield3D of </g1> bitfield3D of </g1> difference
[ 3 2 0 ] 23 0 23
[ 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
+attribute:
+<opaque3D of </g1>> and <opaque3D of </g1>> position opaque3D of </g1> opaque3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 1 ] 2 0 2
@@ -322,9 +302,8 @@ position opaque3D of </g1> opaque3D of </g1> difference
[ 3 2 0 ] 23 0 23
[ 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
+attribute:
+<compound3D of </g1>> and <compound3D of </g1>> position compound3D of </g1> compound3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 0 ] 2 0 2
@@ -375,9 +354,8 @@ position compound3D of </g1> compound3D of </g1> difference
[ 3 2 1 ] 47 0 47
[ 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
+attribute:
+<enum3D of </g1>> and <enum3D of </g1>> position enum3D of </g1> enum3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] GREEN RED
[ 0 0 1 ] GREEN RED
@@ -404,9 +382,8 @@ position enum3D of </g1> enum3D of </g1> difference
[ 3 2 0 ] GREEN RED
[ 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
+attribute:
+<vlen3D of </g1>> and <vlen3D of </g1>> position vlen3D of </g1> vlen3D of </g1> difference
------------------------------------------------------------
[ 0 0 1 ] 1 0 1
[ 0 1 0 ] 2 0 2
@@ -468,9 +445,8 @@ position vlen3D of </g1> vlen3D of </g1> difference
[ 3 2 1 ] 58 0 58
[ 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
+attribute:
+<array3D of </g1>> and <array3D of </g1>> position array3D of </g1> array3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 0 ] 2 0 2
@@ -545,9 +521,8 @@ position array3D of </g1> array3D of </g1> difference
[ 3 2 1 ] 71 0 71
[ 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
+attribute:
+<integer3D of </g1>> and <integer3D of </g1>> position integer3D of </g1> integer3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 1 ] 2 0 2
@@ -574,9 +549,8 @@ position integer3D of </g1> integer3D of </g1> difference
[ 3 2 0 ] 23 0 23
[ 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
+attribute:
+<float3D of </g1>> and <float3D of </g1>> position float3D of </g1> float3D of </g1> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 1 ] 2 0 2
@@ -603,58 +577,51 @@ position float3D of </g1> float3D of </g1> difference
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
24 differences found
-Group: </> and </>
-0 differences found
-Attribute: <string of </>> and <string of </>>
-size [2]
-position string of </> string of </> difference
+group:
+</> and </> 0 differences found
+attribute:
+<string of </>> and <string of </>> position string of </> string of </> difference
------------------------------------------------------------
[ 0 ] a z
[ 0 ] b z
[ 1 ] d z
[ 1 ] e z
4 differences found
-Attribute: <bitfield of </>> and <bitfield of </>>
-size [2]
-position bitfield of </> bitfield of </> difference
+attribute:
+<bitfield of </>> and <bitfield of </>> 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
+attribute:
+<opaque of </>> and <opaque of </>> 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
+attribute:
+<compound of </>> and <compound of </>> position compound of </> compound of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2 0 2
[ 1 ] 3 0 3
[ 1 ] 4 0 4
4 differences found
-Attribute: <enum of </>> and <enum of </>>
-size [2]
-position enum of </> enum of </> difference
+attribute:
+<enum of </>> and <enum of </>> 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
+attribute:
+<vlen of </>> and <vlen of </>> position vlen of </> vlen of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
[ 1 ] 3 0 3
3 differences found
-Attribute: <array of </>> and <array of </>>
-size [2]
-position array of </> array of </> difference
+attribute:
+<array of </>> and <array of </>> position array of </> array of </> difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 0 ] 2 0 2
@@ -663,23 +630,20 @@ position array of </> array of </> difference
[ 1 ] 5 0 5
[ 1 ] 6 0 6
6 differences found
-Attribute: <integer of </>> and <integer of </>>
-size [2]
-position integer of </> integer of </> difference
+attribute:
+<integer of </>> and <integer of </>> 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
+attribute:
+<float of </>> and <float of </>> 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
+attribute:
+<string2D of </>> and <string2D of </>> position string2D of </> string2D of </> difference
------------------------------------------------------------
[ 0 0 ] a z
[ 0 0 ] b z
@@ -694,9 +658,8 @@ position string2D of </> string2D of </> difference
[ 2 1 ] k z
[ 2 1 ] l z
12 differences found
-Attribute: <bitfield2D of </>> and <bitfield2D of </>>
-size [3x2]
-position bitfield2D of </> bitfield2D of </> difference
+attribute:
+<bitfield2D of </>> and <bitfield2D of </>> position bitfield2D of </> bitfield2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 1 ] 2 0 2
@@ -705,9 +668,8 @@ position bitfield2D of </> bitfield2D of </> difference
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
6 differences found
-Attribute: <opaque2D of </>> and <opaque2D of </>>
-size [3x2]
-position opaque2D of </> opaque2D of </> difference
+attribute:
+<opaque2D of </>> and <opaque2D of </>> position opaque2D of </> opaque2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 1 ] 2 0 2
@@ -716,9 +678,8 @@ position opaque2D of </> opaque2D of </> difference
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
6 differences found
-Attribute: <compound2D of </>> and <compound2D of </>>
-size [3x2]
-position compound2D of </> compound2D of </> difference
+attribute:
+<compound2D of </>> and <compound2D of </>> position compound2D of </> compound2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 0 ] 2 0 2
@@ -733,9 +694,8 @@ position compound2D of </> compound2D of </> difference
[ 2 1 ] 11 0 11
[ 2 1 ] 12 0 12
12 differences found
-Attribute: <enum2D of </>> and <enum2D of </>>
-size [3x2]
-position enum2D of </> enum2D of </> difference
+attribute:
+<enum2D of </>> and <enum2D of </>> position enum2D of </> enum2D of </> difference
------------------------------------------------------------
[ 0 0 ] RED GREEN
[ 0 1 ] RED GREEN
@@ -744,9 +704,8 @@ position enum2D of </> enum2D of </> difference
[ 2 0 ] RED GREEN
[ 2 1 ] RED GREEN
6 differences found
-Attribute: <vlen2D of </>> and <vlen2D of </>>
-size [3x2]
-position vlen2D of </> vlen2D of </> difference
+attribute:
+<vlen2D of </>> and <vlen2D of </>> position vlen2D of </> vlen2D of </> difference
------------------------------------------------------------
[ 0 1 ] 1 0 1
[ 1 0 ] 2 0 2
@@ -760,9 +719,8 @@ position vlen2D of </> vlen2D of </> difference
[ 2 1 ] 10 0 10
[ 2 1 ] 11 0 11
11 differences found
-Attribute: <array2D of </>> and <array2D of </>>
-size [3x2]
-position array2D of </> array2D of </> difference
+attribute:
+<array2D of </>> and <array2D of </>> position array2D of </> array2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 0 ] 2 0 2
@@ -783,9 +741,8 @@ position array2D of </> array2D of </> difference
[ 2 1 ] 17 0 17
[ 2 1 ] 18 0 18
18 differences found
-Attribute: <integer2D of </>> and <integer2D of </>>
-size [3x2]
-position integer2D of </> integer2D of </> difference
+attribute:
+<integer2D of </>> and <integer2D of </>> position integer2D of </> integer2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 1 ] 2 0 2
@@ -794,9 +751,8 @@ position integer2D of </> integer2D of </> difference
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
6 differences found
-Attribute: <float2D of </>> and <float2D of </>>
-size [3x2]
-position float2D of </> float2D of </> difference
+attribute:
+<float2D of </>> and <float2D of </>> position float2D of </> float2D of </> difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
[ 0 1 ] 2 0 2
@@ -805,9 +761,8 @@ position float2D of </> float2D of </> difference
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
6 differences found
-Attribute: <string3D of </>> and <string3D of </>>
-size [4x3x2]
-position string3D of </> string3D of </> difference
+attribute:
+<string3D of </>> and <string3D of </>> position string3D of </> string3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] a z
[ 0 0 0 ] b z
@@ -857,9 +812,8 @@ position string3D of </> string3D of </> difference
[ 3 2 1 ] X z
[ 3 2 1 ] Z z
47 differences found
-Attribute: <bitfield3D of </>> and <bitfield3D of </>>
-size [4x3x2]
-position bitfield3D of </> bitfield3D of </> difference
+attribute:
+<bitfield3D of </>> and <bitfield3D of </>> position bitfield3D of </> bitfield3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 1 ] 2 0 2
@@ -886,9 +840,8 @@ position bitfield3D of </> bitfield3D of </> difference
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
24 differences found
-Attribute: <opaque3D of </>> and <opaque3D of </>>
-size [4x3x2]
-position opaque3D of </> opaque3D of </> difference
+attribute:
+<opaque3D of </>> and <opaque3D of </>> position opaque3D of </> opaque3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 1 ] 2 0 2
@@ -915,9 +868,8 @@ position opaque3D of </> opaque3D of </> difference
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
24 differences found
-Attribute: <compound3D of </>> and <compound3D of </>>
-size [4x3x2]
-position compound3D of </> compound3D of </> difference
+attribute:
+<compound3D of </>> and <compound3D of </>> position compound3D of </> compound3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 0 ] 2 0 2
@@ -968,9 +920,8 @@ position compound3D of </> compound3D of </> difference
[ 3 2 1 ] 47 0 47
[ 3 2 1 ] 48 0 48
48 differences found
-Attribute: <enum3D of </>> and <enum3D of </>>
-size [4x3x2]
-position enum3D of </> enum3D of </> difference
+attribute:
+<enum3D of </>> and <enum3D of </>> position enum3D of </> enum3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] GREEN RED
[ 0 0 1 ] GREEN RED
@@ -997,9 +948,8 @@ position enum3D of </> enum3D of </> difference
[ 3 2 0 ] GREEN RED
[ 3 2 1 ] GREEN RED
24 differences found
-Attribute: <vlen3D of </>> and <vlen3D of </>>
-size [4x3x2]
-position vlen3D of </> vlen3D of </> difference
+attribute:
+<vlen3D of </>> and <vlen3D of </>> position vlen3D of </> vlen3D of </> difference
------------------------------------------------------------
[ 0 0 1 ] 1 0 1
[ 0 1 0 ] 2 0 2
@@ -1061,9 +1011,8 @@ position vlen3D of </> vlen3D of </> difference
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
59 differences found
-Attribute: <array3D of </>> and <array3D of </>>
-size [4x3x2]
-position array3D of </> array3D of </> difference
+attribute:
+<array3D of </>> and <array3D of </>> position array3D of </> array3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 0 ] 2 0 2
@@ -1138,9 +1087,8 @@ position array3D of </> array3D of </> difference
[ 3 2 1 ] 71 0 71
[ 3 2 1 ] 72 0 72
72 differences found
-Attribute: <integer3D of </>> and <integer3D of </>>
-size [4x3x2]
-position integer3D of </> integer3D of </> difference
+attribute:
+<integer3D of </>> and <integer3D of </>> position integer3D of </> integer3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 1 ] 2 0 2
@@ -1167,9 +1115,8 @@ position integer3D of </> integer3D of </> difference
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
24 differences found
-Attribute: <float3D of </>> and <float3D of </>>
-size [4x3x2]
-position float3D of </> float3D of </> difference
+attribute:
+<float3D of </>> and <float3D of </>> position float3D of </> float3D of </> difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
[ 0 0 1 ] 2 0 2
diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt
index c51a357..f30cdea 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/testfiles/h5diff_80.txt
@@ -39,19 +39,20 @@ file1 file2
x x /g1/vlen3D
x x /refreg
-Dataset: </dset> and </dset>
-size [2]
+dataset:
+</dset> and </dset> [2]
position dset dset difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
2 differences found
-Dataset: </dsetref> and </dsetref>
+dataset:
+</dsetref> and </dsetref> [10x10]
0 differences found
-Group: </g1> and </g1>
-0 differences found
-Dataset: </g1/array> and </g1/array>
-size [2]
+group:
+</g1> and </g1> 0 differences found
+dataset:
+</g1/array> and </g1/array> [2]
position array array difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -61,8 +62,8 @@ position array array difference
[ 1 ] 5 0 5
[ 1 ] 6 0 6
6 differences found
-Dataset: </g1/array2D> and </g1/array2D>
-size [3x2]
+dataset:
+</g1/array2D> and </g1/array2D> [3x2]
position array2D array2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -84,8 +85,8 @@ position array2D array2D difference
[ 2 1 ] 17 0 17
[ 2 1 ] 18 0 18
18 differences found
-Dataset: </g1/array3D> and </g1/array3D>
-size [4x3x2]
+dataset:
+</g1/array3D> and </g1/array3D> [4x3x2]
position array3D array3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -161,15 +162,15 @@ position array3D array3D difference
[ 3 2 1 ] 71 0 71
[ 3 2 1 ] 72 0 72
72 differences found
-Dataset: </g1/bitfield> and </g1/bitfield>
-size [2]
+dataset:
+</g1/bitfield> and </g1/bitfield> [2]
position bitfield bitfield difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
2 differences found
-Dataset: </g1/bitfield2D> and </g1/bitfield2D>
-size [3x2]
+dataset:
+</g1/bitfield2D> and </g1/bitfield2D> [3x2]
position bitfield2D bitfield2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -179,8 +180,8 @@ position bitfield2D bitfield2D difference
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
6 differences found
-Dataset: </g1/bitfield3D> and </g1/bitfield3D>
-size [4x3x2]
+dataset:
+</g1/bitfield3D> and </g1/bitfield3D> [4x3x2]
position bitfield3D bitfield3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -208,8 +209,8 @@ position bitfield3D bitfield3D difference
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
24 differences found
-Dataset: </g1/compound> and </g1/compound>
-size [2]
+dataset:
+</g1/compound> and </g1/compound> [2]
position compound compound difference
------------------------------------------------------------
[ 0 ] 1 0 1
@@ -217,8 +218,8 @@ position compound compound difference
[ 1 ] 3 0 3
[ 1 ] 4 0 4
4 differences found
-Dataset: </g1/compound2D> and </g1/compound2D>
-size [3x2]
+dataset:
+</g1/compound2D> and </g1/compound2D> [3x2]
position compound2D compound2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -234,8 +235,8 @@ position compound2D compound2D difference
[ 2 1 ] 11 0 11
[ 2 1 ] 12 0 12
12 differences found
-Dataset: </g1/compound3D> and </g1/compound3D>
-size [4x3x2]
+dataset:
+</g1/compound3D> and </g1/compound3D> [4x3x2]
position compound3D compound3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -287,27 +288,29 @@ position compound3D compound3D difference
[ 3 2 1 ] 47 0 47
[ 3 2 1 ] 48 0 48
48 differences found
-Dataset: </g1/enum> and </g1/enum>
-size [2]
+dataset:
+</g1/enum> and </g1/enum> [2]
position enum enum difference
------------------------------------------------------------
[ 0 ] RED GREEN
1 differences found
-Dataset: </g1/enum2D> and </g1/enum2D>
+dataset:
+</g1/enum2D> and </g1/enum2D> [3x2]
</g1/enum2D> and </g1/enum2D> are empty datasets
0 differences found
-Dataset: </g1/enum3D> and </g1/enum3D>
+dataset:
+</g1/enum3D> and </g1/enum3D> [4x3x2]
</g1/enum3D> and </g1/enum3D> are empty datasets
0 differences found
-Dataset: </g1/float> and </g1/float>
-size [2]
+dataset:
+</g1/float> and </g1/float> [2]
position float float difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
2 differences found
-Dataset: </g1/float2D> and </g1/float2D>
-size [3x2]
+dataset:
+</g1/float2D> and </g1/float2D> [3x2]
position float2D float2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -317,8 +320,8 @@ position float2D float2D difference
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
6 differences found
-Dataset: </g1/float3D> and </g1/float3D>
-size [4x3x2]
+dataset:
+</g1/float3D> and </g1/float3D> [4x3x2]
position float3D float3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -346,15 +349,15 @@ position float3D float3D difference
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
24 differences found
-Dataset: </g1/integer> and </g1/integer>
-size [2]
+dataset:
+</g1/integer> and </g1/integer> [2]
position integer integer difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
2 differences found
-Dataset: </g1/integer2D> and </g1/integer2D>
-size [3x2]
+dataset:
+</g1/integer2D> and </g1/integer2D> [3x2]
position integer2D integer2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -364,8 +367,8 @@ position integer2D integer2D difference
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
6 differences found
-Dataset: </g1/integer3D> and </g1/integer3D>
-size [4x3x2]
+dataset:
+</g1/integer3D> and </g1/integer3D> [4x3x2]
position integer3D integer3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -393,15 +396,15 @@ position integer3D integer3D difference
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
24 differences found
-Dataset: </g1/opaque> and </g1/opaque>
-size [2]
+dataset:
+</g1/opaque> and </g1/opaque> [2]
position opaque opaque difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
2 differences found
-Dataset: </g1/opaque2D> and </g1/opaque2D>
-size [3x2]
+dataset:
+</g1/opaque2D> and </g1/opaque2D> [3x2]
position opaque2D opaque2D difference
------------------------------------------------------------
[ 0 0 ] 1 0 1
@@ -411,8 +414,8 @@ position opaque2D opaque2D difference
[ 2 0 ] 5 0 5
[ 2 1 ] 6 0 6
6 differences found
-Dataset: </g1/opaque3D> and </g1/opaque3D>
-size [4x3x2]
+dataset:
+</g1/opaque3D> and </g1/opaque3D> [4x3x2]
position opaque3D opaque3D difference
------------------------------------------------------------
[ 0 0 0 ] 1 0 1
@@ -440,174 +443,145 @@ position opaque3D opaque3D difference
[ 3 2 0 ] 23 0 23
[ 3 2 1 ] 24 0 24
24 differences found
-Dataset: </g1/reference> and </g1/reference>
-size [2]
+dataset:
+</g1/reference> and </g1/reference> [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]
+dataset:
+</g1/reference2D> and </g1/reference2D> [3x2]
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]
+dataset:
+</g1/reference3D> and </g1/reference3D> [4x3x2]
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]
+dataset:
+</g1/string> and </g1/string> [2]
position string string difference
------------------------------------------------------------
[ 0 ] a z
@@ -615,8 +589,8 @@ position string string difference
[ 1 ] d z
[ 1 ] e z
4 differences found
-Dataset: </g1/string2D> and </g1/string2D>
-size [3x2]
+dataset:
+</g1/string2D> and </g1/string2D> [3x2]
position string2D string2D difference
------------------------------------------------------------
[ 0 0 ] a z
@@ -632,8 +606,8 @@ position string2D string2D difference
[ 2 1 ] k z
[ 2 1 ] l z
12 differences found
-Dataset: </g1/string3D> and </g1/string3D>
-size [4x3x2]
+dataset:
+</g1/string3D> and </g1/string3D> [4x3x2]
position string3D string3D difference
------------------------------------------------------------
[ 0 0 0 ] a z
@@ -684,16 +658,16 @@ position string3D string3D difference
[ 3 2 1 ] X z
[ 3 2 1 ] Z z
47 differences found
-Dataset: </g1/vlen> and </g1/vlen>
-size [2]
+dataset:
+</g1/vlen> and </g1/vlen> [2]
position vlen vlen difference
------------------------------------------------------------
[ 0 ] 1 0 1
[ 1 ] 2 0 2
[ 1 ] 3 0 3
3 differences found
-Dataset: </g1/vlen2D> and </g1/vlen2D>
-size [3x2]
+dataset:
+</g1/vlen2D> and </g1/vlen2D> [3x2]
position vlen2D vlen2D difference
------------------------------------------------------------
[ 0 1 ] 1 0 1
@@ -708,8 +682,8 @@ position vlen2D vlen2D difference
[ 2 1 ] 10 0 10
[ 2 1 ] 11 0 11
11 differences found
-Dataset: </g1/vlen3D> and </g1/vlen3D>
-size [4x3x2]
+dataset:
+</g1/vlen3D> and </g1/vlen3D> [4x3x2]
position vlen3D vlen3D difference
------------------------------------------------------------
[ 0 0 1 ] 1 0 1
@@ -772,7 +746,8 @@ position vlen3D vlen3D difference
[ 3 2 1 ] 58 0 58
[ 3 2 1 ] 59 0 59
59 differences found
-Dataset: </refreg> and </refreg>
+dataset:
+</refreg> and </refreg> [2]
Referenced dataset 5904 5904
------------------------------------------------------------
Region blocks
@@ -782,8 +757,8 @@ point #1 (2,2) (3,3)
point #3 (1,6) (2,5)
point #4 (2,8) (1,7)
4 differences found
-Group: </> and </>
-0 differences found
+group:
+</> and </> 0 differences found
--------------------------------
Some objects are not comparable
--------------------------------