diff --git a/opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.cpp b/opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.cpp index 0514dd3ca..096aa5fec 100644 --- a/opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.cpp +++ b/opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.cpp @@ -104,11 +104,11 @@ SatfuncConsistencyCheckManager(const std::size_t numSamplePoints, template bool Opm::Satfunc::PhaseChecks::SatfuncConsistencyCheckManager:: -anyFailedChecks() const +anyFailedStandardChecks() const { return std::any_of(this->curves_.begin(), this->curves_.end(), [](const auto& curve) - { return curve.checks.anyFailedChecks(); }); + { return curve.checks.anyFailedStandardChecks(); }); } template diff --git a/opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.hpp b/opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.hpp index 4641481b8..60c850a5e 100644 --- a/opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.hpp +++ b/opm/simulators/utils/satfunc/SatfuncConsistencyCheckManager.hpp @@ -141,7 +141,7 @@ namespace Opm::Satfunc::PhaseChecks { } /// Whether or not any checks failed at the \c Standard level. - bool anyFailedChecks() const; + bool anyFailedStandardChecks() const; /// Whether or not any checks failed at the \c Critical level. bool anyFailedCriticalChecks() const; diff --git a/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.cpp b/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.cpp index 86b19ea37..57f4abc01 100644 --- a/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.cpp +++ b/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.cpp @@ -162,7 +162,7 @@ collectFailures(const int root, } template -bool Opm::SatfuncConsistencyChecks::anyFailedChecks() const +bool Opm::SatfuncConsistencyChecks::anyFailedStandardChecks() const { return this->anyFailedChecks(ViolationLevel::Standard); } diff --git a/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp b/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp index 1c284350e..a02e35f1b 100644 --- a/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp +++ b/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp @@ -217,7 +217,7 @@ namespace Opm { void collectFailures(int root, const Parallel::Communication& comm); /// Whether or not any checks failed at the \c Standard level. - bool anyFailedChecks() const; + bool anyFailedStandardChecks() const; /// Whether or not any checks failed at the \c Critical level. bool anyFailedCriticalChecks() const; diff --git a/tests/test_SatfuncConsistencyCheckManager.cpp b/tests/test_SatfuncConsistencyCheckManager.cpp index acae3b7aa..56cf41be9 100644 --- a/tests/test_SatfuncConsistencyCheckManager.cpp +++ b/tests/test_SatfuncConsistencyCheckManager.cpp @@ -240,7 +240,7 @@ SWL checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -280,7 +280,7 @@ SWL checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -392,7 +392,7 @@ SWU checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -445,7 +445,7 @@ SWU checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -505,7 +505,7 @@ SWCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -545,7 +545,7 @@ SWCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -611,7 +611,7 @@ SGL checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -651,7 +651,7 @@ SGL checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -763,7 +763,7 @@ SGU checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -816,7 +816,7 @@ SGU checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -876,7 +876,7 @@ SGCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -916,7 +916,7 @@ SGCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -984,7 +984,7 @@ SWL checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(! checkMgr.anyFailedCriticalChecks(), "There must not be failed checks at the critical level"); @@ -1028,7 +1028,7 @@ SGCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(! checkMgr.anyFailedCriticalChecks(), "There must not be failed checks at the critical level"); @@ -1068,7 +1068,7 @@ SOWCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -1108,7 +1108,7 @@ SOWCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -1181,7 +1181,7 @@ SOGCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -1221,7 +1221,7 @@ SOGCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -1296,7 +1296,7 @@ SOWCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(! checkMgr.anyFailedCriticalChecks(), "There must not be any failed checks at the critical level"); @@ -1340,7 +1340,7 @@ SOWCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -1402,7 +1402,7 @@ SOGCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(! checkMgr.anyFailedCriticalChecks(), "There must not be any failed checks at the critical level"); @@ -1444,7 +1444,7 @@ SOGCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checkMgr.anyFailedStandardChecks(), "There must be failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -1527,7 +1527,7 @@ SOWCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); @@ -1577,7 +1577,7 @@ SOGCR checkMgr.collectFailuresTo(root) .run(grid.leafGridView(), [](const auto&) { return 0; }); - BOOST_CHECK_MESSAGE(! checkMgr.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checkMgr.anyFailedStandardChecks(), "There must not be any failed checks at the standard level"); BOOST_CHECK_MESSAGE(checkMgr.anyFailedCriticalChecks(), "There must be failed checks at the critical level"); diff --git a/tests/test_SatfuncConsistencyChecks.cpp b/tests/test_SatfuncConsistencyChecks.cpp index 269ad1587..918d40a70 100644 --- a/tests/test_SatfuncConsistencyChecks.cpp +++ b/tests/test_SatfuncConsistencyChecks.cpp @@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE(All_Good) checker.checkEndpoints(1234, makePoints()); - BOOST_CHECK_MESSAGE(! checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checker.anyFailedStandardChecks(), "There must be no failed checks"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(Standard_Violation) checker.checkEndpoints(1234, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); auto rpt = std::string{}; @@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE(Standard_Violation_ReportIJK) checker.checkEndpoints(1234, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); auto rpt = std::string{}; @@ -259,7 +259,7 @@ BOOST_AUTO_TEST_CASE(Critical_Violation) checker.checkEndpoints(42, makePoints()); - BOOST_CHECK_MESSAGE(! checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checker.anyFailedStandardChecks(), "There must be no failed standard level checks"); BOOST_CHECK_MESSAGE(checker.anyFailedCriticalChecks(), @@ -338,7 +338,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.checkEndpoints(1234, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); auto rpt = std::string{}; @@ -425,7 +425,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.checkEndpoints(1234, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); auto rpt = std::string{}; @@ -464,7 +464,7 @@ BOOST_AUTO_TEST_CASE(Standard_Multiple_Failing_Points) checker.checkEndpoints( 1618, makePoints()); checker.checkEndpoints(31415, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); auto rpt = std::string{}; @@ -651,7 +651,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.checkEndpoints(1234, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); auto rpt = std::string{}; @@ -732,7 +732,7 @@ BOOST_AUTO_TEST_CASE(Standard_Multiple_Failing_Points) checker.checkEndpoints( 1618, makePoints()); checker.checkEndpoints(31415, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); auto rpt = std::string{}; diff --git a/tests/test_SatfuncConsistencyChecks_parallel.cpp b/tests/test_SatfuncConsistencyChecks_parallel.cpp index a315495d7..a121122d8 100644 --- a/tests/test_SatfuncConsistencyChecks_parallel.cpp +++ b/tests/test_SatfuncConsistencyChecks_parallel.cpp @@ -189,7 +189,7 @@ BOOST_AUTO_TEST_CASE(All_Good) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(! checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checker.anyFailedStandardChecks(), "There must be no failed checks"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -293,7 +293,7 @@ BOOST_AUTO_TEST_CASE(Standard_Violation) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -341,7 +341,7 @@ BOOST_AUTO_TEST_CASE(Critical_Violation) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(! checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checker.anyFailedStandardChecks(), "There must be no failed standard level checks"); BOOST_CHECK_MESSAGE(checker.anyFailedCriticalChecks(), @@ -395,7 +395,7 @@ BOOST_AUTO_TEST_CASE(Standard_Violation) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -444,7 +444,7 @@ BOOST_AUTO_TEST_CASE(Critical_Violation) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(! checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checker.anyFailedStandardChecks(), "There must be no failed standard level checks"); BOOST_CHECK_MESSAGE(checker.anyFailedCriticalChecks(), @@ -499,7 +499,7 @@ BOOST_AUTO_TEST_CASE(Standard_Violation) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -549,7 +549,7 @@ BOOST_AUTO_TEST_CASE(Critical_Violation) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(! checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(! checker.anyFailedStandardChecks(), "There must be no failed standard level checks"); BOOST_CHECK_MESSAGE(checker.anyFailedCriticalChecks(), @@ -645,7 +645,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -699,7 +699,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -754,7 +754,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -856,7 +856,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -915,7 +915,7 @@ BOOST_AUTO_TEST_CASE(Standard_Multiple_Failing_Points) checker.checkEndpoints(rankMultiplier*(comm.rank() + 1) + 1618, makePoints()); checker.checkEndpoints(rankMultiplier*(comm.rank() + 1) + 31415, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -979,7 +979,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -1039,7 +1039,7 @@ BOOST_AUTO_TEST_CASE(Standard_Multiple_Failing_Points) checker.checkEndpoints(rankMultiplier*(comm.rank() + 1) + 1618, makePoints()); checker.checkEndpoints(rankMultiplier*(comm.rank() + 1) + 31415, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -1107,7 +1107,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -1168,7 +1168,7 @@ BOOST_AUTO_TEST_CASE(Standard_Multiple_Failing_Points) checker.checkEndpoints(rankMultiplier*(comm.rank() + 1) + 1618, makePoints()); checker.checkEndpoints(rankMultiplier*(comm.rank() + 1) + 31415, makePoints()); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -1381,7 +1381,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -1487,7 +1487,7 @@ BOOST_AUTO_TEST_CASE(Standard_Multiple_Failing_Points) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -1612,7 +1612,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -1722,7 +1722,7 @@ BOOST_AUTO_TEST_CASE(Standard_Multiple_Failing_Points) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -1863,7 +1863,7 @@ BOOST_AUTO_TEST_CASE(Standard) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(), @@ -1977,7 +1977,7 @@ BOOST_AUTO_TEST_CASE(Standard_Multiple_Failing_Points) checker.collectFailures(0, comm); - BOOST_CHECK_MESSAGE(checker.anyFailedChecks(), + BOOST_CHECK_MESSAGE(checker.anyFailedStandardChecks(), "There must be at least one failed check"); BOOST_CHECK_MESSAGE(! checker.anyFailedCriticalChecks(),