[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:

1 files changed, 10 insertions, 3 deletions

diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index 7ba5a6c..f9cb295 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -234,9 +234,6 @@ static int check_options(pack_opt_t *options)
 {
  int   i, k, j, has_cp=0, has_ck=0;
 
- unsigned szip_options_mask=H5_SZIP_NN_OPTION_MASK;
- unsigned szip_pixels_per_block;
-
 /*-------------------------------------------------------------------------
  * objects to layout
  *-------------------------------------------------------------------------
@@ -337,8 +334,17 @@ static int check_options(pack_opt_t *options)
    default:
     break;
    case H5Z_FILTER_SZIP:
+    {
+     
+    unsigned szip_options_mask=H5_SZIP_NN_OPTION_MASK;
+    unsigned szip_pixels_per_block;
 
     szip_pixels_per_block=pack.filter[j].cd_values[0];
+
+    if (pack.filter[j].szip_coding==0)
+     szip_options_mask=H5_SZIP_NN_OPTION_MASK;
+    else 
+     szip_options_mask=H5_SZIP_EC_OPTION_MASK;
     
     /* check szip parameters */
     if ( pack.chunk.rank!=-1 /* 
@@ -364,6 +370,7 @@ static int check_options(pack_opt_t *options)
 
     }
      
+    }
     break;
    } /* switch */