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 branch 'master' into new_well_formulation

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2014-03-24 14:00:24 +01:00
commit 73402c892f
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
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()));
@ -213,13 +208,20 @@ try
simtimer.init(timeMap, /*beginReportStepIdx=*/0, /*endReportStepIdx=*/0); simtimer.init(timeMap, /*beginReportStepIdx=*/0, /*endReportStepIdx=*/0);
SimulatorReport fullReport; SimulatorReport fullReport;
for (size_t episodeIdx = 0; episodeIdx < timeMap->numTimesteps(); ++episodeIdx) { for (size_t reportStepIdx = 0; reportStepIdx < timeMap->numTimesteps(); ++reportStepIdx) {
// Report on start of a report step.
std::cout << "\n"
<< "---------------------------------------------------------------\n"
<< "-------------- Starting report step " << reportStepIdx << " --------------\n"
<< "---------------------------------------------------------------\n"
<< "\n";
WellsManager wells(eclipseState, WellsManager wells(eclipseState,
episodeIdx, reportStepIdx,
*grid->c_grid(), *grid->c_grid(),
props->permeability()); props->permeability());
if (episodeIdx == 0) { if (reportStepIdx == 0) {
// @@@ HACK: we should really make a new well state and // @@@ HACK: we should really make a new well state and
// properly transfer old well state to it every epoch, // properly transfer old well state to it every epoch,
// since number of wells may change etc. // since number of wells may change etc.
@ -227,10 +229,10 @@ try
} }
simtimer.init(timeMap, simtimer.init(timeMap,
/*beginReportStepIdx=*/episodeIdx, /*beginReportStepIdx=*/reportStepIdx,
/*endReportStepIdx=*/episodeIdx + 1); /*endReportStepIdx=*/reportStepIdx + 1);
if (episodeIdx == 0) if (reportStepIdx == 0)
outputWriter.writeInit(simtimer, state, well_state.basicWellState()); outputWriter.writeInit(simtimer, state, well_state.basicWellState());
// Create and run simulator. // Create and run simulator.