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

Default error handler for WELLDIMS errors is exception

Browse Source
This commit is contained in:
Joakim Hove 2019-08-31 10:03:16 +02:00
parent 6b2aadaef7
commit dad13d2633
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/opm/parser/eclipse/Parser/ParseContext.cpp
View File

@ -82,10 +82,10 @@ namespace Opm {
addKey(UNIT_SYSTEM_MISMATCH, InputError::THROW_EXCEPTION);
this->addKey(RUNSPEC_NUMWELLS_TOO_LARGE, InputError::DELAYED_EXIT1);
this->addKey(RUNSPEC_CONNS_PER_WELL_TOO_LARGE, InputError::DELAYED_EXIT1);
this->addKey(RUNSPEC_NUMGROUPS_TOO_LARGE, InputError::DELAYED_EXIT1);
this->addKey(RUNSPEC_GROUPSIZE_TOO_LARGE, InputError::DELAYED_EXIT1);
this->addKey(RUNSPEC_NUMWELLS_TOO_LARGE, InputError::THROW_EXCEPTION);
this->addKey(RUNSPEC_CONNS_PER_WELL_TOO_LARGE, InputError::THROW_EXCEPTION);
this->addKey(RUNSPEC_NUMGROUPS_TOO_LARGE, InputError::THROW_EXCEPTION);
this->addKey(RUNSPEC_GROUPSIZE_TOO_LARGE, InputError::THROW_EXCEPTION);
addKey(UNSUPPORTED_SCHEDULE_GEO_MODIFIER, InputError::THROW_EXCEPTION);
addKey(UNSUPPORTED_COMPORD_TYPE, InputError::THROW_EXCEPTION);

31
tests/test_ArrayDimChecker.cpp
View File

@ -194,7 +194,7 @@ END
struct CaseObjects
{
explicit CaseObjects(const Opm::Deck& deck);
explicit CaseObjects(const Opm::Deck& deck, const Opm::ParseContext& ctxt);
~CaseObjects();
CaseObjects(const CaseObjects& rhs) = default;
@ -204,17 +204,16 @@ struct CaseObjects
CaseObjects& operator=(CaseObjects&& rhs) = default;
Opm::ErrorGuard guard;
Opm::ParseContext ctxt;
Opm::EclipseState es;
Opm::Schedule sched;
};
CaseObjects::CaseObjects(const Opm::Deck& deck)
CaseObjects::CaseObjects(const Opm::Deck& deck, const Opm::ParseContext& ctxt)
: guard{}
, ctxt {}
, es (deck, ctxt, guard)
, sched(deck, es, ctxt, guard)
{}
{
}
CaseObjects::~CaseObjects()
{
@ -247,7 +246,8 @@ BOOST_AUTO_TEST_SUITE(WellDimensions)
BOOST_AUTO_TEST_CASE(MaxGroupSize)
{
auto cse = CaseObjects{ simCaseWellDims() };
Opm::ParseContext parseContext;
auto cse = CaseObjects{ simCaseWellDims(), parseContext };
// Verify at most ten wells in a single group.
BOOST_CHECK_EQUAL(Opm::maxGroupSize(cse.sched, 1), 10);
@ -255,13 +255,27 @@ BOOST_AUTO_TEST_CASE(MaxGroupSize)
BOOST_AUTO_TEST_CASE(WellDims)
{
auto cse = CaseObjects{ simCaseWellDims() };
Opm::ParseContext parseContext;
parseContext.update(Opm::ParseContext::RUNSPEC_NUMWELLS_TOO_LARGE, Opm::InputError::THROW_EXCEPTION);
parseContext.update(Opm::ParseContext::RUNSPEC_CONNS_PER_WELL_TOO_LARGE, Opm::InputError::THROW_EXCEPTION);
parseContext.update(Opm::ParseContext::RUNSPEC_NUMGROUPS_TOO_LARGE, Opm::InputError::THROW_EXCEPTION);
parseContext.update(Opm::ParseContext::RUNSPEC_GROUPSIZE_TOO_LARGE, Opm::InputError::THROW_EXCEPTION);
auto cse = CaseObjects{ simCaseWellDims(), parseContext};
// There should be no failures in basic input layer
BOOST_CHECK(!cse.guard);
BOOST_CHECK_THROW( Opm::checkConsistentArrayDimensions(cse.es , cse.sched,
parseContext, cse.guard),
std::invalid_argument);
parseContext.update(Opm::ParseContext::RUNSPEC_NUMWELLS_TOO_LARGE, Opm::InputError::DELAYED_EXIT1);
parseContext.update(Opm::ParseContext::RUNSPEC_CONNS_PER_WELL_TOO_LARGE, Opm::InputError::DELAYED_EXIT1);
parseContext.update(Opm::ParseContext::RUNSPEC_NUMGROUPS_TOO_LARGE, Opm::InputError::DELAYED_EXIT1);
parseContext.update(Opm::ParseContext::RUNSPEC_GROUPSIZE_TOO_LARGE, Opm::InputError::DELAYED_EXIT1);
Opm::checkConsistentArrayDimensions(cse.es , cse.sched,
cse.ctxt, cse.guard);
parseContext, cse.guard);
// There *should* be errors from dimension checking
BOOST_CHECK(cse.guard);
@ -277,4 +291,5 @@ BOOST_AUTO_TEST_CASE(WellDims)
}
}
BOOST_AUTO_TEST_SUITE_END()