diff options
| -rw-r--r-- | tools/lib/h5diff.h | 16 | ||||
| -rw-r--r-- | tools/lib/h5diff_array.c | 424 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_100.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_101.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_102.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_13.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_14.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_15.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_16.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_17.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_191.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_192.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_50.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_51.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_52.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_53.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_54.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_55.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_56.txt | 1 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_70.txt | 54 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_80.txt | 58 |
21 files changed, 373 insertions, 196 deletions
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h index e698770..30f0362 100644 --- a/tools/lib/h5diff.h +++ b/tools/lib/h5diff.h @@ -36,11 +36,9 @@ typedef struct { int err_stat; /* an error ocurred (1, error, 0, no error) */ int cmn_objs; /* do we have comparable objects */ int not_cmp; /* are the objects comparable */ - } diff_opt_t; - /*------------------------------------------------------------------------- * public functions *------------------------------------------------------------------------- @@ -163,12 +161,12 @@ void print_dims( int r, hsize_t *d ); int print_objname(diff_opt_t *options, hsize_t nfound); - hsize_t diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t i, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -185,6 +183,7 @@ hsize_t diff_float(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -197,6 +196,7 @@ hsize_t diff_double(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -209,6 +209,7 @@ hsize_t diff_schar(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -221,6 +222,7 @@ hsize_t diff_uchar(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -233,6 +235,7 @@ hsize_t diff_short(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -245,6 +248,7 @@ hsize_t diff_ushort(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -257,6 +261,7 @@ hsize_t diff_int(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -269,6 +274,7 @@ hsize_t diff_uint(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -281,6 +287,7 @@ hsize_t diff_long(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -293,6 +300,7 @@ hsize_t diff_ulong(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -305,6 +313,7 @@ hsize_t diff_llong(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -317,6 +326,7 @@ hsize_t diff_ullong(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 7f1a303..7786f0a 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -111,7 +111,6 @@ static int not_comparable; is_zero=1; \ } - # define PDIFF(a,b) ( (b>a) ? (b-a) : (a-b)) /*------------------------------------------------------------------------- @@ -122,8 +121,8 @@ static void close_obj(H5G_obj_t obj_type, hid_t obj_id); static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id,hid_t region1_id, hid_t region2_id, diff_opt_t *options); static hbool_t all_zero(const void *_mem, size_t size); static int ull2float(unsigned long_long ull_value, float *f_value); -static hsize_t character_compare(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph); -static hsize_t character_compare_opt(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph); +static hsize_t character_compare(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph); +static hsize_t character_compare_opt(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph); /*------------------------------------------------------------------------- @@ -159,6 +158,7 @@ void print_pos( int *ph, /* print header */ hsize_t *acc, hsize_t *pos, int rank, + hsize_t *dims, const char *obj1, const char *obj2 ) { @@ -168,6 +168,18 @@ void print_pos( int *ph, /* print header */ if ( *ph==1 ) { *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", @@ -265,6 +277,7 @@ hsize_t diff_array( void *_mem1, m_type, (hsize_t)0, rank, + dims, acc, pos, options, @@ -291,33 +304,33 @@ hsize_t diff_array( void *_mem1, case H5T_FLOAT: if (H5Tequal(m_type, H5T_NATIVE_FLOAT)) - nfound=diff_float(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_float(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE)) - nfound=diff_double(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_double(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); break; case H5T_INTEGER: if (H5Tequal(m_type, H5T_NATIVE_SCHAR)) - nfound=diff_schar(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_schar(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_UCHAR)) - nfound=diff_uchar(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_uchar(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_SHORT)) - nfound=diff_short(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_short(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_USHORT)) - nfound=diff_ushort(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_ushort(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_INT)) - nfound=diff_int(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_int(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_UINT)) - nfound=diff_uint(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_uint(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_LONG)) - nfound=diff_long(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_long(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_ULONG)) - nfound=diff_ulong(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_ulong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_LLONG)) - nfound=diff_llong(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_llong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); else if (H5Tequal(m_type, H5T_NATIVE_ULLONG)) - nfound=diff_ullong(mem1,mem2,nelmts,hyper_start,rank,acc,pos,options,name1,name2,&ph); + nfound=diff_ullong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph); break; @@ -343,6 +356,7 @@ hsize_t diff_array( void *_mem1, m_type, i, rank, + dims, acc, pos, options, @@ -403,6 +417,7 @@ hsize_t diff_datum(void *_mem1, hid_t m_type, hsize_t i, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -412,7 +427,6 @@ hsize_t diff_datum(void *_mem1, hid_t container2_id, /*where the reference came from*/ int *ph) /*print header */ { - hsize_t dims[H5S_MAX_RANK]; unsigned char *mem1 = (unsigned char*)_mem1; unsigned char *mem2 = (unsigned char*)_mem2; unsigned u; @@ -422,7 +436,6 @@ hsize_t diff_datum(void *_mem1, int nmembs; int j; hsize_t nelmts; - hsize_t ndims; size_t size=0; int iszero1; int iszero2; @@ -463,6 +476,7 @@ hsize_t diff_datum(void *_mem1, memb_type, i, rank, + dims, acc, pos, options, @@ -509,6 +523,7 @@ hsize_t diff_datum(void *_mem1, mem2 + u, /* offset */ i, /* index position */ rank, + dims, acc, pos, options, @@ -532,6 +547,7 @@ hsize_t diff_datum(void *_mem1, mem2 + u, /* offset */ i, /* index position */ rank, + dims, acc, pos, options, @@ -555,6 +571,7 @@ hsize_t diff_datum(void *_mem1, mem2 + u, /* offset */ i, /* index position */ rank, + dims, acc, pos, options, @@ -592,7 +609,7 @@ hsize_t diff_datum(void *_mem1, nfound=1; if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(S_FORMAT,enum_name1,enum_name2); } @@ -605,6 +622,7 @@ hsize_t diff_datum(void *_mem1, mem2 + u, /* offset */ i, /* index position */ rank, + dims, acc, pos, options, @@ -625,32 +643,37 @@ hsize_t diff_datum(void *_mem1, *------------------------------------------------------------------------- */ case H5T_ARRAY: - /* get the array's base datatype for each element */ - memb_type = H5Tget_super(m_type); - size = H5Tget_size(memb_type); - ndims = H5Tget_array_ndims(m_type); - H5Tget_array_dims(m_type, dims, NULL); - assert(ndims >= 1 && ndims <= H5S_MAX_RANK); - - /* calculate the number of array elements */ - for (u = 0, nelmts = 1; u <ndims; u++) - nelmts *= dims[u]; - for (u = 0; u < nelmts; u++) - nfound+=diff_datum( - mem1 + u * size, - mem2 + u * size, /* offset */ - memb_type, - i, /* index position */ - rank, - acc, - pos, - options, - obj1, - obj2, - container1_id, - container2_id, - ph); - H5Tclose(memb_type); + { + hsize_t adims[H5S_MAX_RANK]; + hsize_t ndims; + /* get the array's base datatype for each element */ + memb_type = H5Tget_super(m_type); + size = H5Tget_size(memb_type); + ndims = H5Tget_array_ndims(m_type); + H5Tget_array_dims(m_type, adims, NULL); + assert(ndims >= 1 && ndims <= H5S_MAX_RANK); + + /* calculate the number of array elements */ + for (u = 0, nelmts = 1; u <ndims; u++) + nelmts *= adims[u]; + for (u = 0; u < nelmts; u++) + nfound+=diff_datum( + mem1 + u * size, + mem2 + u * size, /* offset */ + memb_type, + i, /* index position */ + rank, + dims, + acc, + pos, + options, + obj1, + obj2, + container1_id, + container2_id, + ph); + H5Tclose(memb_type); + } break; /*------------------------------------------------------------------------- @@ -674,6 +697,7 @@ hsize_t diff_datum(void *_mem1, memb_type, i, /* index position */ rank, + dims, acc, pos, options, @@ -816,7 +840,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char)); } @@ -830,7 +854,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char)); options->not_cmp=1; @@ -843,7 +867,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_char,temp2_char,ABS(temp1_char-temp2_char),per); } @@ -857,7 +881,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char)); options->not_cmp=1; @@ -870,7 +894,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_char,temp2_char,ABS(temp1_char-temp2_char),per); } @@ -881,7 +905,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char)); } @@ -909,7 +933,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar)); } @@ -923,7 +947,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar)); options->not_cmp=1; @@ -936,7 +960,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per); } @@ -950,7 +974,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar)); options->not_cmp=1; @@ -963,7 +987,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per); } @@ -974,7 +998,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar)); } @@ -1004,7 +1028,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short)); } @@ -1018,7 +1042,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short)); options->not_cmp=1; @@ -1031,7 +1055,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_short,temp2_short,ABS(temp1_short-temp2_short),per); } @@ -1045,7 +1069,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short)); options->not_cmp=1; @@ -1058,7 +1082,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_short,temp2_short,ABS(temp1_short-temp2_short),per); } @@ -1069,7 +1093,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short)); } @@ -1100,7 +1124,7 @@ hsize_t diff_datum(void *_mem1, if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort)); } @@ -1114,7 +1138,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort, PDIFF(temp1_ushort,temp2_ushort)); @@ -1128,7 +1152,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort),per); } @@ -1142,7 +1166,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort)); options->not_cmp=1; @@ -1155,7 +1179,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort),per); } @@ -1166,7 +1190,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort)); } @@ -1195,7 +1219,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int)); } @@ -1209,7 +1233,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int)); options->not_cmp=1; @@ -1222,7 +1246,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_int,temp2_int,ABS(temp1_int-temp2_int),per); } @@ -1236,7 +1260,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int)); options->not_cmp=1; @@ -1249,7 +1273,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_int,temp2_int,ABS(temp1_int-temp2_int),per); } @@ -1260,7 +1284,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int)); } @@ -1289,7 +1313,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(UI_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint)); } @@ -1303,7 +1327,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint)); options->not_cmp=1; @@ -1316,7 +1340,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint),per); } @@ -1330,7 +1354,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint)); options->not_cmp=1; @@ -1343,7 +1367,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint),per); } @@ -1354,7 +1378,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(UI_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint)); } @@ -1383,7 +1407,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long)); } @@ -1397,7 +1421,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long, ABS(temp1_long-temp2_long)); @@ -1411,7 +1435,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P,temp1_long,temp2_long,ABS(temp1_long-temp2_long),per); } @@ -1425,7 +1449,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,ABS(temp1_long-temp2_long)); options->not_cmp=1; @@ -1438,7 +1462,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P,temp1_long,temp2_long, ABS(temp1_long-temp2_long), @@ -1451,7 +1475,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long)); } @@ -1479,7 +1503,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong)); } @@ -1493,7 +1517,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong)); options->not_cmp=1; @@ -1506,7 +1530,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULI_FORMAT_P,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong),per); } @@ -1520,7 +1544,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong)); options->not_cmp=1; @@ -1533,7 +1557,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULI_FORMAT_P,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong),per); } @@ -1544,7 +1568,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong)); } @@ -1574,7 +1598,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong)); } @@ -1588,7 +1612,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong)); options->not_cmp=1; @@ -1601,7 +1625,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per); } @@ -1615,7 +1639,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong)); options->not_cmp=1; @@ -1628,7 +1652,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per); } @@ -1639,7 +1663,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong)); } @@ -1668,7 +1692,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong)); } @@ -1684,7 +1708,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong)); options->not_cmp=1; @@ -1698,7 +1722,7 @@ hsize_t diff_datum(void *_mem1, if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per); } @@ -1714,7 +1738,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong)); options->not_cmp=1; @@ -1728,7 +1752,7 @@ hsize_t diff_datum(void *_mem1, if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per); @@ -1740,7 +1764,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong)); } @@ -1774,7 +1798,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float)); } @@ -1789,7 +1813,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,ABS(temp1_float-temp2_float)); options->not_cmp=1; @@ -1802,7 +1826,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P,temp1_float,temp2_float, ABS(temp1_float-temp2_float), @@ -1820,7 +1844,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float, ABS(temp1_float-temp2_float)); @@ -1834,7 +1858,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P,temp1_float,temp2_float, ABS(temp1_float-temp2_float), @@ -1849,7 +1873,7 @@ hsize_t diff_datum(void *_mem1, if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float)); } @@ -1878,7 +1902,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double)); } @@ -1893,7 +1917,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double, ABS(temp1_double-temp2_double)); @@ -1907,7 +1931,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P,temp1_double,temp2_double, ABS(temp1_double-temp2_double), @@ -1926,7 +1950,7 @@ hsize_t diff_datum(void *_mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double, ABS(temp1_double-temp2_double)); @@ -1941,7 +1965,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P,temp1_double,temp2_double, ABS(temp1_double-temp2_double), @@ -1955,7 +1979,7 @@ hsize_t diff_datum(void *_mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double)); } @@ -2287,6 +2311,7 @@ hsize_t character_compare(unsigned char *mem1, unsigned char *mem2, hsize_t i, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -2305,7 +2330,7 @@ hsize_t character_compare(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(C_FORMAT,temp1_uchar,temp2_uchar); } @@ -2330,6 +2355,7 @@ hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2, hsize_t i, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -2354,7 +2380,7 @@ hsize_t character_compare_opt(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar)); } @@ -2369,7 +2395,7 @@ hsize_t character_compare_opt(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per); } @@ -2384,7 +2410,7 @@ hsize_t character_compare_opt(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per); } @@ -2395,7 +2421,7 @@ hsize_t character_compare_opt(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar)); } @@ -2421,6 +2447,7 @@ hsize_t diff_float(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -2449,7 +2476,7 @@ hsize_t diff_float(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float)); } @@ -2474,7 +2501,7 @@ hsize_t diff_float(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float, ABS(temp1_float-temp2_float)); @@ -2488,7 +2515,7 @@ hsize_t diff_float(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P,temp1_float,temp2_float, ABS(temp1_float-temp2_float), @@ -2516,7 +2543,7 @@ hsize_t diff_float(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float, ABS(temp1_float-temp2_float)); @@ -2530,7 +2557,7 @@ hsize_t diff_float(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P,temp1_float,temp2_float, ABS(temp1_float-temp2_float), @@ -2556,7 +2583,7 @@ hsize_t diff_float(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT,temp1_float,temp2_float,ABS(temp1_float-temp2_float)); } @@ -2590,6 +2617,7 @@ hsize_t diff_double(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -2619,7 +2647,7 @@ hsize_t diff_double(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double)); } @@ -2645,7 +2673,7 @@ hsize_t diff_double(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double, ABS(temp1_double-temp2_double)); @@ -2659,7 +2687,7 @@ hsize_t diff_double(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P,temp1_double,temp2_double, ABS(temp1_double-temp2_double), @@ -2687,7 +2715,7 @@ hsize_t diff_double(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double, ABS(temp1_double-temp2_double)); @@ -2701,7 +2729,7 @@ hsize_t diff_double(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P,temp1_double,temp2_double, ABS(temp1_double-temp2_double), @@ -2727,7 +2755,7 @@ hsize_t diff_double(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double)); } @@ -2759,6 +2787,7 @@ hsize_t diff_schar(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -2788,7 +2817,7 @@ hsize_t diff_schar(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char)); } @@ -2814,7 +2843,7 @@ hsize_t diff_schar(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char, ABS(temp1_char-temp2_char)); @@ -2828,7 +2857,7 @@ hsize_t diff_schar(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_char,temp2_char, ABS(temp1_char-temp2_char), @@ -2856,7 +2885,7 @@ hsize_t diff_schar(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char, ABS(temp1_char-temp2_char)); @@ -2870,7 +2899,7 @@ hsize_t diff_schar(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_char,temp2_char, ABS(temp1_char-temp2_char), @@ -2897,7 +2926,7 @@ hsize_t diff_schar(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char)); } @@ -2931,6 +2960,7 @@ hsize_t diff_uchar(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -2960,7 +2990,7 @@ hsize_t diff_uchar(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar)); } @@ -2987,7 +3017,7 @@ hsize_t diff_uchar(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar, PDIFF(temp1_uchar,temp2_uchar)); @@ -3001,7 +3031,7 @@ hsize_t diff_uchar(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar, PDIFF(temp1_uchar,temp2_uchar), @@ -3029,7 +3059,7 @@ hsize_t diff_uchar(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar, PDIFF(temp1_uchar,temp2_uchar)); @@ -3043,7 +3073,7 @@ hsize_t diff_uchar(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar, PDIFF(temp1_uchar,temp2_uchar), @@ -3070,7 +3100,7 @@ hsize_t diff_uchar(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar)); } @@ -3102,6 +3132,7 @@ hsize_t diff_short(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -3130,7 +3161,7 @@ hsize_t diff_short(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short)); } @@ -3157,7 +3188,7 @@ hsize_t diff_short(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short, ABS(temp1_short-temp2_short)); @@ -3171,7 +3202,7 @@ hsize_t diff_short(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_short,temp2_short, ABS(temp1_short-temp2_short), @@ -3201,7 +3232,7 @@ hsize_t diff_short(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short, ABS(temp1_short-temp2_short)); @@ -3215,7 +3246,7 @@ hsize_t diff_short(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_short,temp2_short, ABS(temp1_short-temp2_short), @@ -3242,7 +3273,7 @@ hsize_t diff_short(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short)); } @@ -3275,6 +3306,7 @@ hsize_t diff_ushort(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -3303,7 +3335,7 @@ hsize_t diff_ushort(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort)); } @@ -3330,7 +3362,7 @@ hsize_t diff_ushort(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort, PDIFF(temp1_ushort,temp2_ushort)); @@ -3344,7 +3376,7 @@ hsize_t diff_ushort(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort, PDIFF(temp1_ushort,temp2_ushort), @@ -3374,7 +3406,7 @@ hsize_t diff_ushort(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort, PDIFF(temp1_ushort,temp2_ushort)); @@ -3388,7 +3420,7 @@ hsize_t diff_ushort(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort, PDIFF(temp1_ushort,temp2_ushort), @@ -3415,7 +3447,7 @@ hsize_t diff_ushort(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort)); } @@ -3449,6 +3481,7 @@ hsize_t diff_int(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -3477,7 +3510,7 @@ hsize_t diff_int(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int)); } @@ -3504,7 +3537,7 @@ hsize_t diff_int(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int, ABS(temp1_int-temp2_int)); @@ -3518,7 +3551,7 @@ hsize_t diff_int(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_int,temp2_int, ABS(temp1_int-temp2_int), @@ -3548,7 +3581,7 @@ hsize_t diff_int(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int, ABS(temp1_int-temp2_int)); @@ -3562,7 +3595,7 @@ hsize_t diff_int(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_int,temp2_int, ABS(temp1_int-temp2_int), @@ -3589,7 +3622,7 @@ hsize_t diff_int(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int)); } @@ -3623,6 +3656,7 @@ hsize_t diff_uint(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -3651,7 +3685,7 @@ hsize_t diff_uint(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint)); } @@ -3678,7 +3712,7 @@ hsize_t diff_uint(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint)); options->not_cmp=1; @@ -3691,7 +3725,7 @@ hsize_t diff_uint(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uint,temp2_uint, PDIFF(temp1_uint,temp2_uint), @@ -3721,7 +3755,7 @@ hsize_t diff_uint(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint)); options->not_cmp=1; @@ -3734,7 +3768,7 @@ hsize_t diff_uint(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT_P,temp1_uint,temp2_uint, PDIFF(temp1_uint,temp2_uint), @@ -3761,7 +3795,7 @@ hsize_t diff_uint(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(I_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint)); } @@ -3795,6 +3829,7 @@ hsize_t diff_long(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -3826,7 +3861,7 @@ hsize_t diff_long(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long)); } @@ -3853,7 +3888,7 @@ hsize_t diff_long(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long, ABS(temp1_long-temp2_long)); @@ -3867,7 +3902,7 @@ hsize_t diff_long(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P,temp1_long,temp2_long, ABS(temp1_long-temp2_long), @@ -3897,7 +3932,7 @@ hsize_t diff_long(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long, ABS(temp1_long-temp2_long)); @@ -3911,7 +3946,7 @@ hsize_t diff_long(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P,temp1_long,temp2_long, ABS(temp1_long-temp2_long), @@ -3938,7 +3973,7 @@ hsize_t diff_long(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long)); } @@ -3973,6 +4008,7 @@ hsize_t diff_ulong(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -4005,7 +4041,7 @@ hsize_t diff_ulong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong)); } @@ -4034,7 +4070,7 @@ hsize_t diff_ulong(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong)); options->not_cmp=1; @@ -4047,7 +4083,7 @@ hsize_t diff_ulong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P,temp1_ulong,temp2_ulong, PDIFF(temp1_ulong,temp2_ulong), @@ -4077,7 +4113,7 @@ hsize_t diff_ulong(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong)); options->not_cmp=1; @@ -4090,7 +4126,7 @@ hsize_t diff_ulong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT_P,temp1_ulong,temp2_ulong, PDIFF(temp1_ulong,temp2_ulong), @@ -4117,7 +4153,7 @@ hsize_t diff_ulong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong)); } @@ -4151,6 +4187,7 @@ hsize_t diff_llong(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -4179,7 +4216,7 @@ hsize_t diff_llong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong)); } @@ -4206,7 +4243,7 @@ hsize_t diff_llong(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong)); options->not_cmp=1; @@ -4219,7 +4256,7 @@ hsize_t diff_llong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per); } @@ -4247,7 +4284,7 @@ hsize_t diff_llong(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong)); options->not_cmp=1; @@ -4260,7 +4297,7 @@ hsize_t diff_llong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per); } @@ -4285,7 +4322,7 @@ hsize_t diff_llong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong)); } @@ -4319,6 +4356,7 @@ hsize_t diff_ullong(unsigned char *mem1, hsize_t nelmts, hsize_t hyper_start, int rank, + hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *options, @@ -4348,7 +4386,7 @@ hsize_t diff_ullong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong)); } @@ -4377,7 +4415,7 @@ hsize_t diff_ullong(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong)); options->not_cmp=1; @@ -4390,7 +4428,7 @@ hsize_t diff_ullong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per); } @@ -4420,7 +4458,7 @@ hsize_t diff_ullong(unsigned char *mem1, if (not_comparable && !both_zero) /* not comparable */ { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong)); options->not_cmp=1; @@ -4433,7 +4471,7 @@ hsize_t diff_ullong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,1,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per); } @@ -4458,7 +4496,7 @@ hsize_t diff_ullong(unsigned char *mem1, { if ( print_data(options) ) { - print_pos(ph,0,hyper_start+i,acc,pos,rank,obj1,obj2); + print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2); parallel_print(SPACES); parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong)); } diff --git a/tools/testfiles/h5diff_100.txt b/tools/testfiles/h5diff_100.txt index 8415956..2e04520 100644 --- a/tools/testfiles/h5diff_100.txt +++ b/tools/testfiles/h5diff_100.txt @@ -7,6 +7,7 @@ file1 file2 x x /big Dataset: </big> and </big> +size [1073741824] position big big difference ------------------------------------------------------------ [ 268435456 ] 31 0 31 diff --git a/tools/testfiles/h5diff_101.txt b/tools/testfiles/h5diff_101.txt index a35ffb6..074445c 100644 --- a/tools/testfiles/h5diff_101.txt +++ b/tools/testfiles/h5diff_101.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/d1 g1/d2 -v' ############################# Dataset: </g1/d1> and </g1/d2> +size [3x2] position d1 d2 difference ------------------------------------------------------------ [ 0 1 ] 1e-09 2e-09 1e-09 diff --git a/tools/testfiles/h5diff_102.txt b/tools/testfiles/h5diff_102.txt index da3ead2..c1c31f5 100644 --- a/tools/testfiles/h5diff_102.txt +++ b/tools/testfiles/h5diff_102.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 /g1/fp1 g1/fp2 -v' ############################# Dataset: </g1/fp1> and </g1/fp2> +size [3x2] position fp1 fp2 difference ------------------------------------------------------------ [ 0 1 ] 1e-05 2e-05 1e-05 diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt index 897222c..72f2bc1 100644 --- a/tools/testfiles/h5diff_13.txt +++ b/tools/testfiles/h5diff_13.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r' ############################# Dataset: </g1/dset1> and </g1/dset1> +size [3x2] position dset1 dset1 difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt index b5431cf..5c18e4e 100644 --- a/tools/testfiles/h5diff_14.txt +++ b/tools/testfiles/h5diff_14.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r g1/dset1 g1/dset2' ############################# Dataset: </g1/dset1> and </g1/dset2> +size [3x2] position dset1 dset2 difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt index caf34ec..2515065 100644 --- a/tools/testfiles/h5diff_15.txt +++ b/tools/testfiles/h5diff_15.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 -r -d 5 g1/dset3 g1/dset4' ############################# Dataset: </g1/dset3> and </g1/dset4> +size [3x2] position dset3 dset4 difference ------------------------------------------------------------ [ 0 1 ] 100 120 20 diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt index 8145b00..78141f7 100644 --- a/tools/testfiles/h5diff_16.txt +++ b/tools/testfiles/h5diff_16.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10 -p 0.01 -v' ############################# Dataset: </g1/dset9> and </g1/dset10> +size [3x2] position dset9 dset10 difference relative ------------------------------------------------------------------------ [ 0 0 ] 100 120 20 0.2 diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt index 3701655..7c33114 100644 --- a/tools/testfiles/h5diff_17.txt +++ b/tools/testfiles/h5diff_17.txt @@ -24,6 +24,7 @@ file1 file2 Group: </g1> and </g1> 0 differences found Dataset: </g1/dset1> and </g1/dset1> +size [3x2] position dset1 dset1 difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_191.txt b/tools/testfiles/h5diff_191.txt index 25b298e..801cca7 100644 --- a/tools/testfiles/h5diff_191.txt +++ b/tools/testfiles/h5diff_191.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset5 g1/dset6' ############################# Dataset: </g1/dset5> and </g1/dset6> +size [3x2] position dset5 dset6 difference relative ------------------------------------------------------------------------ [ 1 0 ] 100 103 3 0.030000 diff --git a/tools/testfiles/h5diff_192.txt b/tools/testfiles/h5diff_192.txt index 5108d1b..3173153 100644 --- a/tools/testfiles/h5diff_192.txt +++ b/tools/testfiles/h5diff_192.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic1.h5 -v -p 0.02 g1/dset7 g1/dset8' ############################# Dataset: </g1/dset7> and </g1/dset8> +size [3x2] position dset7 dset8 difference relative ------------------------------------------------------------------------ [ 1 0 ] 100 103 3 0.030000 diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt index ccbffbe..1607804 100644 --- a/tools/testfiles/h5diff_50.txt +++ b/tools/testfiles/h5diff_50.txt @@ -5,6 +5,7 @@ Dataset: </dset0a> and </dset0b> warning: different storage datatype </dset0a> has file datatype H5T_STD_I16LE </dset0b> has file datatype H5T_STD_I32LE +size [3x2] position dset0a dset0b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt index 91a125f..46a82c7 100644 --- a/tools/testfiles/h5diff_51.txt +++ b/tools/testfiles/h5diff_51.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset1a dset1b' ############################# Dataset: </dset1a> and </dset1b> +size [3x2] position dset1a dset1b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt index 490b407..7e4580f 100644 --- a/tools/testfiles/h5diff_52.txt +++ b/tools/testfiles/h5diff_52.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset2a dset2b' ############################# Dataset: </dset2a> and </dset2b> +size [3x2] position dset2a dset2b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt index 454c35c..1651457 100644 --- a/tools/testfiles/h5diff_53.txt +++ b/tools/testfiles/h5diff_53.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset3a dset4b' ############################# Dataset: </dset3a> and </dset4b> +size [3x2] position dset3a dset4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt index 1f1a375..e6fcbe8 100644 --- a/tools/testfiles/h5diff_54.txt +++ b/tools/testfiles/h5diff_54.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset4a dset4b' ############################# Dataset: </dset4a> and </dset4b> +size [3x2] position dset4a dset4b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt index 736c2d5..6ad0808 100644 --- a/tools/testfiles/h5diff_55.txt +++ b/tools/testfiles/h5diff_55.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset5a dset5b' ############################# Dataset: </dset5a> and </dset5b> +size [3x2] position dset5a dset5b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt index 02c7169..733d6fb 100644 --- a/tools/testfiles/h5diff_56.txt +++ b/tools/testfiles/h5diff_56.txt @@ -2,6 +2,7 @@ Expected output for 'h5diff h5diff_dtypes.h5 h5diff_dtypes.h5 -v dset6a dset6b' ############################# Dataset: </dset6a> and </dset6b> +size [3x2] position dset6a dset6b difference ------------------------------------------------------------ [ 1 0 ] 1 3 2 diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt index 3a8ebac..97b74a2 100644 --- a/tools/testfiles/h5diff_70.txt +++ b/tools/testfiles/h5diff_70.txt @@ -13,6 +13,7 @@ Dataset: </dset> and </dset> Group: </g1> and </g1> 0 differences found Attribute: <string of </g1>> and <string of </g1>> +size [2] position string of </g1> string of </g1> difference ------------------------------------------------------------ [ 0 ] a z @@ -21,18 +22,21 @@ position string of </g1> string of </g1> difference [ 1 ] e z 4 differences found Attribute: <bitfield of </g1>> and <bitfield of </g1>> +size [2] position bitfield of </g1> bitfield of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <opaque of </g1>> and <opaque of </g1>> +size [2] position opaque of </g1> opaque of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <compound of </g1>> and <compound of </g1>> +size [2] position compound of </g1> compound of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -41,12 +45,14 @@ position compound of </g1> compound of </g1> difference [ 1 ] 4 0 4 4 differences found Attribute: <enum of </g1>> and <enum of </g1>> +size [2] position enum of </g1> enum of </g1> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN 2 differences found Attribute: <vlen of </g1>> and <vlen of </g1>> +size [2] position vlen of </g1> vlen of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -54,6 +60,7 @@ position vlen of </g1> vlen of </g1> difference [ 1 ] 3 0 3 3 differences found Attribute: <array of </g1>> and <array of </g1>> +size [2] position array of </g1> array of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -64,18 +71,21 @@ position array of </g1> array of </g1> difference [ 1 ] 6 0 6 6 differences found Attribute: <integer of </g1>> and <integer of </g1>> +size [2] position integer of </g1> integer of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <float of </g1>> and <float of </g1>> +size [2] position float of </g1> float of </g1> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <string2D of </g1>> and <string2D of </g1>> +size [3x2] position string2D of </g1> string2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] a z @@ -92,6 +102,7 @@ position string2D of </g1> string2D of </g1> difference [ 2 1 ] l z 12 differences found Attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>> +size [3x2] position bitfield2D of </g1> bitfield2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -102,6 +113,7 @@ position bitfield2D of </g1> bitfield2D of </g1> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <opaque2D of </g1>> and <opaque2D of </g1>> +size [3x2] position opaque2D of </g1> opaque2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -112,6 +124,7 @@ position opaque2D of </g1> opaque2D of </g1> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <compound2D of </g1>> and <compound2D of </g1>> +size [3x2] position compound2D of </g1> compound2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -128,6 +141,7 @@ position compound2D of </g1> compound2D of </g1> difference [ 2 1 ] 12 0 12 12 differences found Attribute: <enum2D of </g1>> and <enum2D of </g1>> +size [3x2] position enum2D of </g1> enum2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN @@ -138,6 +152,7 @@ position enum2D of </g1> enum2D of </g1> difference [ 2 1 ] RED GREEN 6 differences found Attribute: <vlen2D of </g1>> and <vlen2D of </g1>> +size [3x2] position vlen2D of </g1> vlen2D of </g1> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -153,6 +168,7 @@ position vlen2D of </g1> vlen2D of </g1> difference [ 2 1 ] 11 0 11 11 differences found Attribute: <array2D of </g1>> and <array2D of </g1>> +size [3x2] position array2D of </g1> array2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -175,6 +191,7 @@ position array2D of </g1> array2D of </g1> difference [ 2 1 ] 18 0 18 18 differences found Attribute: <integer2D of </g1>> and <integer2D of </g1>> +size [3x2] position integer2D of </g1> integer2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -185,6 +202,7 @@ position integer2D of </g1> integer2D of </g1> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <float2D of </g1>> and <float2D of </g1>> +size [3x2] position float2D of </g1> float2D of </g1> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -195,6 +213,7 @@ position float2D of </g1> float2D of </g1> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <string3D of </g1>> and <string3D of </g1>> +size [4x3x2] position string3D of </g1> string3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -246,6 +265,7 @@ position string3D of </g1> string3D of </g1> difference [ 3 2 1 ] Z z 47 differences found Attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>> +size [4x3x2] position bitfield3D of </g1> bitfield3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -274,6 +294,7 @@ position bitfield3D of </g1> bitfield3D of </g1> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <opaque3D of </g1>> and <opaque3D of </g1>> +size [4x3x2] position opaque3D of </g1> opaque3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -302,6 +323,7 @@ position opaque3D of </g1> opaque3D of </g1> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <compound3D of </g1>> and <compound3D of </g1>> +size [4x3x2] position compound3D of </g1> compound3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -354,6 +376,7 @@ position compound3D of </g1> compound3D of </g1> difference [ 3 2 1 ] 48 0 48 48 differences found Attribute: <enum3D of </g1>> and <enum3D of </g1>> +size [4x3x2] position enum3D of </g1> enum3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED @@ -382,6 +405,7 @@ position enum3D of </g1> enum3D of </g1> difference [ 3 2 1 ] GREEN RED 24 differences found Attribute: <vlen3D of </g1>> and <vlen3D of </g1>> +size [4x3x2] position vlen3D of </g1> vlen3D of </g1> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -445,6 +469,7 @@ position vlen3D of </g1> vlen3D of </g1> difference [ 3 2 1 ] 59 0 59 59 differences found Attribute: <array3D of </g1>> and <array3D of </g1>> +size [4x3x2] position array3D of </g1> array3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -521,6 +546,7 @@ position array3D of </g1> array3D of </g1> difference [ 3 2 1 ] 72 0 72 72 differences found Attribute: <integer3D of </g1>> and <integer3D of </g1>> +size [4x3x2] position integer3D of </g1> integer3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -549,6 +575,7 @@ position integer3D of </g1> integer3D of </g1> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <float3D of </g1>> and <float3D of </g1>> +size [4x3x2] position float3D of </g1> float3D of </g1> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -579,6 +606,7 @@ position float3D of </g1> float3D of </g1> difference Group: </> and </> 0 differences found Attribute: <string of </>> and <string of </>> +size [2] position string of </> string of </> difference ------------------------------------------------------------ [ 0 ] a z @@ -587,18 +615,21 @@ position string of </> string of </> difference [ 1 ] e z 4 differences found Attribute: <bitfield of </>> and <bitfield of </>> +size [2] position bitfield of </> bitfield of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <opaque of </>> and <opaque of </>> +size [2] position opaque of </> opaque of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <compound of </>> and <compound of </>> +size [2] position compound of </> compound of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -607,12 +638,14 @@ position compound of </> compound of </> difference [ 1 ] 4 0 4 4 differences found Attribute: <enum of </>> and <enum of </>> +size [2] position enum of </> enum of </> difference ------------------------------------------------------------ [ 0 ] RED GREEN [ 1 ] RED GREEN 2 differences found Attribute: <vlen of </>> and <vlen of </>> +size [2] position vlen of </> vlen of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -620,6 +653,7 @@ position vlen of </> vlen of </> difference [ 1 ] 3 0 3 3 differences found Attribute: <array of </>> and <array of </>> +size [2] position array of </> array of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -630,18 +664,21 @@ position array of </> array of </> difference [ 1 ] 6 0 6 6 differences found Attribute: <integer of </>> and <integer of </>> +size [2] position integer of </> integer of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <float of </>> and <float of </>> +size [2] position float of </> float of </> difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Attribute: <string2D of </>> and <string2D of </>> +size [3x2] position string2D of </> string2D of </> difference ------------------------------------------------------------ [ 0 0 ] a z @@ -658,6 +695,7 @@ position string2D of </> string2D of </> difference [ 2 1 ] l z 12 differences found Attribute: <bitfield2D of </>> and <bitfield2D of </>> +size [3x2] position bitfield2D of </> bitfield2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -668,6 +706,7 @@ position bitfield2D of </> bitfield2D of </> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <opaque2D of </>> and <opaque2D of </>> +size [3x2] position opaque2D of </> opaque2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -678,6 +717,7 @@ position opaque2D of </> opaque2D of </> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <compound2D of </>> and <compound2D of </>> +size [3x2] position compound2D of </> compound2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -694,6 +734,7 @@ position compound2D of </> compound2D of </> difference [ 2 1 ] 12 0 12 12 differences found Attribute: <enum2D of </>> and <enum2D of </>> +size [3x2] position enum2D of </> enum2D of </> difference ------------------------------------------------------------ [ 0 0 ] RED GREEN @@ -704,6 +745,7 @@ position enum2D of </> enum2D of </> difference [ 2 1 ] RED GREEN 6 differences found Attribute: <vlen2D of </>> and <vlen2D of </>> +size [3x2] position vlen2D of </> vlen2D of </> difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -719,6 +761,7 @@ position vlen2D of </> vlen2D of </> difference [ 2 1 ] 11 0 11 11 differences found Attribute: <array2D of </>> and <array2D of </>> +size [3x2] position array2D of </> array2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -741,6 +784,7 @@ position array2D of </> array2D of </> difference [ 2 1 ] 18 0 18 18 differences found Attribute: <integer2D of </>> and <integer2D of </>> +size [3x2] position integer2D of </> integer2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -751,6 +795,7 @@ position integer2D of </> integer2D of </> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <float2D of </>> and <float2D of </>> +size [3x2] position float2D of </> float2D of </> difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -761,6 +806,7 @@ position float2D of </> float2D of </> difference [ 2 1 ] 6 0 6 6 differences found Attribute: <string3D of </>> and <string3D of </>> +size [4x3x2] position string3D of </> string3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -812,6 +858,7 @@ position string3D of </> string3D of </> difference [ 3 2 1 ] Z z 47 differences found Attribute: <bitfield3D of </>> and <bitfield3D of </>> +size [4x3x2] position bitfield3D of </> bitfield3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -840,6 +887,7 @@ position bitfield3D of </> bitfield3D of </> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <opaque3D of </>> and <opaque3D of </>> +size [4x3x2] position opaque3D of </> opaque3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -868,6 +916,7 @@ position opaque3D of </> opaque3D of </> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <compound3D of </>> and <compound3D of </>> +size [4x3x2] position compound3D of </> compound3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -920,6 +969,7 @@ position compound3D of </> compound3D of </> difference [ 3 2 1 ] 48 0 48 48 differences found Attribute: <enum3D of </>> and <enum3D of </>> +size [4x3x2] position enum3D of </> enum3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] GREEN RED @@ -948,6 +998,7 @@ position enum3D of </> enum3D of </> difference [ 3 2 1 ] GREEN RED 24 differences found Attribute: <vlen3D of </>> and <vlen3D of </>> +size [4x3x2] position vlen3D of </> vlen3D of </> difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 @@ -1011,6 +1062,7 @@ position vlen3D of </> vlen3D of </> difference [ 3 2 1 ] 59 0 59 59 differences found Attribute: <array3D of </>> and <array3D of </>> +size [4x3x2] position array3D of </> array3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -1087,6 +1139,7 @@ position array3D of </> array3D of </> difference [ 3 2 1 ] 72 0 72 72 differences found Attribute: <integer3D of </>> and <integer3D of </>> +size [4x3x2] position integer3D of </> integer3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -1115,6 +1168,7 @@ position integer3D of </> integer3D of </> difference [ 3 2 1 ] 24 0 24 24 differences found Attribute: <float3D of </>> and <float3D of </>> +size [4x3x2] position float3D of </> float3D of </> difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt index 7a85488..c51a357 100644 --- a/tools/testfiles/h5diff_80.txt +++ b/tools/testfiles/h5diff_80.txt @@ -40,6 +40,7 @@ file1 file2 x x /refreg Dataset: </dset> and </dset> +size [2] position dset dset difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -50,6 +51,7 @@ Dataset: </dsetref> and </dsetref> Group: </g1> and </g1> 0 differences found Dataset: </g1/array> and </g1/array> +size [2] position array array difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -60,6 +62,7 @@ position array array difference [ 1 ] 6 0 6 6 differences found Dataset: </g1/array2D> and </g1/array2D> +size [3x2] position array2D array2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -82,6 +85,7 @@ position array2D array2D difference [ 2 1 ] 18 0 18 18 differences found Dataset: </g1/array3D> and </g1/array3D> +size [4x3x2] position array3D array3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -158,12 +162,14 @@ position array3D array3D difference [ 3 2 1 ] 72 0 72 72 differences found Dataset: </g1/bitfield> and </g1/bitfield> +size [2] position bitfield bitfield difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Dataset: </g1/bitfield2D> and </g1/bitfield2D> +size [3x2] position bitfield2D bitfield2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -174,6 +180,7 @@ position bitfield2D bitfield2D difference [ 2 1 ] 6 0 6 6 differences found Dataset: </g1/bitfield3D> and </g1/bitfield3D> +size [4x3x2] position bitfield3D bitfield3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -202,6 +209,7 @@ position bitfield3D bitfield3D difference [ 3 2 1 ] 24 0 24 24 differences found Dataset: </g1/compound> and </g1/compound> +size [2] position compound compound difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -210,6 +218,7 @@ position compound compound difference [ 1 ] 4 0 4 4 differences found Dataset: </g1/compound2D> and </g1/compound2D> +size [3x2] position compound2D compound2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -226,6 +235,7 @@ position compound2D compound2D difference [ 2 1 ] 12 0 12 12 differences found Dataset: </g1/compound3D> and </g1/compound3D> +size [4x3x2] position compound3D compound3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -278,6 +288,7 @@ position compound3D compound3D difference [ 3 2 1 ] 48 0 48 48 differences found Dataset: </g1/enum> and </g1/enum> +size [2] position enum enum difference ------------------------------------------------------------ [ 0 ] RED GREEN @@ -289,12 +300,14 @@ Dataset: </g1/enum3D> and </g1/enum3D> </g1/enum3D> and </g1/enum3D> are empty datasets 0 differences found Dataset: </g1/float> and </g1/float> +size [2] position float float difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Dataset: </g1/float2D> and </g1/float2D> +size [3x2] position float2D float2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -305,6 +318,7 @@ position float2D float2D difference [ 2 1 ] 6 0 6 6 differences found Dataset: </g1/float3D> and </g1/float3D> +size [4x3x2] position float3D float3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -333,12 +347,14 @@ position float3D float3D difference [ 3 2 1 ] 24 0 24 24 differences found Dataset: </g1/integer> and </g1/integer> +size [2] position integer integer difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Dataset: </g1/integer2D> and </g1/integer2D> +size [3x2] position integer2D integer2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -349,6 +365,7 @@ position integer2D integer2D difference [ 2 1 ] 6 0 6 6 differences found Dataset: </g1/integer3D> and </g1/integer3D> +size [4x3x2] position integer3D integer3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -377,12 +394,14 @@ position integer3D integer3D difference [ 3 2 1 ] 24 0 24 24 differences found Dataset: </g1/opaque> and </g1/opaque> +size [2] position opaque opaque difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 2 differences found Dataset: </g1/opaque2D> and </g1/opaque2D> +size [3x2] position opaque2D opaque2D difference ------------------------------------------------------------ [ 0 0 ] 1 0 1 @@ -393,6 +412,7 @@ position opaque2D opaque2D difference [ 2 1 ] 6 0 6 6 differences found Dataset: </g1/opaque3D> and </g1/opaque3D> +size [4x3x2] position opaque3D opaque3D difference ------------------------------------------------------------ [ 0 0 0 ] 1 0 1 @@ -421,140 +441,173 @@ position opaque3D opaque3D difference [ 3 2 1 ] 24 0 24 24 differences found Dataset: </g1/reference> and </g1/reference> +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 4 differences found Dataset: </g1/reference2D> and </g1/reference2D> +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 12 differences found Dataset: </g1/reference3D> and </g1/reference3D> +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 +size [2] position difference ------------------------------------------------------------ [ 0 ] 1 0 1 [ 1 ] 2 0 2 48 differences found Dataset: </g1/string> and </g1/string> +size [2] position string string difference ------------------------------------------------------------ [ 0 ] a z @@ -563,6 +616,7 @@ position string string difference [ 1 ] e z 4 differences found Dataset: </g1/string2D> and </g1/string2D> +size [3x2] position string2D string2D difference ------------------------------------------------------------ [ 0 0 ] a z @@ -579,6 +633,7 @@ position string2D string2D difference [ 2 1 ] l z 12 differences found Dataset: </g1/string3D> and </g1/string3D> +size [4x3x2] position string3D string3D difference ------------------------------------------------------------ [ 0 0 0 ] a z @@ -630,6 +685,7 @@ position string3D string3D difference [ 3 2 1 ] Z z 47 differences found Dataset: </g1/vlen> and </g1/vlen> +size [2] position vlen vlen difference ------------------------------------------------------------ [ 0 ] 1 0 1 @@ -637,6 +693,7 @@ position vlen vlen difference [ 1 ] 3 0 3 3 differences found Dataset: </g1/vlen2D> and </g1/vlen2D> +size [3x2] position vlen2D vlen2D difference ------------------------------------------------------------ [ 0 1 ] 1 0 1 @@ -652,6 +709,7 @@ position vlen2D vlen2D difference [ 2 1 ] 11 0 11 11 differences found Dataset: </g1/vlen3D> and </g1/vlen3D> +size [4x3x2] position vlen3D vlen3D difference ------------------------------------------------------------ [ 0 0 1 ] 1 0 1 |