Fix timer usage.

This makes the simulator produce proper summary output again.
This commit is contained in:
Atgeirr Flø Rasmussen
2014-03-28 14:31:30 +01:00
parent faba01f917
commit 4b53f88685
2 changed files with 6 additions and 2 deletions

View File

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

View File

@@ -411,7 +411,7 @@ namespace Opm
} }
// advance to next timestep before reporting at this location // 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 break; // this is a temporary measure
} }