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

Add ErrorGuard argument when parsing

Browse Source
This commit is contained in:
Joakim Hove
2019-01-07 10:04:44 +01:00
parent 227c0eab90
commit c8564cfad3
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ebos/eclbasevanguard.hh
View File

@@ -33,6 +33,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp> #include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/checkDeck.hpp> #include <opm/parser/eclipse/EclipseState/checkDeck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
@@ -211,6 +212,7 @@ public:
tmp.emplace_back(Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputError::WARN); tmp.emplace_back(Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputError::WARN);
tmp.emplace_back(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN); tmp.emplace_back(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN);
Opm::ParseContext parseContext(tmp); Opm::ParseContext parseContext(tmp);
Opm::ErrorGuard errorGuard;
const std::string ignoredKeywords = EWOMS_GET_PARAM(TypeTag, std::string, IgnoreKeywords); const std::string ignoredKeywords = EWOMS_GET_PARAM(TypeTag, std::string, IgnoreKeywords);
if (ignoredKeywords.size() > 0) { if (ignoredKeywords.size() > 0) {
@@ -231,8 +233,8 @@ public:
std::cout << "Reading the deck file '" << fileName << "'" << std::endl; std::cout << "Reading the deck file '" << fileName << "'" << std::endl;
Opm::Parser parser; Opm::Parser parser;
internalDeck_.reset(new Opm::Deck(parser.parseFile(fileName , parseContext))); internalDeck_.reset(new Opm::Deck(parser.parseFile(fileName , parseContext, errorGuard)));
internalEclState_.reset(new Opm::EclipseState(*internalDeck_, parseContext)); internalEclState_.reset(new Opm::EclipseState(*internalDeck_, parseContext, errorGuard));
deck_ = &(*internalDeck_); deck_ = &(*internalDeck_);
eclState_ = &(*internalEclState_); eclState_ = &(*internalEclState_);
@@ -249,7 +251,7 @@ public:
// create the schedule object. Note that if eclState is supposed to represent // create the schedule object. Note that if eclState is supposed to represent
// the internalized version of the deck, this constitutes a layering // the internalized version of the deck, this constitutes a layering
// violation. // violation.
internalEclSchedule_.reset(new Opm::Schedule(*deck_, *eclState_, parseContext)); internalEclSchedule_.reset(new Opm::Schedule(*deck_, *eclState_, parseContext, errorGuard));
eclSchedule_ = &(*internalEclSchedule_); eclSchedule_ = &(*internalEclSchedule_);
} }
else else
@@ -262,13 +264,21 @@ public:
internalEclSummaryConfig_.reset(new Opm::SummaryConfig(*deck_, internalEclSummaryConfig_.reset(new Opm::SummaryConfig(*deck_,
*eclSchedule_, *eclSchedule_,
eclState_->getTableManager(), eclState_->getTableManager(),
parseContext)); parseContext,
errorGuard));
eclSummaryConfig_ = &(*internalEclSummaryConfig_); eclSummaryConfig_ = &(*internalEclSummaryConfig_);
} }
else else
eclSummaryConfig_ = externalEclSummaryConfig_; eclSummaryConfig_ = externalEclSummaryConfig_;
if (errorGuard) {
errorGuard.dump();
errorGuard.clear();
throw std::runtime_error("Unrecoverable errors were encountered while loading input.");
}
// Possibly override IOConfig setting for how often RESTART files should get // Possibly override IOConfig setting for how often RESTART files should get
// written to disk (every N report step) // written to disk (every N report step)
int outputInterval = EWOMS_GET_PARAM(TypeTag, int, EclOutputInterval); int outputInterval = EWOMS_GET_PARAM(TypeTag, int, EclOutputInterval);