OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 16:21:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

adapt to the changes in the APIs of the parser-integrate branch in opm-core

Browse Source 
Since the SimulationTimer, EclipseWriter and WellsManager stuff has
not (yet?) been merged, the old parser is required to be around. Use
my parser-integrate-hacks_for_norne branches to test your stuff on the
Norne deck...
This commit is contained in:
Andreas Lauser 2014-02-13 13:41:49 +01:00
parent 09f56b416f
commit d7d25253f3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/sim_fibo_ad.cpp
View File

@ -103,6 +103,10 @@ try
#if USE_NEW_PARSER
Opm::ParserPtr newParser(new Opm::Parser() );
Opm::DeckConstPtr newParserDeck = newParser->parseFile( deck_filename );
#warning "HACK: required until the SimulationTimer, 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));
@ -115,7 +119,8 @@ try
grid.reset(new GridManager(*deck));
#endif
#if USE_NEW_PARSER
#warning "HACK: required until the SimulationTimer, WellsManager and the EclipseWriter don't require the old parser anymore"
#if 0 // USE_NEW_PARSER
Opm::EclipseWriter outputWriter(param, newParserDeck, share_obj(*grid->c_grid()));
#else
Opm::EclipseWriter outputWriter(param, deck, share_obj(*grid->c_grid()));
@ -205,7 +210,8 @@ try
int step = 0;
// Update the timer.
#if USE_NEW_PARSER
#warning "HACK: required until the SimulationTimer, WellsManager and the EclipseWriter don't require the old parser anymore"
#if 0 // USE_NEW_PARSER
if (newParserDeck->hasKeyword("TSTEP")) {
simtimer.init(newParserDeck);
} else {
@ -227,7 +233,8 @@ try
<< simtimer.numSteps() - step << ")\n\n" << std::flush;
// Create new wells, well_state
#if USE_NEW_PARSER
#warning "HACK: required until the SimulationTimer, WellsManager and the EclipseWriter don't require the old parser anymore"
#if 0 // USE_NEW_PARSER
WellsManager wells(newParserDeck, *grid->c_grid(), props->permeability());
#else
WellsManager wells(*deck, *grid->c_grid(), props->permeability());