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

fix the fallout caused by the slightly too premature merge of PR #213

Browse Source 
I should have put some message at the end of that PR when the API of
opm-parser changed...
This commit is contained in:
Andreas Lauser 2014-10-10 16:14:52 +02:00
parent 68cf022a9d
commit 4f44cde846
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/sim_fibo_ad.cpp
View File

@ -50,6 +50,8 @@
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/EclipseState/checkDeck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@ -109,8 +111,8 @@ try
std::shared_ptr<EclipseState> eclipseState;
try {
deck = parser->parseFile(deck_filename, strict_parsing, parserLog);
EclipseState::checkDeck(deck, parserLog);
eclipseState.reset(new EclipseState(deck, parserLog));
Opm::checkDeck(deck, parserLog);
eclipseState.reset(new Opm::EclipseState(deck, parserLog));
}
catch (const std::invalid_argument& e) {
if (parserLog->size() > 0) {

4
examples/sim_fibo_ad_cp.cpp
View File

@ -72,6 +72,8 @@
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/EclipseState/checkDeck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@ -135,7 +137,7 @@ try
std::shared_ptr<EclipseState> eclipseState;
try {
deck = parser->parseFile(deck_filename, strict_parsing, parserLog);
EclipseState::checkDeck(deck, parserLog);
checkDeck(deck, parserLog);
eclipseState.reset(new EclipseState(deck, parserLog));
}
catch (const std::invalid_argument& e) {