From 6223a679ce610d98a7735c426c76162a3ecd34b1 Mon Sep 17 00:00:00 2001 From: Raymond Lu Date: Wed, 26 May 2004 14:43:56 -0500 Subject: [svn-r8582] *** empty log message *** --- tools/h5repack/h5repack.h | 2 + tools/h5repack/testh5repack_attr.c | 29 +- tools/h5repack/testh5repack_dset.c | 26 +- tools/h5repack/testh5repack_make.c | 3 +- tools/testfiles/h5diff_81.txt | 749 +++++++++++++++++++++++++++++++++++++ tools/testfiles/test1.h5 | Bin 34912 -> 34520 bytes tools/testfiles/test3.h5 | Bin 6984 -> 6984 bytes tools/testfiles/test4.h5 | Bin 59744 -> 57696 bytes 8 files changed, 805 insertions(+), 4 deletions(-) create mode 100644 tools/testfiles/h5diff_81.txt diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h index b91d516..ef6dca6 100644 --- a/tools/h5repack/h5repack.h +++ b/tools/h5repack/h5repack.h @@ -293,10 +293,12 @@ void write_attr_in(hid_t loc_id, const char* dset_name, /* for saving reference to dataset*/ hid_t fid, /* for reference create */ int make_diffs /* flag to modify data buffers */); +void write_null_attr(hid_t loc_id); void write_dset_in(hid_t loc_id, const char* dset_name, /* for saving reference to dataset*/ hid_t file_id, int make_diffs /* flag to modify data buffers */); +void write_null_dset(hid_t loc_id); int make_filters(hid_t loc_id); int make_layout(hid_t loc_id); diff --git a/tools/h5repack/testh5repack_attr.c b/tools/h5repack/testh5repack_attr.c index a1dad92..135d15b 100644 --- a/tools/h5repack/testh5repack_attr.c +++ b/tools/h5repack/testh5repack_attr.c @@ -1028,5 +1028,30 @@ etc make_attr(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83); } - - +/*------------------------------------------------------------------------- + * Function: write_null_attr + * + * Purpose: write null attribute in LOC_ID (dataset, group, named datatype) + * + * Programmer: Raymond Lu, slu@ncsa.uiuc.edu + * + * Date: May 24, 2004 + * + *------------------------------------------------------------------------- + */ +void write_null_attr(hid_t loc_id) +{ + hid_t sid, attr_id; + int val = 2; + + /* Create the null attribute */ + sid = H5Screate(H5S_NULL); + attr_id = H5Acreate(loc_id, "null_attr", H5T_NATIVE_INT, sid, H5P_DEFAULT); + + /* Not supposed to write anything */ + H5Awrite(attr_id, H5T_NATIVE_INT, &val); + + /* Close */ + H5Aclose(attr_id); + H5Sclose(sid); +} diff --git a/tools/h5repack/testh5repack_dset.c b/tools/h5repack/testh5repack_dset.c index 57a5b27..7f6345b 100644 --- a/tools/h5repack/testh5repack_dset.c +++ b/tools/h5repack/testh5repack_dset.c @@ -617,7 +617,31 @@ void write_dset_in(hid_t loc_id, write_dset(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83); } - +/*------------------------------------------------------------------------- + * Function: write_null_dset + * + * Purpose: write null dataset in LOC_ID + * + * Programmer: Raymond Lu, slu@ncsa.uiuc.edu + * + * Date: May 24, 2004 + * + *------------------------------------------------------------------------- + */ +void write_null_dset(hid_t loc_id) +{ + hid_t sid, dset_id; + int val = 2; + + /* Create the null dataset */ + sid = H5Screate(H5S_NULL); + dset_id = H5Dcreate(loc_id,"null_dset",H5T_NATIVE_INT,sid,H5P_DEFAULT); + H5Dwrite(dset_id,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,&val); + + /* Close */ + H5Dclose(dset_id); + H5Sclose(sid); +} /*------------------------------------------------------------------------- * Function: make_dset_reg_ref diff --git a/tools/h5repack/testh5repack_make.c b/tools/h5repack/testh5repack_make.c index c69abd9..2ab1e00 100644 --- a/tools/h5repack/testh5repack_make.c +++ b/tools/h5repack/testh5repack_make.c @@ -164,7 +164,7 @@ int make_all_objects(hid_t loc_id) write_dset_in(root_id,"dset_referenced",loc_id,0); write_dset_in(group_id,"dset_referenced",loc_id,0); - + write_null_dset(root_id); /* Close */ H5Dclose(dset_id); @@ -216,6 +216,7 @@ int make_attributes(hid_t loc_id) write_attr_in(dset_id,"dset",loc_id,0); write_attr_in(group_id,"dset",loc_id,0); write_attr_in(root_id,"dset",loc_id,0); + write_null_attr(root_id); /* Close */ H5Dclose(dset_id); diff --git a/tools/testfiles/h5diff_81.txt b/tools/testfiles/h5diff_81.txt new file mode 100644 index 0000000..004babd --- /dev/null +++ b/tools/testfiles/h5diff_81.txt @@ -0,0 +1,749 @@ +############################# +Expected output for 'h5diff file7.h5 file8.h5 -v' +############################# +$h5diff file7.h5 file8.h5 -v + +file1 file2 +--------------------------------------- + x x /dset + x x /g1 + x x /g1/array + x x /g1/array2D + x x /g1/array3D + x x /g1/bitfield + x x /g1/bitfield2D + x x /g1/bitfield3D + x x /g1/compound + x x /g1/compound2D + x x /g1/compound3D + x x /g1/enum + x x /g1/enum2D + x x /g1/enum3D + x x /g1/float + x x /g1/float2D + x x /g1/float3D + x x /g1/integer + x x /g1/integer2D + x x /g1/integer3D + x x /g1/opaque + x x /g1/opaque2D + x x /g1/opaque3D + x x /g1/reference + x x /g1/reference2D + x x /g1/reference3D + x x /g1/string + x x /g1/string2D + x x /g1/string3D + x x /g1/vlen + x x /g1/vlen2D + x x /g1/vlen3D + x x /null_dset + +Dataset: and +position dset dset difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +Group: and +Dataset: and +position array array difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 0 ] 2 0 2 +[ 0 ] 3 0 3 +[ 1 ] 4 0 4 +[ 1 ] 5 0 5 +[ 1 ] 6 0 6 +6 differences found +Dataset: and +position array2D array2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2 0 2 +[ 0 0 ] 3 0 3 +[ 0 1 ] 4 0 4 +[ 0 1 ] 5 0 5 +[ 0 1 ] 6 0 6 +[ 1 0 ] 7 0 7 +[ 1 0 ] 8 0 8 +[ 1 0 ] 9 0 9 +[ 1 1 ] 10 0 10 +[ 1 1 ] 11 0 11 +[ 1 1 ] 12 0 12 +[ 2 0 ] 13 0 13 +[ 2 0 ] 14 0 14 +[ 2 0 ] 15 0 15 +[ 2 1 ] 16 0 16 +[ 2 1 ] 17 0 17 +[ 2 1 ] 18 0 18 +18 differences found +Dataset: and +position array3D array3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 0 ] 2 0 2 +[ 0 0 0 ] 3 0 3 +[ 0 0 1 ] 4 0 4 +[ 0 0 1 ] 5 0 5 +[ 0 0 1 ] 6 0 6 +[ 0 1 0 ] 7 0 7 +[ 0 1 0 ] 8 0 8 +[ 0 1 0 ] 9 0 9 +[ 0 1 1 ] 10 0 10 +[ 0 1 1 ] 11 0 11 +[ 0 1 1 ] 12 0 12 +[ 0 2 0 ] 13 0 13 +[ 0 2 0 ] 14 0 14 +[ 0 2 0 ] 15 0 15 +[ 0 2 1 ] 16 0 16 +[ 0 2 1 ] 17 0 17 +[ 0 2 1 ] 18 0 18 +[ 1 0 0 ] 19 0 19 +[ 1 0 0 ] 20 0 20 +[ 1 0 0 ] 21 0 21 +[ 1 0 1 ] 22 0 22 +[ 1 0 1 ] 23 0 23 +[ 1 0 1 ] 24 0 24 +[ 1 1 0 ] 25 0 25 +[ 1 1 0 ] 26 0 26 +[ 1 1 0 ] 27 0 27 +[ 1 1 1 ] 28 0 28 +[ 1 1 1 ] 29 0 29 +[ 1 1 1 ] 30 0 30 +[ 1 2 0 ] 31 0 31 +[ 1 2 0 ] 32 0 32 +[ 1 2 0 ] 33 0 33 +[ 1 2 1 ] 34 0 34 +[ 1 2 1 ] 35 0 35 +[ 1 2 1 ] 36 0 36 +[ 2 0 0 ] 37 0 37 +[ 2 0 0 ] 38 0 38 +[ 2 0 0 ] 39 0 39 +[ 2 0 1 ] 40 0 40 +[ 2 0 1 ] 41 0 41 +[ 2 0 1 ] 42 0 42 +[ 2 1 0 ] 43 0 43 +[ 2 1 0 ] 44 0 44 +[ 2 1 0 ] 45 0 45 +[ 2 1 1 ] 46 0 46 +[ 2 1 1 ] 47 0 47 +[ 2 1 1 ] 48 0 48 +[ 2 2 0 ] 49 0 49 +[ 2 2 0 ] 50 0 50 +[ 2 2 0 ] 51 0 51 +[ 2 2 1 ] 52 0 52 +[ 2 2 1 ] 53 0 53 +[ 2 2 1 ] 54 0 54 +[ 3 0 0 ] 55 0 55 +[ 3 0 0 ] 56 0 56 +[ 3 0 0 ] 57 0 57 +[ 3 0 1 ] 58 0 58 +[ 3 0 1 ] 59 0 59 +[ 3 0 1 ] 60 0 60 +[ 3 1 0 ] 61 0 61 +[ 3 1 0 ] 62 0 62 +[ 3 1 0 ] 63 0 63 +[ 3 1 1 ] 64 0 64 +[ 3 1 1 ] 65 0 65 +[ 3 1 1 ] 66 0 66 +[ 3 2 0 ] 67 0 67 +[ 3 2 0 ] 68 0 68 +[ 3 2 0 ] 69 0 69 +[ 3 2 1 ] 70 0 70 +[ 3 2 1 ] 71 0 71 +[ 3 2 1 ] 72 0 72 +72 differences found +Dataset: and +position bitfield bitfield difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +Dataset: and +position bitfield2D bitfield2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +Dataset: and +position bitfield3D bitfield3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +Dataset: and +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 +4 differences found +Dataset: and +position compound2D compound2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 0 ] 2.000000 0.000000 2.000000 +[ 0 1 ] 3 0 3 +[ 0 1 ] 4.000000 0.000000 4.000000 +[ 1 0 ] 5 0 5 +[ 1 0 ] 6.000000 0.000000 6.000000 +[ 1 1 ] 7 0 7 +[ 1 1 ] 8.000000 0.000000 8.000000 +[ 2 0 ] 9 0 9 +[ 2 0 ] 10.000000 0.000000 10.000000 +[ 2 1 ] 11 0 11 +[ 2 1 ] 12.000000 0.000000 12.000000 +12 differences found +Dataset: and +position compound3D compound3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 0 ] 2.000000 0.000000 2.000000 +[ 0 0 1 ] 3 0 3 +[ 0 0 1 ] 4.000000 0.000000 4.000000 +[ 0 1 0 ] 5 0 5 +[ 0 1 0 ] 6.000000 0.000000 6.000000 +[ 0 1 1 ] 7 0 7 +[ 0 1 1 ] 8.000000 0.000000 8.000000 +[ 0 2 0 ] 9 0 9 +[ 0 2 0 ] 10.000000 0.000000 10.000000 +[ 0 2 1 ] 11 0 11 +[ 0 2 1 ] 12.000000 0.000000 12.000000 +[ 1 0 0 ] 13 0 13 +[ 1 0 0 ] 14.000000 0.000000 14.000000 +[ 1 0 1 ] 15 0 15 +[ 1 0 1 ] 16.000000 0.000000 16.000000 +[ 1 1 0 ] 17 0 17 +[ 1 1 0 ] 18.000000 0.000000 18.000000 +[ 1 1 1 ] 19 0 19 +[ 1 1 1 ] 20.000000 0.000000 20.000000 +[ 1 2 0 ] 21 0 21 +[ 1 2 0 ] 22.000000 0.000000 22.000000 +[ 1 2 1 ] 23 0 23 +[ 1 2 1 ] 24.000000 0.000000 24.000000 +[ 2 0 0 ] 25 0 25 +[ 2 0 0 ] 26.000000 0.000000 26.000000 +[ 2 0 1 ] 27 0 27 +[ 2 0 1 ] 28.000000 0.000000 28.000000 +[ 2 1 0 ] 29 0 29 +[ 2 1 0 ] 30.000000 0.000000 30.000000 +[ 2 1 1 ] 31 0 31 +[ 2 1 1 ] 32.000000 0.000000 32.000000 +[ 2 2 0 ] 33 0 33 +[ 2 2 0 ] 34.000000 0.000000 34.000000 +[ 2 2 1 ] 35 0 35 +[ 2 2 1 ] 36.000000 0.000000 36.000000 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38.000000 0.000000 38.000000 +[ 3 0 1 ] 39 0 39 +[ 3 0 1 ] 40.000000 0.000000 40.000000 +[ 3 1 0 ] 41 0 41 +[ 3 1 0 ] 42.000000 0.000000 42.000000 +[ 3 1 1 ] 43 0 43 +[ 3 1 1 ] 44.000000 0.000000 44.000000 +[ 3 2 0 ] 45 0 45 +[ 3 2 0 ] 46.000000 0.000000 46.000000 +[ 3 2 1 ] 47 0 47 +[ 3 2 1 ] 48.000000 0.000000 48.000000 +48 differences found +Dataset: and +position enum enum difference +------------------------------------------------------------ +[ 0 ] RED GREEN +1 differences found +Dataset: and + and are empty datasets +Dataset: and + and are empty datasets +Dataset: and +position float float difference +------------------------------------------------------------ +[ 0 ] 1.000000 0.000000 1.000000 +[ 1 ] 2.000000 0.000000 2.000000 +2 differences found +Dataset: and +position float2D float2D difference +------------------------------------------------------------ +[ 0 0 ] 1.000000 0.000000 1.000000 +[ 0 1 ] 2.000000 0.000000 2.000000 +[ 1 0 ] 3.000000 0.000000 3.000000 +[ 1 1 ] 4.000000 0.000000 4.000000 +[ 2 0 ] 5.000000 0.000000 5.000000 +[ 2 1 ] 6.000000 0.000000 6.000000 +6 differences found +Dataset: and +position float3D float3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1.000000 0.000000 1.000000 +[ 0 0 1 ] 2.000000 0.000000 2.000000 +[ 0 1 0 ] 3.000000 0.000000 3.000000 +[ 0 1 1 ] 4.000000 0.000000 4.000000 +[ 0 2 0 ] 5.000000 0.000000 5.000000 +[ 0 2 1 ] 6.000000 0.000000 6.000000 +[ 1 0 0 ] 7.000000 0.000000 7.000000 +[ 1 0 1 ] 8.000000 0.000000 8.000000 +[ 1 1 0 ] 9.000000 0.000000 9.000000 +[ 1 1 1 ] 10.000000 0.000000 10.000000 +[ 1 2 0 ] 11.000000 0.000000 11.000000 +[ 1 2 1 ] 12.000000 0.000000 12.000000 +[ 2 0 0 ] 13.000000 0.000000 13.000000 +[ 2 0 1 ] 14.000000 0.000000 14.000000 +[ 2 1 0 ] 15.000000 0.000000 15.000000 +[ 2 1 1 ] 16.000000 0.000000 16.000000 +[ 2 2 0 ] 17.000000 0.000000 17.000000 +[ 2 2 1 ] 18.000000 0.000000 18.000000 +[ 3 0 0 ] 19.000000 0.000000 19.000000 +[ 3 0 1 ] 20.000000 0.000000 20.000000 +[ 3 1 0 ] 21.000000 0.000000 21.000000 +[ 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 +24 differences found +Dataset: and +position integer integer difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +Dataset: and +position integer2D integer2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +Dataset: and +position integer3D integer3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +Dataset: and +position opaque opaque difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +Dataset: and +position opaque2D opaque2D difference +------------------------------------------------------------ +[ 0 0 ] 1 0 1 +[ 0 1 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 2 0 ] 5 0 5 +[ 2 1 ] 6 0 6 +6 differences found +Dataset: and +position opaque3D opaque3D difference +------------------------------------------------------------ +[ 0 0 0 ] 1 0 1 +[ 0 0 1 ] 2 0 2 +[ 0 1 0 ] 3 0 3 +[ 0 1 1 ] 4 0 4 +[ 0 2 0 ] 5 0 5 +[ 0 2 1 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 1 0 ] 9 0 9 +[ 1 1 1 ] 10 0 10 +[ 1 2 0 ] 11 0 11 +[ 1 2 1 ] 12 0 12 +[ 2 0 0 ] 13 0 13 +[ 2 0 1 ] 14 0 14 +[ 2 1 0 ] 15 0 15 +[ 2 1 1 ] 16 0 16 +[ 2 2 0 ] 17 0 17 +[ 2 2 1 ] 18 0 18 +[ 3 0 0 ] 19 0 19 +[ 3 0 1 ] 20 0 20 +[ 3 1 0 ] 21 0 21 +[ 3 1 1 ] 22 0 22 +[ 3 2 0 ] 23 0 23 +[ 3 2 1 ] 24 0 24 +24 differences found +Dataset: and +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +4 differences found +Dataset: and +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +12 differences found +Dataset: and +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +position difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +2 differences found +48 differences found +Dataset: and +position string string difference +------------------------------------------------------------ +[ 0 ] a z +[ 0 ] b z +[ 1 ] d z +[ 1 ] e z +4 differences found +Dataset: and +position string2D string2D difference +------------------------------------------------------------ +[ 0 0 ] a z +[ 0 0 ] b z +[ 0 1 ] c z +[ 0 1 ] d z +[ 1 0 ] e z +[ 1 0 ] f z +[ 1 1 ] g z +[ 1 1 ] h z +[ 2 0 ] i z +[ 2 0 ] j z +[ 2 1 ] k z +[ 2 1 ] l z +12 differences found +Dataset: and +position string3D string3D difference +------------------------------------------------------------ +[ 0 0 0 ] a z +[ 0 0 0 ] b z +[ 0 0 1 ] c z +[ 0 0 1 ] d z +[ 0 1 0 ] e z +[ 0 1 0 ] f z +[ 0 1 1 ] g z +[ 0 1 1 ] h z +[ 0 2 0 ] i z +[ 0 2 0 ] j z +[ 0 2 1 ] k z +[ 0 2 1 ] l z +[ 1 0 0 ] m z +[ 1 0 0 ] n z +[ 1 0 1 ] p z +[ 1 0 1 ] q z +[ 1 1 0 ] r z +[ 1 1 0 ] s z +[ 1 1 1 ] t z +[ 1 1 1 ] u z +[ 1 2 0 ] v z +[ 1 2 0 ] w z +[ 1 2 1 ] x z +[ 2 0 0 ] A z +[ 2 0 0 ] B z +[ 2 0 1 ] C z +[ 2 0 1 ] D z +[ 2 1 0 ] E z +[ 2 1 0 ] F z +[ 2 1 1 ] G z +[ 2 1 1 ] H z +[ 2 2 0 ] I z +[ 2 2 0 ] J z +[ 2 2 1 ] K z +[ 2 2 1 ] L z +[ 3 0 0 ] M z +[ 3 0 0 ] N z +[ 3 0 1 ] P z +[ 3 0 1 ] Q z +[ 3 1 0 ] R z +[ 3 1 0 ] S z +[ 3 1 1 ] T z +[ 3 1 1 ] U z +[ 3 2 0 ] V z +[ 3 2 0 ] W z +[ 3 2 1 ] X z +[ 3 2 1 ] Z z +47 differences found +Dataset: and +position vlen vlen difference +------------------------------------------------------------ +[ 0 ] 1 0 1 +[ 1 ] 2 0 2 +[ 1 ] 3 0 3 +3 differences found +Dataset: and +position vlen2D vlen2D difference +------------------------------------------------------------ +[ 0 1 ] 1 0 1 +[ 1 0 ] 2 0 2 +[ 1 0 ] 3 0 3 +[ 1 1 ] 4 0 4 +[ 1 1 ] 5 0 5 +[ 2 0 ] 6 0 6 +[ 2 0 ] 7 0 7 +[ 2 0 ] 8 0 8 +[ 2 1 ] 9 0 9 +[ 2 1 ] 10 0 10 +[ 2 1 ] 11 0 11 +11 differences found +Dataset: and +position vlen3D vlen3D difference +------------------------------------------------------------ +[ 0 0 1 ] 1 0 1 +[ 0 1 0 ] 2 0 2 +[ 0 1 1 ] 3 0 3 +[ 0 2 0 ] 4 0 4 +[ 0 2 1 ] 5 0 5 +[ 1 0 0 ] 6 0 6 +[ 1 0 0 ] 7 0 7 +[ 1 0 1 ] 8 0 8 +[ 1 0 1 ] 9 0 9 +[ 1 1 0 ] 10 0 10 +[ 1 1 0 ] 11 0 11 +[ 1 1 1 ] 12 0 12 +[ 1 1 1 ] 13 0 13 +[ 1 2 0 ] 14 0 14 +[ 1 2 0 ] 15 0 15 +[ 1 2 1 ] 16 0 16 +[ 1 2 1 ] 17 0 17 +[ 2 0 0 ] 18 0 18 +[ 2 0 0 ] 19 0 19 +[ 2 0 0 ] 20 0 20 +[ 2 0 1 ] 21 0 21 +[ 2 0 1 ] 22 0 22 +[ 2 0 1 ] 23 0 23 +[ 2 1 0 ] 24 0 24 +[ 2 1 0 ] 25 0 25 +[ 2 1 0 ] 26 0 26 +[ 2 1 1 ] 27 0 27 +[ 2 1 1 ] 28 0 28 +[ 2 1 1 ] 29 0 29 +[ 2 2 0 ] 30 0 30 +[ 2 2 0 ] 31 0 31 +[ 2 2 0 ] 32 0 32 +[ 2 2 1 ] 33 0 33 +[ 2 2 1 ] 34 0 34 +[ 2 2 1 ] 35 0 35 +[ 3 0 0 ] 36 0 36 +[ 3 0 0 ] 37 0 37 +[ 3 0 0 ] 38 0 38 +[ 3 0 0 ] 39 0 39 +[ 3 0 1 ] 40 0 40 +[ 3 0 1 ] 41 0 41 +[ 3 0 1 ] 42 0 42 +[ 3 0 1 ] 43 0 43 +[ 3 1 0 ] 44 0 44 +[ 3 1 0 ] 45 0 45 +[ 3 1 0 ] 46 0 46 +[ 3 1 0 ] 47 0 47 +[ 3 1 1 ] 48 0 48 +[ 3 1 1 ] 49 0 49 +[ 3 1 1 ] 50 0 50 +[ 3 1 1 ] 51 0 51 +[ 3 2 0 ] 52 0 52 +[ 3 2 0 ] 53 0 53 +[ 3 2 0 ] 54 0 54 +[ 3 2 0 ] 55 0 55 +[ 3 2 1 ] 56 0 56 +[ 3 2 1 ] 57 0 57 +[ 3 2 1 ] 58 0 58 +[ 3 2 1 ] 59 0 59 +59 differences found +Dataset: and +type null_dset null_dset difference + H5T_IEEE_F64LE H5T_STD_I32LE +1 differences found +Group: and + diff --git a/tools/testfiles/test1.h5 b/tools/testfiles/test1.h5 index 54c897a..1edac90 100644 Binary files a/tools/testfiles/test1.h5 and b/tools/testfiles/test1.h5 differ diff --git a/tools/testfiles/test3.h5 b/tools/testfiles/test3.h5 index 36a3aa4..7072b02 100644 Binary files a/tools/testfiles/test3.h5 and b/tools/testfiles/test3.h5 differ diff --git a/tools/testfiles/test4.h5 b/tools/testfiles/test4.h5 index ce2cfee..6a04a34 100644 Binary files a/tools/testfiles/test4.h5 and b/tools/testfiles/test4.h5 differ -- cgit v0.12