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

Bugfix in RsSatAtContact: use min(), not max().

Browse Source 
Also modified test to match output.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-02-27 14:57:38 +01:00 committed by Andreas Lauser
parent 1923de2694
commit b8d48a5fc8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/core/simulator/EquilibrationHelpers.hpp
View File

@ -300,7 +300,7 @@ namespace Opm
operator()(const double /* depth */, operator()(const double /* depth */,
const double press) const const double press) const
{ {
return std::max(satRs(press), rs_sat_contact_); return std::min(satRs(press), rs_sat_contact_);
} }
private: private:

6
tests/test_equil.cpp
View File

@ -499,9 +499,9 @@ BOOST_AUTO_TEST_CASE (DeckWithLiveOil)
// solver, and it is unclear if we should check it against // solver, and it is unclear if we should check it against
// the true answer or something else. // the true answer or something else.
const double reltol = 1.0e-6; const double reltol = 1.0e-6;
BOOST_CHECK_CLOSE(pressures[0][first] , 1.4551328443106037e7 , reltol); BOOST_CHECK_CLOSE(pressures[0][first], 1.4551302072306179e7, reltol);
BOOST_CHECK_CLOSE(pressures[0][last ] , 1.5501328443106037e7 , reltol); BOOST_CHECK_CLOSE(pressures[0][last], 1.5501302072306179e7, reltol);
BOOST_CHECK_CLOSE(pressures[1][last] , 1.5541598197355453e7 , reltol); BOOST_CHECK_CLOSE(pressures[1][last], 1.5538684664272346e7, reltol);
const auto& sats = comp.saturation(); const auto& sats = comp.saturation();
// std::cout << "Saturations:\n"; // std::cout << "Saturations:\n";