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 #113 from atgeirr/fix-timer-usage

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/sim_fibo_ad.cpp
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;
} }

2
opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
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
} }