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

Merge pull request #105 from andlaus/sim_fibo_ad_dont_instantiate_old_parser

Browse Source 
sim_fibo_ad: don't instantiate an old parser object if USE_NEW_PARSER is set anymore
This commit is contained in:
Atgeirr Flø Rasmussen
2014-03-21 09:03:20 +01:00
parent ee28454b84 79c93953f8
commit cdeac8eed8
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/sim_fibo_ad.cpp
View File

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