From 79c93953f8965f3dff1b712fc2a8661931e810fe Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Thu, 20 Mar 2014 15:43:22 +0100 Subject: [PATCH] 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... --- examples/sim_fibo_ad.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/examples/sim_fibo_ad.cpp b/examples/sim_fibo_ad.cpp index 2456f9c04..26e8d18a3 100644 --- a/examples/sim_fibo_ad.cpp +++ b/examples/sim_fibo_ad.cpp @@ -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 deck; - deck.reset(new EclipseGridParser(deck_filename)); #else std::shared_ptr 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()));