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

Merge pull request #627 from osae/update-equil-test

Browse Source 
Correcting the equil test.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-08-11 13:43:51 +02:00
commit 3f002ab6d8
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -170,7 +170,7 @@ list (APPEND TEST_SOURCE_FILES
tests/test_param.cpp tests/test_param.cpp
tests/test_blackoilfluid.cpp tests/test_blackoilfluid.cpp
tests/test_shadow.cpp tests/test_shadow.cpp
#tests/test_equil.cpp # 2014-07-08 Disabled due to breaking CI system tests/test_equil.cpp
tests/test_regionmapping.cpp tests/test_regionmapping.cpp
tests/test_units.cpp tests/test_units.cpp
tests/test_blackoilstate.cpp tests/test_blackoilstate.cpp

24
tests/test_equil.cpp
View File

@ -572,18 +572,18 @@ BOOST_AUTO_TEST_CASE (DeckWithLiveOil)
} }
const auto& rs = comp.rs(); const auto& rs = comp.rs();
const std::vector<double> rs_opm {74.612335679539058, 74.649052116644228, 74.685786561426298, 74.722539022717172, // opm const std::vector<double> rs_opm {74.61233568, 74.64905212, 74.68578656, 74.72253902, // opm
74.759309509353145, 74.796098030174733, 74.8329045940269, 74.869729209758916, 74.75930951, 74.79609803, 74.83290459, 74.87519876,
74.906571886224327, 75.090675116639048, 75.0, 75.0, 74.96925416, 75.09067512, 75.0, 75.0,
75.0, 75.0, 75.0, 75.0, 75.0, 75.0, 75.0, 75.0,
75.0, 75.0, 75.0, 75.0}; 75.0, 75.0, 75.0, 75.0};
const std::vector<double> rs_ecl {74.612228, 74.648956, 74.685707, 74.722473, // eclipse const std::vector<double> rs_ecl {74.612228, 74.648956, 74.685707, 74.722473, // eclipse
74.759254, 74.796051, 74.832870, 74.875145, 74.759254, 74.796051, 74.832870, 74.875145,
74.969231, 75.090706, 75.000000, 75.000000, 74.969231, 75.090706, 75.000000, 75.000000,
75.000000, 75.000000, 75.000000, 75.000000, 75.000000, 75.000000, 75.000000, 75.000000,
75.000000, 75.000000, 75.000000, 75.000000}; 75.000000, 75.000000, 75.000000, 75.000000};
for (size_t i = 0; i < rs_opm.size(); ++i) { for (size_t i = 0; i < rs_opm.size(); ++i) {
//std::cout << std::setprecision(10) << sats[phase][i] << '\n'; //std::cout << std::setprecision(10) << rs[i] << '\n';
BOOST_CHECK_CLOSE(rs[i], rs_opm[i], reltol); BOOST_CHECK_CLOSE(rs[i], rs_opm[i], reltol);
BOOST_CHECK_CLOSE(rs[i], rs_ecl[i], reltol_ecl); BOOST_CHECK_CLOSE(rs[i], rs_ecl[i], reltol_ecl);
} }
@ -736,11 +736,11 @@ BOOST_AUTO_TEST_CASE (DeckWithRSVDAndRVVD)
const auto& rs = comp.rs(); const auto& rs = comp.rs();
const std::vector<double> rs_opm { // opm const std::vector<double> rs_opm { // opm
74.624983020822540, 74.659590408801634, 74.694380353364522, 74.729353362649505, 74.62498302, 74.65959041, 74.69438035, 74.72935336,
74.764509945812975, 74.799850613032362, 74.835375875509555, 74.87108624547416, 74.76450995, 74.79985061, 74.83537588, 74.87527125,
74.906982236186707, 75.088917653469309, 52.5, 57.5, 74.96863769, 75.08891765, 52.5, 57.5,
62.5, 67.5, 72.5, 76.45954840804761, 62.5, 67.5, 72.5, 76.45954841,
76.70621044909619, 76.952877357524045, 77.199549133522638, 77.446225777283587}; 76.70621045, 76.95287736, 77.19954913, 77.44622578};
const std::vector<double> rs_ecl { // eclipse const std::vector<double> rs_ecl { // eclipse
74.625114, 74.659706, 74.694481, 74.729439, 74.625114, 74.659706, 74.694481, 74.729439,
@ -765,7 +765,7 @@ BOOST_AUTO_TEST_CASE (DeckWithRSVDAndRVVD)
0.82500002E-04, 0.87499997E-04, 0.92499999E-04, 0.97500000E-04}; 0.82500002E-04, 0.87499997E-04, 0.92499999E-04, 0.97500000E-04};
for (size_t i = 0; i < rv_opm.size(); ++i) { for (size_t i = 0; i < rv_opm.size(); ++i) {
//std::cout << std::setprecision(10) << sats[phase][i] << '\n'; //std::cout << std::setprecision(10) << rs[i] << '\n';
BOOST_CHECK_CLOSE(rs[i], rs_opm[i], 100*reltol); BOOST_CHECK_CLOSE(rs[i], rs_opm[i], 100*reltol);
BOOST_CHECK_CLOSE(rs[i], rs_ecl[i], reltol_ecl); BOOST_CHECK_CLOSE(rs[i], rs_ecl[i], reltol_ecl);
BOOST_CHECK_CLOSE(rv[i], rv_opm[i], 100.*reltol); BOOST_CHECK_CLOSE(rv[i], rv_opm[i], 100.*reltol);