OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #763 from joakim-hove/master

Browse Source 
Fixup from bug in ert comparison code.
This commit is contained in:
Joakim Hove 2016-07-19 07:54:24 +02:00 committed by GitHub
commit e7213411de
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/compare_INIT.py
View File

@ -15,8 +15,8 @@ def compare_files( flow_file , ref_file , kw_list):
flow_kw = flow[kw][0]
ref_kw = ref[kw][0]
if not flow_kw.equal_numeric( ref_kw , epsilon = 1e-3 ):
sys.exit("Keyword:%s was different in flow simulation and reference")
if not flow_kw.equal_numeric( ref_kw , abs_epsilon = 0 , rel_epsilon = 1e-2):
sys.exit("Keyword:%s was different in flow simulation and reference" % kw)

7
tests/test_restart.cpp
View File

@ -42,11 +42,10 @@ BOOST_AUTO_TEST_CASE(CompareRestartFileResults)
const std::string& filename1 = boost::unit_test::framework::master_test_suite().argv[1];
const std::string& filename2 = boost::unit_test::framework::master_test_suite().argv[2];
int last_report_step = std::atoi(boost::unit_test::framework::master_test_suite().argv[3]);
const double abs_diff = 1e-3;
const double abs_diff = 0; // An absoulute value of 0 means that *only* the relative difference is used in the comparison.
std::map<std::string, double> relative_diffs;
relative_diffs["SWAT"] = 0.0005; //0.05 %
relative_diffs["SGAS"] = 0.0005;
relative_diffs["SGAS"] = 0.0010;
relative_diffs["RS"] = 0.0001; //0.01 %
relative_diffs["RV"] = 0.0001;
relative_diffs["PRESSURE"] = 0.0001;
@ -69,7 +68,7 @@ BOOST_AUTO_TEST_CASE(CompareRestartFileResults)
ecl_kw_type * kw_1 = ecl_file_iget_named_kw( file1 , key , 0);
ecl_kw_type * kw_2 = ecl_file_iget_named_kw( file2 , key , 0);
bool numeric_equal = ecl_kw_numeric_equal(kw_1, kw_2, abs_diff , relative_diffs[key]);
bool numeric_equal = ecl_kw_numeric_equal(kw_1, kw_2, abs_diff , relative_diffs[key]);
if (numeric_equal) {
std::cout << " Restart results for " << key << " compared ok" << std::endl;
} else {