Merge pull request #112 from GitPaean/fix_using_new_timer

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

View File

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

View File

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