adapt to the removal of the "strict parsing" concept

This commit is contained in:
Andreas Lauser 2014-12-09 14:18:42 +01:00
parent c051c7bd85
commit 69c4a6d591
3 changed files with 3 additions and 4 deletions

View File

@ -345,7 +345,7 @@ int main(int argc, char** argv) {
ParserPtr parser(new Parser()); ParserPtr parser(new Parser());
std::cout << "Parsing input file ............: " << input_file << std::endl; std::cout << "Parsing input file ............: " << input_file << std::endl;
DeckConstPtr deck = parser->parseFile(input_file, false); DeckConstPtr deck = parser->parseFile(input_file);
std::shared_ptr<EclipseState> state = std::make_shared<EclipseState>( deck ); std::shared_ptr<EclipseState> state = std::make_shared<EclipseState>( deck );
std::cout << "Loading eclipse INIT file .....: " << init_file << std::endl; std::cout << "Loading eclipse INIT file .....: " << init_file << std::endl;

View File

@ -106,11 +106,10 @@ try
Opm::ParserPtr parser(new Opm::Parser() ); Opm::ParserPtr parser(new Opm::Parser() );
Opm::ParserLogPtr parserLog(new Opm::ParserLog()); Opm::ParserLogPtr parserLog(new Opm::ParserLog());
bool strict_parsing = param.getDefault("strict_parsing", true);
Opm::DeckConstPtr deck; Opm::DeckConstPtr deck;
std::shared_ptr<EclipseState> eclipseState; std::shared_ptr<EclipseState> eclipseState;
try { try {
deck = parser->parseFile(deck_filename, strict_parsing, parserLog); deck = parser->parseFile(deck_filename, parserLog);
Opm::checkDeck(deck, parserLog); Opm::checkDeck(deck, parserLog);
eclipseState.reset(new Opm::EclipseState(deck, parserLog)); eclipseState.reset(new Opm::EclipseState(deck, parserLog));
} }

View File

@ -136,7 +136,7 @@ try
Opm::DeckConstPtr deck; Opm::DeckConstPtr deck;
std::shared_ptr<EclipseState> eclipseState; std::shared_ptr<EclipseState> eclipseState;
try { try {
deck = parser->parseFile(deck_filename, strict_parsing, parserLog); deck = parser->parseFile(deck_filename, parserLog);
checkDeck(deck, parserLog); checkDeck(deck, parserLog);
eclipseState.reset(new EclipseState(deck, parserLog)); eclipseState.reset(new EclipseState(deck, parserLog));
} }