[svn-r20384] Purpose:

    Fixed Bug 2184 - GMQS: h5diff - incorrect calculation code for 
    --use-system-epsilon option

Description:
    Merged from HDF5 1.8 branch r20369.
    Fixed h5diff for --use-system-epsilon option: the calculation changed
    from ( |a - b| / b ) to ( |a - b| ). This was decided for better 
    performance and was corrected only in HDF5 trunk, so 1.8 got updated.
    Also comments for equal_XXX() function were updated correctly. 
    Also help page and RM got updated correctly.
    Also add test cases for testing the differences w/wo the option.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE)

19 files changed, 82 insertions, 108 deletions

diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index 0b354df..8d6fc82 100644
--- a/tools/h5diff/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
@@ -60,17 +60,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_101.txt b/tools/h5diff/testfiles/h5diff_101.txt
index 1d0f38d..f915439 100644
--- a/tools/h5diff/testfiles/h5diff_101.txt
+++ b/tools/h5diff/testfiles/h5diff_101.txt
@@ -2,9 +2,10 @@ dataset: </g1/d1> and </g1/d2>
 size:           [3x2]           [3x2]
 position        d1              d2              difference          
 ------------------------------------------------------------
-[ 0 1 ]          1e-09           2e-09           1e-09          
-[ 1 0 ]          1e-09           9e-10           1e-10          
-[ 1 1 ]          0               1e-09           1e-09          
-[ 2 0 ]          1e-09           0               1e-09          
-4 differences found
+[ 0 1 ]          1e-16           4e-16           3e-16          
+[ 1 0 ]          1e-16           2e-16           1e-16          
+[ 1 1 ]          0               1e-16           1e-16          
+[ 2 0 ]          3.3e-16         1e-16           2.3e-16        
+[ 2 1 ]          1e-16           0               1e-16          
+5 differences found
 EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_101w.txt b/tools/h5diff/testfiles/h5diff_101w.txt
index 59176a2..d1f49da 100755
--- a/tools/h5diff/testfiles/h5diff_101w.txt
+++ b/tools/h5diff/testfiles/h5diff_101w.txt
@@ -2,9 +2,10 @@ dataset: </g1/d1> and </g1/d2>
 size:           [3x2]           [3x2]

 position        d1              d2              difference          

 ------------------------------------------------------------

-[ 0 1 ]          1e-009          2e-009          1e-009         

-[ 1 0 ]          1e-009          9e-010          1e-010         

-[ 1 1 ]          0               1e-009          1e-009         

-[ 2 0 ]          1e-009          0               1e-009         

-4 differences found

+[ 0 1 ]          1e-016          4e-016          3e-016         

+[ 1 0 ]          1e-016          2e-016          1e-016         

+[ 1 1 ]          0               1e-016          1e-016         

+[ 2 0 ]          3.3e-016        1e-016          2.3e-016       

+[ 2 1 ]          1e-016          0               1e-016         

+5 differences found

 EXIT CODE: 1

diff --git a/tools/h5diff/testfiles/h5diff_102.txt b/tools/h5diff/testfiles/h5diff_102.txt
index 30a2491..476067b 100644
--- a/tools/h5diff/testfiles/h5diff_102.txt
+++ b/tools/h5diff/testfiles/h5diff_102.txt
@@ -2,9 +2,9 @@ dataset: </g1/fp1> and </g1/fp2>
 size:           [3x2]           [3x2]
 position        fp1             fp2             difference          
 ------------------------------------------------------------
-[ 0 1 ]          1e-05           2e-05           1e-05          
-[ 1 0 ]          1e-05           9e-06           9.99999e-07    
-[ 1 1 ]          0               1e-05           1e-05          
-[ 2 0 ]          1e-05           0               1e-05          
+[ 0 1 ]          1e-07           2e-07           1e-07          
+[ 1 0 ]          1e-07           3e-07           2e-07          
+[ 1 1 ]          2.2e-07         1e-07           1.2e-07        
+[ 2 0 ]          1e-07           0               1e-07          
 4 differences found
 EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_102w.txt b/tools/h5diff/testfiles/h5diff_102w.txt
index 36a254e..dda3581 100755
--- a/tools/h5diff/testfiles/h5diff_102w.txt
+++ b/tools/h5diff/testfiles/h5diff_102w.txt
@@ -2,9 +2,9 @@ dataset: </g1/fp1> and </g1/fp2>
 size:           [3x2]           [3x2]

 position        fp1             fp2             difference          

 ------------------------------------------------------------

-[ 0 1 ]          1e-005          2e-005          1e-005         

-[ 1 0 ]          1e-005          9e-006          9.99999e-007   

-[ 1 1 ]          0               1e-005          1e-005         

