[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, 73 insertions, 1 deletions

diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt
index 0bdf1ee..420b2dc 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/testfiles/h5diff_80.txt
@@ -1,10 +1,48 @@
 #############################
-Expected output for 'h5diff file7.h5 file8.h5'
+Expected output for 'h5diff file7.h5 file8.h5 -v'
 #############################
+
+file1     file2
+---------------------------------------
+    x      x    /dset          
+    x      x    /g1            
+    x      x    /g1/array      
+    x      x    /g1/array2D    
+    x      x    /g1/array3D    
+    x      x    /g1/bitfield   
+    x      x    /g1/bitfield2D 
+    x      x    /g1/bitfield3D 
+    x      x    /g1/compound   
+    x      x    /g1/compound2D 
+    x      x    /g1/compound3D 
+    x      x    /g1/enum       
+    x      x    /g1/enum2D     
+    x      x    /g1/enum3D     
+    x      x    /g1/float      
+    x      x    /g1/float2D    
+    x      x    /g1/float3D    
+    x      x    /g1/integer    
+    x      x    /g1/integer2D  
+    x      x    /g1/integer3D  
+    x      x    /g1/opaque     
+    x      x    /g1/opaque2D   
+    x      x    /g1/opaque3D   
+    x      x    /g1/reference  
+    x      x    /g1/reference2D
+    x      x    /g1/reference3D
+    x      x    /g1/string     
+    x      x    /g1/string2D   
+    x      x    /g1/string3D   
+    x      x    /g1/vlen       
+    x      x    /g1/vlen2D     
+    x      x    /g1/vlen3D     
+
 position        dset            dset            difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+Dataset:     </dset> and </dset>
+Group:       </g1> and </g1>
 position        array           array           difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
@@ -13,6 +51,7 @@ position        array           array           difference
 [ 1 ]          4               0               4              
 [ 1 ]          5               0               5              
 [ 1 ]          6               0               6              
+Dataset:     </g1/array> and </g1/array>
 position        array2D         array2D         difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -33,6 +72,7 @@ position        array2D         array2D         difference
 [ 2 1 ]          16              0               16             
 [ 2 1 ]          17              0               17             
 [ 2 1 ]          18              0               18             
+Dataset:     </g1/array2D> and </g1/array2D>
 position        array3D         array3D         difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -107,10 +147,12 @@ position        array3D         array3D         difference
 [ 3 2 1 ]          70              0               70             
 [ 3 2 1 ]          71              0               71             
 [ 3 2 1 ]          72              0               72             
+Dataset:     </g1/array3D> and </g1/array3D>
 position        bitfield        bitfield        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+Dataset:     </g1/bitfield> and </g1/bitfield>
 position        bitfield2D      bitfield2D      difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -119,6 +161,7 @@ position        bitfield2D      bitfield2D      difference
 [ 1 1 ]          4               0               4              
 [ 2 0 ]          5               0               5              
 [ 2 1 ]          6               0               6              
+Dataset:     </g1/bitfield2D> and </g1/bitfield2D>
 position        bitfield3D      bitfield3D      difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -145,12 +188,14 @@ position        bitfield3D      bitfield3D      difference
 [ 3 1 1 ]          22              0               22             
 [ 3 2 0 ]          23              0               23             
 [ 3 2 1 ]          24              0               24             
+Dataset:     </g1/bitfield3D> and </g1/bitfield3D>
 position        compound        compound        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 0 ]          2.000000        0.000000        2.000000       
 [ 1 ]          3               0               3              
 [ 1 ]          4.000000        0.000000        4.000000       
+Dataset:     </g1/compound> and </g1/compound>
 position        compound2D      compound2D      difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -165,6 +210,7 @@ position        compound2D      compound2D      difference
 [ 2 0 ]          10.000000       0.000000        10.000000      
 [ 2 1 ]          11              0               11             
 [ 2 1 ]          12.000000       0.000000        12.000000      
+Dataset:     </g1/compound2D> and </g1/compound2D>
 position        compound3D      compound3D      difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -215,13 +261,20 @@ position        compound3D      compound3D      difference
 [ 3 2 0 ]          46.000000       0.000000        46.000000      
 [ 3 2 1 ]          47              0               47             
 [ 3 2 1 ]          48.000000       0.000000        48.000000      
+Dataset:     </g1/compound3D> and </g1/compound3D>
 position        enum            enum            difference          
 ------------------------------------------------------------
 [ 0 ]          RED              GREEN            
+Dataset:     </g1/enum> and </g1/enum>
+</g1/enum2D> and </g1/enum2D> are empty datasets
+Dataset:     </g1/enum2D> and </g1/enum2D>
+</g1/enum3D> and </g1/enum3D> are empty datasets
+Dataset:     </g1/enum3D> and </g1/enum3D>
 position        float           float           difference          
 ------------------------------------------------------------
 [ 0 ]          1.000000        0.000000        1.000000       
 [ 1 ]          2.000000        0.000000        2.000000       
