mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-09-05 04:40:19 -05:00
readDeck: make the ErrorGuard an internal detail
This commit is contained in:
@@ -515,7 +515,7 @@ private:
|
||||
|
||||
readDeck(EclGenericVanguard::comm(), deckFilename, eclipseState_,
|
||||
schedule_, udqState_, actionState_, wtestState_,
|
||||
summaryConfig_, nullptr, python, strictParsing,
|
||||
summaryConfig_, python, strictParsing,
|
||||
init_from_restart_file, outputCout_, outputInterval);
|
||||
|
||||
verifyValidCellGeometry(EclGenericVanguard::comm(), *this->eclipseState_);
|
||||
|
||||
@@ -487,16 +487,13 @@ void Opm::readDeck(Opm::Parallel::Communication comm,
|
||||
std::unique_ptr<Action::State>& actionState,
|
||||
std::unique_ptr<WellTestState>& wtestState,
|
||||
std::shared_ptr<SummaryConfig>& summaryConfig,
|
||||
std::unique_ptr<ErrorGuard> errorGuard,
|
||||
std::shared_ptr<Python> python,
|
||||
const bool strictParsing,
|
||||
const bool initFromRestart,
|
||||
const bool checkDeck,
|
||||
const std::optional<int>& outputInterval)
|
||||
{
|
||||
if (errorGuard == nullptr) {
|
||||
errorGuard = std::make_unique<ErrorGuard>();
|
||||
}
|
||||
auto errorGuard = std::make_unique<ErrorGuard>();
|
||||
|
||||
int parseSuccess = 1; // > 0 is success
|
||||
std::string failureMessage;
|
||||
|
||||
@@ -84,7 +84,6 @@ void readDeck(Parallel::Communication comm,
|
||||
std::unique_ptr<Action::State>& actionState,
|
||||
std::unique_ptr<WellTestState>& wtestState,
|
||||
std::shared_ptr<SummaryConfig>& summaryConfig,
|
||||
std::unique_ptr<ErrorGuard> errorGuard,
|
||||
std::shared_ptr<Python> python,
|
||||
bool strictParsing,
|
||||
bool initFromRestart,
|
||||
|
||||
Reference in New Issue
Block a user