-[ 2 0 ]          1e-005          0               1e-005         

+[ 0 1 ]          1e-007          2e-007          1e-007         

+[ 1 0 ]          1e-007          3e-007          2e-007         

+[ 1 1 ]          2.2e-007        1e-007          1.2e-007       

+[ 2 0 ]          1e-007          0               1e-007         

 4 differences found

 EXIT CODE: 1

diff --git a/tools/h5diff/testfiles/h5diff_103.txt b/tools/h5diff/testfiles/h5diff_103.txt
new file mode 100644
index 0000000..5700459
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_103.txt
@@ -0,0 +1,8 @@
+dataset: </g1/d1> and </g1/d2>
+size:           [3x2]           [3x2]
+position        d1              d2              difference          
+------------------------------------------------------------
+[ 0 1 ]          1e-16           4e-16           3e-16          
+[ 2 0 ]          3.3e-16         1e-16           2.3e-16        
+2 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_103w.txt b/tools/h5diff/testfiles/h5diff_103w.txt
new file mode 100644
index 0000000..b1abea2
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_103w.txt
@@ -0,0 +1,8 @@
+dataset: </g1/d1> and </g1/d2>
+size:           [3x2]           [3x2]
+position        d1              d2              difference          
+------------------------------------------------------------
+[ 0 1 ]          1e-016          4e-016          3e-016         
+[ 2 0 ]          3.3e-016        1e-016          2.3e-016       
+2 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_104.txt b/tools/h5diff/testfiles/h5diff_104.txt
new file mode 100644
index 0000000..2997f10
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_104.txt
@@ -0,0 +1,8 @@
+dataset: </g1/fp1> and </g1/fp2>
+size:           [3x2]           [3x2]
+position        fp1             fp2             difference          
+------------------------------------------------------------
+[ 1 0 ]          1e-07           3e-07           2e-07          
+[ 1 1 ]          2.2e-07         1e-07           1.2e-07        
+2 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_104w.txt b/tools/h5diff/testfiles/h5diff_104w.txt
new file mode 100644
index 0000000..28ef705
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_104w.txt
@@ -0,0 +1,8 @@
+dataset: </g1/fp1> and </g1/fp2>
+size:           [3x2]           [3x2]
+position        fp1             fp2             difference          
+------------------------------------------------------------
+[ 1 0 ]          1e-007          3e-007          2e-007         
+[ 1 1 ]          2.2e-007        1e-007          1.2e-007       
+2 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index efc05a8..e6e4607 100644
--- a/tools/h5diff/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
@@ -60,17 +60,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index c66c650..7b917d4 100644
--- a/tools/h5diff/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
@@ -61,17 +61,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index 705ae3e..110986a 100644
--- a/tools/h5diff/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
@@ -61,17 +61,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index d38e9d4..782f5b4 100644
--- a/tools/h5diff/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -61,17 +61,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index 4b95ea1..f816510 100644
--- a/tools/h5diff/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
@@ -61,17 +61,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index 56ed724..8dc8824 100644
--- a/tools/h5diff/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -61,17 +61,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index 6e2db1b..f2f2089 100644
--- a/tools/h5diff/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
@@ -61,17 +61,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index 910f4f0..840b127 100644
--- a/tools/h5diff/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
@@ -61,17 +61,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index e301645..1d433a7 100644
--- a/tools/h5diff/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
@@ -61,17 +61,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
                            number.
    -p R, --relative=R      Print difference if (|(a-b)/b| > R), R is a positive
                            number.
-   --use-system-epsilon    Print difference if (|a-b| > EPSILON),
-                           where EPSILON (FLT_EPSILON or FLT_EPSILON) is the
-                           system epsilon value. 
-                           If the system epsilon is not defined, use the value
-                           below:
+   --use-system-epsilon    Print difference if (|a-b| > EPSILON), EPSILON is
+                           a system epsilon value.
+                           The system epsilon values are defined as below:
                                FLT_EPSILON = 1.19209E-07 for float
                                DBL_EPSILON = 2.22045E-16 for double
-                           -d, -p, and --use-system-epsilon options are used for
-                           comparing floating point values.
-                           By default, strict equality is used. Use -p or -d to
-                           set specific tolerance.
    --exclude-path "path"   Exclude the specified path to an object when
                            comparing files or groups. If a group is excluded,
                            all member objects will also be excluded.
diff --git a/tools/h5diff/testfiles/h5diff_basic1.h5 b/tools/h5diff/testfiles/h5diff_basic1.h5
index 4ed83c8..4f3cf9a 100644
--- a/tools/h5diff/testfiles/h5diff_basic1.h5
+++ b/tools/h5diff/testfiles/h5diff_basic1.h5