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

Catch OpmInputError in addition to std::exception

Browse Source
This commit is contained in:
Joakim Hove 2020-09-25 11:59:05 +02:00
parent 0b5134521e
commit 76f57f5a1d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/simulators/utils/readDeck.cpp
View File

@ -27,6 +27,7 @@
#include "readDeck.hpp" #include "readDeck.hpp"
#include <opm/common/utility/String.hpp> #include <opm/common/utility/String.hpp>
#include <opm/common/utility/OpmInputError.hpp>
#include <opm/io/eclipse/EclIOdata.hpp> #include <opm/io/eclipse/EclIOdata.hpp>
@ -230,9 +231,13 @@ void readDeck(int rank, std::string& deckFilename, std::unique_ptr<Opm::Deck>& d
Opm::checkConsistentArrayDimensions(*eclipseState, *schedule, *parseContext, *errorGuard); Opm::checkConsistentArrayDimensions(*eclipseState, *schedule, *parseContext, *errorGuard);
} }
catch(const std::exception& e) catch(const OpmInputError& input_error) {
failureMessage = input_error.what();
parseSuccess = 0;
}
catch(const std::exception& std_error)
{ {
failureMessage = e.what(); failureMessage = std_error.what();
parseSuccess = 0; parseSuccess = 0;
} }
} }
@ -250,9 +255,9 @@ void readDeck(int rank, std::string& deckFilename, std::unique_ptr<Opm::Deck>& d
{ {
Opm::eclStateBroadcast(*eclipseState, *schedule, *summaryConfig); Opm::eclStateBroadcast(*eclipseState, *schedule, *summaryConfig);
} }
catch(const std::exception& e) catch(const std::exception& broadcast_error)
{ {
failureMessage = e.what(); failureMessage = broadcast_error.what();
parseSuccess = 0; parseSuccess = 0;
} }