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 #112 from GitPaean/fix_using_new_timer

Browse Source 
A small fix to make sim_fibo_ad use the new SimulatorTimer.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-03-28 13:51:22 +01:00
commit faba01f917
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/sim_fibo_ad.cpp
View File

@ -205,7 +205,7 @@ try
std::shared_ptr<EclipseState> eclipseState(new EclipseState(newParserDeck)); std::shared_ptr<EclipseState> eclipseState(new EclipseState(newParserDeck));
// initialize variables // initialize variables
simtimer.init(timeMap, /*beginReportStepIdx=*/0, /*endReportStepIdx=*/0); simtimer.init(timeMap);
SimulatorReport fullReport; SimulatorReport fullReport;
for (size_t reportStepIdx = 0; reportStepIdx < timeMap->numTimesteps(); ++reportStepIdx) { for (size_t reportStepIdx = 0; reportStepIdx < timeMap->numTimesteps(); ++reportStepIdx) {
@ -228,9 +228,7 @@ try
well_state.init(wells.c_wells(), state); well_state.init(wells.c_wells(), state);
} }
simtimer.init(timeMap, simtimer.setCurrentStepNum(reportStepIdx);
/*beginReportStepIdx=*/reportStepIdx,
/*endReportStepIdx=*/reportStepIdx + 1);
if (reportStepIdx == 0) if (reportStepIdx == 0)
outputWriter.writeInit(simtimer, state, well_state.basicWellState()); outputWriter.writeInit(simtimer, state, well_state.basicWellState());

1
opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
View File

@ -412,6 +412,7 @@ namespace Opm
// advance to next timestep before reporting at this location // advance to next timestep before reporting at this location
++timer; ++timer;
break; // this is a temporary measure
} }
total_timer.stop(); total_timer.stop();