sim_fibo_ad: don't instantiate an old parser object if USE_NEW_PARSER is set anymore

I thought I included this in a previous PR. Seems like I was wrong...
This commit is contained in:
Andreas Lauser 2014-03-20 15:43:22 +01:00
parent f99b9b90a4
commit 79c93953f8

View File

@ -103,10 +103,6 @@ try
#if USE_NEW_PARSER
Opm::ParserPtr newParser(new Opm::Parser() );
Opm::DeckConstPtr newParserDeck = newParser->parseFile( deck_filename );
#warning "HACK: required until the WellsManager and the EclipseWriter don't require the old parser anymore"
std::shared_ptr<EclipseGridParser> deck;
deck.reset(new EclipseGridParser(deck_filename));
#else
std::shared_ptr<EclipseGridParser> deck;
deck.reset(new EclipseGridParser(deck_filename));
@ -119,8 +115,7 @@ try
grid.reset(new GridManager(*deck));
#endif
#warning "HACK: required until the WellsManager and the EclipseWriter don't require the old parser anymore"
#if 0 // USE_NEW_PARSER
#if USE_NEW_PARSER
Opm::EclipseWriter outputWriter(param, newParserDeck, share_obj(*grid->c_grid()));
#else
Opm::EclipseWriter outputWriter(param, deck, share_obj(*grid->c_grid()));