philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFFV-9994 port changes from develop.

Browse Source 
CMake folder changes brought up to standard.
This commit is contained in:
Allen Byrne
2017-01-18 14:05:25 -06:00
parent d5f8bca8b6
commit 35f0e16e34
51 changed files with 2524 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tools/lib/h5diff_dset.c
View File

@@ -71,9 +71,7 @@ hsize_t diff_dataset( hid_t file1_id,
if((dcpl1 = H5Dget_create_plist(did1)) < 0)
goto error;
if((dcpl2 = H5Dget_create_plist(did2)) < 0)
{
goto error;
}
/*-------------------------------------------------------------------------
* check if the dataset creation property list has filters that
@@ -91,6 +89,9 @@ hsize_t diff_dataset( hid_t file1_id,
obj2_name,
options);
}
else
goto error;
/*-------------------------------------------------------------------------
* close
*-------------------------------------------------------------------------
@@ -324,7 +325,7 @@ hsize_t diff_datasetid( hid_t did1,
parallel_print("Not comparable: <%s> has sign %s ", obj1_name, get_sign(sign1));
parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
}
can_compare=0;
options->not_cmp=1;
}
@@ -676,31 +677,30 @@ int diff_can_type( hid_t f_tid1, /* file data type */
HDassert(tclass1==tclass2);
switch (tclass1)
{
case H5T_INTEGER:
case H5T_FLOAT:
case H5T_COMPOUND:
case H5T_STRING:
case H5T_ARRAY:
case H5T_BITFIELD:
case H5T_OPAQUE:
case H5T_ENUM:
case H5T_VLEN:
case H5T_REFERENCE:
case H5T_TIME:
if ( (options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name) {
parallel_print("Not comparable: <%s> and <%s> are of class %s\n",
obj1_name,obj2_name,get_class(tclass2) );
} /* end if */
can_compare = 0;
options->not_cmp = 1;
return can_compare;
break;
default: /*H5T_TIME */
if ( (options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name)
{
parallel_print("Not comparable: <%s> and <%s> are of class %s\n",
obj1_name,obj2_name,get_class(tclass2) );
}
can_compare = 0;
options->not_cmp = 1;
return can_compare;
}
case H5T_INTEGER:
case H5T_FLOAT:
case H5T_COMPOUND:
case H5T_STRING:
case H5T_ARRAY:
case H5T_BITFIELD:
case H5T_OPAQUE:
case H5T_ENUM:
case H5T_VLEN:
case H5T_REFERENCE:
case H5T_NO_CLASS:
case H5T_NCLASSES:
default:
break;
} /* end switch */
/*-------------------------------------------------------------------------
* check for equal file datatype; warning only