Merge pull request #113 from atgeirr/fix-timer-usage

Fix timer usage.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-03-28 15:52:43 +01:00
commit b8a8242159
2 changed files with 6 additions and 2 deletions

View File

@ -230,8 +230,10 @@ try
simtimer.setCurrentStepNum(reportStepIdx);
if (reportStepIdx == 0)
if (reportStepIdx == 0) {
outputWriter.writeInit(simtimer, state, well_state.basicWellState());
outputWriter.writeTimeStep(simtimer, state, well_state.basicWellState());
}
// Create and run simulator.
SimulatorFullyImplicitBlackoil simulator(param,
@ -243,6 +245,8 @@ try
grav);
SimulatorReport episodeReport = simulator.run(simtimer, state, well_state);
++simtimer;
outputWriter.writeTimeStep(simtimer, state, well_state.basicWellState());
fullReport += episodeReport;
}

View File

@ -411,7 +411,7 @@ namespace Opm
}
// advance to next timestep before reporting at this location
++timer;
// ++timer; // Commented out since this has temporarily moved to the main() function.
break; // this is a temporary measure
}