[svn-r8904] Purpose:
h5diff and h5repack changes
Description:
h5diff
introduced the following four modes of output:
Normal mode: print the number of differences found and where they occured
Report mode: print the above plus the differences
Verbose mode: print the above plus a list of objects and warnings
Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
h5repack
added an extra parameter for SZIP filter (coding method)
the new syntax is
-f SZIP=<pixels per block,coding>
(pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN')
Example of use:
./h5repack -i file1 -o file2 -f SZIP=8,NN -v
updated usage messages, test scripts and files accordingly
Solution:
Platforms tested:
linux
AIX
solaris
Misc. update:
This commit is contained in:
@@ -602,37 +602,6 @@ static void write_dset_in(hid_t loc_id,
|
||||
write_dset(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83);
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* Function: write_null_dset
|
||||
*
|
||||
* Purpose: write null dataset in LOC_ID
|
||||
*
|
||||
* Programmer: Raymond Lu, slu@ncsa.uiuc.edu
|
||||
*
|
||||
* Date: May 24, 2004
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
static void write_null_dset(hid_t loc_id, int make_diffs)
|
||||
{
|
||||
hid_t sid, dset_id;
|
||||
int val = 2;
|
||||
double dval = 7.8;
|
||||
|
||||
/* Create the null dataset */
|
||||
sid = H5Screate(H5S_NULL);
|
||||
if(make_diffs) {
|
||||
dset_id = H5Dcreate(loc_id,"null_dset",H5T_NATIVE_INT,sid,H5P_DEFAULT);
|
||||
H5Dwrite(dset_id,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,&val);
|
||||
} else {
|
||||
dset_id = H5Dcreate(loc_id,"null_dset",H5T_NATIVE_DOUBLE,sid,H5P_DEFAULT);
|
||||
H5Dwrite(dset_id,H5T_NATIVE_DOUBLE,H5S_ALL,H5S_ALL,H5P_DEFAULT,&dval);
|
||||
}
|
||||
|
||||
/* Close */
|
||||
H5Dclose(dset_id);
|
||||
H5Sclose(sid);
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
* Check all HDF5 classes
|
||||
@@ -641,6 +610,8 @@ static void write_null_dset(hid_t loc_id, int make_diffs)
|
||||
* H5T_ENUM, H5T_VLEN, H5T_ARRAY
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
int test_dsetall(const char *file,
|
||||
int make_diffs /* flag to modify data buffers */)
|
||||
{
|
||||
@@ -677,7 +648,6 @@ int test_dsetall(const char *file,
|
||||
*/
|
||||
|
||||
write_dset_in(group_id,"/dset",file_id,make_diffs);
|
||||
write_null_dset(file_id, make_diffs);
|
||||
|
||||
/* Close */
|
||||
status = H5Dclose(dset_id);
|
||||
@@ -690,3 +660,6 @@ int test_dsetall(const char *file,
|
||||
assert(status>=0);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user