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 remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Kai Bao 2014-04-28 15:50:34 +02:00
commit 5c6503848e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/sim_fibo_ad.cpp
View File

@ -102,9 +102,10 @@ try
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 );
std::shared_ptr<EclipseState> eclipseState(new EclipseState(newParserDeck));
// Grid init // Grid init
grid.reset(new GridManager(newParserDeck)); grid.reset(new GridManager(eclipseState->getEclipseGrid()));
Opm::EclipseWriter outputWriter(param, newParserDeck, share_obj(*grid->c_grid())); Opm::EclipseWriter outputWriter(param, newParserDeck, share_obj(*grid->c_grid()));
// Rock and fluid init // Rock and fluid init
@ -173,7 +174,6 @@ try
WellStateFullyImplicitBlackoil well_state; WellStateFullyImplicitBlackoil well_state;
Opm::TimeMapPtr timeMap(new Opm::TimeMap(newParserDeck)); Opm::TimeMapPtr timeMap(new Opm::TimeMap(newParserDeck));
SimulatorTimer simtimer; SimulatorTimer simtimer;
std::shared_ptr<EclipseState> eclipseState(new EclipseState(newParserDeck));
// initialize variables // initialize variables
simtimer.init(timeMap); simtimer.init(timeMap);