+Dataset:     </g1/float> and </g1/float>
 position        float2D         float2D         difference          
 ------------------------------------------------------------
 [ 0 0 ]          1.000000        0.000000        1.000000       
@@ -230,6 +283,7 @@ position        float2D         float2D         difference
 [ 1 1 ]          4.000000        0.000000        4.000000       
 [ 2 0 ]          5.000000        0.000000        5.000000       
 [ 2 1 ]          6.000000        0.000000        6.000000       
+Dataset:     </g1/float2D> and </g1/float2D>
 position        float3D         float3D         difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1.000000        0.000000        1.000000       
@@ -256,10 +310,12 @@ position        float3D         float3D         difference
 [ 3 1 1 ]          22.000000       0.000000        22.000000      
 [ 3 2 0 ]          23.000000       0.000000        23.000000      
 [ 3 2 1 ]          24.000000       0.000000        24.000000      
+Dataset:     </g1/float3D> and </g1/float3D>
 position        integer         integer         difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+Dataset:     </g1/integer> and </g1/integer>
 position        integer2D       integer2D       difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -268,6 +324,7 @@ position        integer2D       integer2D       difference
 [ 1 1 ]          4               0               4              
 [ 2 0 ]          5               0               5              
 [ 2 1 ]          6               0               6              
+Dataset:     </g1/integer2D> and </g1/integer2D>
 position        integer3D       integer3D       difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -294,10 +351,12 @@ position        integer3D       integer3D       difference
 [ 3 1 1 ]          22              0               22             
 [ 3 2 0 ]          23              0               23             
 [ 3 2 1 ]          24              0               24             
+Dataset:     </g1/integer3D> and </g1/integer3D>
 position        opaque          opaque          difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+Dataset:     </g1/opaque> and </g1/opaque>
 position        opaque2D        opaque2D        difference          
 ------------------------------------------------------------
 [ 0 0 ]          1               0               1              
@@ -306,6 +365,7 @@ position        opaque2D        opaque2D        difference
 [ 1 1 ]          4               0               4              
 [ 2 0 ]          5               0               5              
 [ 2 1 ]          6               0               6              
+Dataset:     </g1/opaque2D> and </g1/opaque2D>
 position        opaque3D        opaque3D        difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          1               0               1              
@@ -332,6 +392,7 @@ position        opaque3D        opaque3D        difference
 [ 3 1 1 ]          22              0               22             
 [ 3 2 0 ]          23              0               23             
 [ 3 2 1 ]          24              0               24             
+Dataset:     </g1/opaque3D> and </g1/opaque3D>
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
@@ -340,6 +401,7 @@ position                                        difference
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+Dataset:     </g1/reference> and </g1/reference>
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
@@ -364,6 +426,7 @@ position                                        difference
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+Dataset:     </g1/reference2D> and </g1/reference2D>
 position                                        difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
@@ -460,12 +523,14 @@ position                                        difference
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
+Dataset:     </g1/reference3D> and </g1/reference3D>
 position        string          string          difference          
 ------------------------------------------------------------
 [ 0 ]          a                z                
 [ 0 ]          b                z                
 [ 1 ]          d                z                
 [ 1 ]          e                z                
+Dataset:     </g1/string> and </g1/string>
 position        string2D        string2D        difference          
 ------------------------------------------------------------
 [ 0 0 ]          a                z                
@@ -480,6 +545,7 @@ position        string2D        string2D        difference
 [ 2 0 ]          j                z                
 [ 2 1 ]          k                z                
 [ 2 1 ]          l                z                
+Dataset:     </g1/string2D> and </g1/string2D>
 position        string3D        string3D        difference          
 ------------------------------------------------------------
 [ 0 0 0 ]          a                z                
@@ -529,11 +595,13 @@ position        string3D        string3D        difference
 [ 3 2 0 ]          W                z                
 [ 3 2 1 ]          X                z                
 [ 3 2 1 ]          Z                z                
+Dataset:     </g1/string3D> and </g1/string3D>
 position        vlen            vlen            difference          
 ------------------------------------------------------------
 [ 0 ]          1               0               1              
 [ 1 ]          2               0               2              
 [ 1 ]          3               0               3              
+Dataset:     </g1/vlen> and </g1/vlen>
 position        vlen2D          vlen2D          difference          
 ------------------------------------------------------------
 [ 0 1 ]          1               0               1              
@@ -547,6 +615,7 @@ position        vlen2D          vlen2D          difference
 [ 2 1 ]          9               0               9              
 [ 2 1 ]          10              0               10             
 [ 2 1 ]          11              0               11             
+Dataset:     </g1/vlen2D> and </g1/vlen2D>
 position        vlen3D          vlen3D          difference          
 ------------------------------------------------------------
 [ 0 0 1 ]          1               0               1              
@@ -608,3 +677,6 @@ position        vlen3D          vlen3D          difference
 [ 3 2 1 ]          57              0               57             
 [ 3 2 1 ]          58              0               58             
 [ 3 2 1 ]          59              0               59             
+Dataset:     </g1/vlen3D> and </g1/vlen3D>
+Group:       </> and </>
+491 differences found