From b64aad457cb7cb620a60d824849f11607dff4f62 Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Wed, 6 Apr 2011 14:02:42 -0500 Subject: [svn-r20424] Purpose: Fixed Bug 2184 - GMQS: h5diff - incorrect calculation code for --use-system-epsilon option Description: Additional check in from the previous checkin r20384. Updated help page. Tested: jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE) --- tools/h5diff/h5diff_common.c | 3 ++- tools/h5diff/testfiles/h5diff_10.txt | 3 ++- tools/h5diff/testfiles/h5diff_600.txt | 3 ++- tools/h5diff/testfiles/h5diff_603.txt | 3 ++- tools/h5diff/testfiles/h5diff_606.txt | 3 ++- tools/h5diff/testfiles/h5diff_612.txt | 3 ++- tools/h5diff/testfiles/h5diff_615.txt | 3 ++- tools/h5diff/testfiles/h5diff_621.txt | 3 ++- tools/h5diff/testfiles/h5diff_622.txt | 3 ++- tools/h5diff/testfiles/h5diff_623.txt | 3 ++- tools/h5diff/testfiles/h5diff_624.txt | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c index e0af7f6..178f385 100644 --- a/tools/h5diff/h5diff_common.c +++ b/tools/h5diff/h5diff_common.c @@ -487,7 +487,8 @@ void usage(void) printf(" number.\n"); printf(" --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is\n"); printf(" a system epsilon value.\n"); - printf(" The system epsilon values are defined as below:\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(" --exclude-path \"path\" Exclude the specified path to an object when\n"); diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt index 8d6fc82..df2214e 100644 --- a/tools/h5diff/testfiles/h5diff_10.txt +++ b/tools/h5diff/testfiles/h5diff_10.txt @@ -62,7 +62,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt index e6e4607..bf77c21 100644 --- a/tools/h5diff/testfiles/h5diff_600.txt +++ b/tools/h5diff/testfiles/h5diff_600.txt @@ -62,7 +62,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt index 7b917d4..323e7f8 100644 --- a/tools/h5diff/testfiles/h5diff_603.txt +++ b/tools/h5diff/testfiles/h5diff_603.txt @@ -63,7 +63,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt index 110986a..67b80a8 100644 --- a/tools/h5diff/testfiles/h5diff_606.txt +++ b/tools/h5diff/testfiles/h5diff_606.txt @@ -63,7 +63,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt index 782f5b4..f80c005 100644 --- a/tools/h5diff/testfiles/h5diff_612.txt +++ b/tools/h5diff/testfiles/h5diff_612.txt @@ -63,7 +63,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt index f816510..eef45b5 100644 --- a/tools/h5diff/testfiles/h5diff_615.txt +++ b/tools/h5diff/testfiles/h5diff_615.txt @@ -63,7 +63,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt index 8dc8824..55d6256 100644 --- a/tools/h5diff/testfiles/h5diff_621.txt +++ b/tools/h5diff/testfiles/h5diff_621.txt @@ -63,7 +63,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt index f2f2089..a374dae 100644 --- a/tools/h5diff/testfiles/h5diff_622.txt +++ b/tools/h5diff/testfiles/h5diff_622.txt @@ -63,7 +63,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt index 840b127..adb6f99 100644 --- a/tools/h5diff/testfiles/h5diff_623.txt +++ b/tools/h5diff/testfiles/h5diff_623.txt @@ -63,7 +63,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt index 1d433a7..b5dbb7c 100644 --- a/tools/h5diff/testfiles/h5diff_624.txt +++ b/tools/h5diff/testfiles/h5diff_624.txt @@ -63,7 +63,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] number. --use-system-epsilon Print difference if (|a-b| > EPSILON), EPSILON is a system epsilon value. - The system epsilon values are defined as below: + 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 --exclude-path "path" Exclude the specified path to an object when -- cgit v0.12