OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3531 from vkip/compare_ecl_sign_deviation

Browse Source 
Calculate deviation such that different signs are accounted for.
This commit is contained in:
Markus Blatt
2023-05-25 12:17:15 +02:00
committed by GitHub
parent ca2dbd1c09 22b5d9a568
commit 69aaf44fd2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test_util/EclFilesComparator.cpp
View File

@@ -102,15 +102,13 @@ ECLFilesComparator::ECLFilesComparator(const std::string& basename1,
absTolerance(absToleranceArg), relTolerance(relToleranceArg) {
}
// Relative deviation > 1 indicates different signs of val1 and val2
Deviation ECLFilesComparator::calculateDeviations(double val1, double val2) {
val1 = std::abs(val1);
val2 = std::abs(val2);
Deviation deviation;
if (val1 != 0 || val2 != 0) {
deviation.abs = std::abs(val1 - val2);
if (val1 != 0 && val2 != 0) {
deviation.rel = deviation.abs/(std::max(val1, val2));
deviation.rel = deviation.abs/(std::max(std::abs(val1), std::abs(val2)));
}
}
return deviation;