Merge pull request #2112 from joakim-hove/alternative-parsecontext-init

Pass ParseContext settings in constructor
This commit is contained in:
Joakim Hove 2019-10-30 07:39:56 +01:00 committed by GitHub
commit 0eee2c37e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -324,7 +324,10 @@ int main(int argc, char** argv)
std::shared_ptr<Opm::SummaryConfig> summaryConfig; std::shared_ptr<Opm::SummaryConfig> summaryConfig;
{ {
Opm::Parser parser; Opm::Parser parser;
Opm::ParseContext parseContext; Opm::ParseContext parseContext({{Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputError::IGNORE},
{Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputError::WARN},
{Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputError::WARN},
{Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN}});
Opm::ErrorGuard errorGuard; Opm::ErrorGuard errorGuard;
outputMode = setupLogging(mpiRank, outputMode = setupLogging(mpiRank,
deckFilename, deckFilename,
@ -334,12 +337,6 @@ int main(int argc, char** argv)
if (EWOMS_GET_PARAM(PreTypeTag, bool, EclStrictParsing)) if (EWOMS_GET_PARAM(PreTypeTag, bool, EclStrictParsing))
parseContext.update( Opm::InputError::DELAYED_EXIT1); parseContext.update( Opm::InputError::DELAYED_EXIT1);
else {
parseContext.update(Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputError::IGNORE);
parseContext.update(Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputError::WARN);
parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputError::WARN);
parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN);
}
Opm::FlowMainEbos<PreTypeTag>::printPRTHeader(outputCout); Opm::FlowMainEbos<PreTypeTag>::printPRTHeader(outputCout);