From 00b2dc91371db626740ec579c88bc7a852280701 Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Wed, 6 Apr 2011 15:59:37 -0500 Subject: [svn-r20427] Purpose: Fixed Bug 2184 - GMQS: h5diff - incorrect calculation code for --use-system-epsilon option Description: Additional check in from the previous checkin r20424. Updated help page again. Tested: jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE) --- tools/h5diff/h5diff_common.c | 6 +++--- tools/h5diff/testfiles/h5diff_10.txt | 6 +++--- tools/h5diff/testfiles/h5diff_600.txt | 6 +++--- tools/h5diff/testfiles/h5diff_603.txt | 6 +++--- tools/h5diff/testfiles/h5diff_606.txt | 6 +++--- tools/h5diff/testfiles/h5diff_612.txt | 6 +++--- tools/h5diff/testfiles/h5diff_615.txt | 6 +++--- tools/h5diff/testfiles/h5diff_621.txt | 6 +++--- tools/h5diff/testfiles/h5diff_622.txt | 6 +++--- tools/h5diff/testfiles/h5diff_623.txt | 6 +++--- tools/h5diff/testfiles/h5diff_624.txt | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c index 178f385..fd679d3 100644 --- a/tools/h5diff/h5diff_common.c +++ b/tools/h5diff/h5diff_common.c @@ -488,9 +488,9 @@ void usage(void) printf(" --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is\n"); printf(" a system epsilon value.\n"); printf(" If the system epsilon is not defined, the below\n"); - printf(" predefined value will be used:\n"); - printf(" FLT_EPSILON = 1.19209E-07 for float\n"); - printf(" DBL_EPSILON = 2.22045E-16 for double\n"); + printf(" one of the following predefined values will be used:\n"); + printf(" FLT_EPSILON = 1.19209E-07 for floating-point type\n"); + printf(" DBL_EPSILON = 2.22045E-16 for double percision type\n"); printf(" --exclude-path \"path\" Exclude the specified path to an object when\n"); printf(" comparing files or groups. If a group is excluded,\n"); printf(" all member objects will also be excluded.\n"); diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt index df2214e..fd13a5c 100644 --- a/tools/h5diff/testfiles/h5diff_10.txt +++ b/tools/h5diff/testfiles/h5diff_10.txt @@ -63,9 +63,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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_600.txt b/tools/h5diff/testfiles/h5diff_600.txt index bf77c21..ecf73d8 100644 --- a/tools/h5diff/testfiles/h5diff_600.txt +++ b/tools/h5diff/testfiles/h5diff_600.txt @@ -63,9 +63,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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 323e7f8..776c468 100644 --- a/tools/h5diff/testfiles/h5diff_603.txt +++ b/tools/h5diff/testfiles/h5diff_603.txt @@ -64,9 +64,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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 67b80a8..762698d 100644 --- a/tools/h5diff/testfiles/h5diff_606.txt +++ b/tools/h5diff/testfiles/h5diff_606.txt @@ -64,9 +64,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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 f80c005..c5b3464 100644 --- a/tools/h5diff/testfiles/h5diff_612.txt +++ b/tools/h5diff/testfiles/h5diff_612.txt @@ -64,9 +64,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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 eef45b5..58d5c70 100644 --- a/tools/h5diff/testfiles/h5diff_615.txt +++ b/tools/h5diff/testfiles/h5diff_615.txt @@ -64,9 +64,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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 55d6256..1c8f745 100644 --- a/tools/h5diff/testfiles/h5diff_621.txt +++ b/tools/h5diff/testfiles/h5diff_621.txt @@ -64,9 +64,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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 a374dae..22f216f 100644 --- a/tools/h5diff/testfiles/h5diff_622.txt +++ b/tools/h5diff/testfiles/h5diff_622.txt @@ -64,9 +64,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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 adb6f99..5dce69c 100644 --- a/tools/h5diff/testfiles/h5diff_623.txt +++ b/tools/h5diff/testfiles/h5diff_623.txt @@ -64,9 +64,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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 b5dbb7c..863e422 100644 --- a/tools/h5diff/testfiles/h5diff_624.txt +++ b/tools/h5diff/testfiles/h5diff_624.txt @@ -64,9 +64,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. If the system epsilon is not defined, the below - predefined value will be used: - FLT_EPSILON = 1.19209E-07 for float - DBL_EPSILON = 2.22045E-16 for double + one of the following predefined values will be used: + FLT_EPSILON = 1.19209E-07 for floating-point type + DBL_EPSILON = 2.22045E-16 for double percision type --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. -- cgit v0.12