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

Merge pull request #1781 from andlaus/adapt_to_checkDeck_changes

Browse Source 
also pass the parseContext and errorGuard to Opm::checkDeck()
This commit is contained in:
Joakim Hove 2019-04-05 12:07:40 +02:00 committed by GitHub
commit 63f6f34906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flow/flow.cpp
View File

@ -198,7 +198,7 @@ int main(int argc, char** argv)
Opm::MissingFeatures::checkKeywords(*deck, parseContext, errorGuard);
if ( outputCout )
Opm::checkDeck(*deck, parser);
Opm::checkDeck(*deck, parser, parseContext, errorGuard);
eclipseState.reset( new Opm::EclipseState(*deck, parseContext, errorGuard ));
schedule.reset(new Opm::Schedule(*deck, *eclipseState, parseContext, errorGuard));

4
tests/test_vfpproperties.cpp
View File

@ -648,11 +648,13 @@ BOOST_AUTO_TEST_CASE(ParseInterpolateRealisticVFPPROD)
{
auto units = Opm::UnitSystem::newMETRIC();
Opm::ParseContext parseContext;
Opm::ErrorGuard errorGuard;
Opm::Parser parser;
boost::filesystem::path file("VFPPROD2");
auto deck = parser.parseFile(file.string());
Opm::checkDeck(deck, parser);
Opm::checkDeck(deck, parser, parseContext, errorGuard);
BOOST_REQUIRE(deck.hasKeyword("VFPPROD"));
BOOST_CHECK_EQUAL(deck.count("VFPPROD"), 1);