OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-05 05:54:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix Lower Bound Conditions for Three Point Checks

Browse Source 
These are supposed to verify that the displacing saturation is
strictly between the critical and the maximum saturation values.
This commit is contained in:
Bård Skaflestad 2024-10-02 12:21:10 +02:00
parent 836e71cca0
commit 120b39a8f9
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/utils/satfunc/ThreePointHorizontalConsistencyChecks.cpp
View File

@ -51,7 +51,7 @@ testImpl(const EclEpsScalingPointsInfo<Scalar>& endPoints)
const auto sr = Scalar{1} - (this->sogcr_ + this->swl_);
const auto low = ! (this->swl_ < sr);
const auto low = ! (this->sgcr_ < sr);
const auto high = ! (sr < this->sgu_);
if (low || high) {
@ -86,7 +86,7 @@ testImpl(const EclEpsScalingPointsInfo<Scalar>& endPoints)
const auto sr = Scalar{1} - (this->sowcr_ + this->sgl_);
const auto low = ! (this->sgl_ < sr);
const auto low = ! (this->swcr_ < sr);
const auto high = ! (sr < this->swu_);
if (low || high) {

31
tests/test_ThreePointHorizontalSatfuncConsistencyChecks.cpp
View File

@ -92,6 +92,37 @@ BOOST_AUTO_TEST_CASE(All_Good)
BOOST_CHECK_MESSAGE(! check.isCritical(), "Test must not be violated at critical level");
}
BOOST_AUTO_TEST_CASE(All_Good_2)
{
auto check = Checks::DisplacingOil_GO<float>{};
constexpr auto expectNumExportedCheckValues = std::size_t{5};
{
auto endPoints = Opm::EclEpsScalingPointsInfo<float>{};
endPoints.Swl = 0.4f;
endPoints.Sgcr = 0.15f;
endPoints.Sogcr = 0.2f;
endPoints.Sgu = 0.6;
check.test(endPoints);
}
{
auto values = std::vector<float>(expectNumExportedCheckValues);
check.exportCheckValues(values.data());
BOOST_CHECK_CLOSE(values[0], 0.4f, 1.0e-6f);
BOOST_CHECK_CLOSE(values[1], 0.2f, 1.0e-6f);
BOOST_CHECK_CLOSE(values[2], 0.15f, 1.0e-6f);
BOOST_CHECK_CLOSE(values[3], 0.4f, 1.0e-5f);
BOOST_CHECK_CLOSE(values[4], 0.6f, 1.0e-6f);
}
BOOST_CHECK_MESSAGE(! check.isViolated(), "Test must not be violated");
BOOST_CHECK_MESSAGE(! check.isCritical(), "Test must not be violated at critical level");
}
BOOST_AUTO_TEST_CASE(Non_Finite)
{
// NaN