fix the fallout of the SimulatorTimer::currentTime() -> SimulatorTimer::simulationTimeElapsed() rename

This commit is contained in:
Andreas Lauser
2014-03-11 15:55:53 +01:00
parent 6b0f7c493c
commit 1383eadf8f
2 changed files with 4 additions and 4 deletions

View File

@@ -496,13 +496,13 @@ namespace Opm
<< std::endl; << std::endl;
std::cout.precision(8); std::cout.precision(8);
watercut.push(timer.currentTime() + timer.currentStepLength(), watercut.push(timer.simulationTimeElapsed() + timer.currentStepLength(),
produced[0]/(produced[0] + produced[1]), produced[0]/(produced[0] + produced[1]),
tot_produced[0]/tot_porevol_init); tot_produced[0]/tot_porevol_init);
if (wells_) { if (wells_) {
wellreport.push(props_, *wells_, wellreport.push(props_, *wells_,
state.pressure(), state.surfacevol(), state.saturation(), state.pressure(), state.surfacevol(), state.saturation(),
timer.currentTime() + timer.currentStepLength(), timer.simulationTimeElapsed() + timer.currentStepLength(),
well_state.bhp(), well_state.perfRates()); well_state.bhp(), well_state.perfRates());
} }
sreport.total_time = step_timer.secsSinceStart(); sreport.total_time = step_timer.secsSinceStart();

View File

@@ -579,12 +579,12 @@ namespace Opm
dynamic_cast<TransportSolverTwophaseReorder&>(*tsolver_) dynamic_cast<TransportSolverTwophaseReorder&>(*tsolver_)
.solveGravity(&initial_porevol[0], stepsize, state); .solveGravity(&initial_porevol[0], stepsize, state);
} }
watercut.push(timer.currentTime() + timer.currentStepLength(), watercut.push(timer.simulationTimeElapsed() + timer.currentStepLength(),
produced[0]/(produced[0] + produced[1]), produced[0]/(produced[0] + produced[1]),
tot_produced[0]/tot_porevol_init); tot_produced[0]/tot_porevol_init);
if (wells_) { if (wells_) {
wellreport.push(props_, *wells_, state.saturation(), wellreport.push(props_, *wells_, state.saturation(),
timer.currentTime() + timer.currentStepLength(), timer.simulationTimeElapsed() + timer.currentStepLength(),
well_state.bhp(), well_state.perfRates()); well_state.bhp(), well_state.perfRates());
} }
} }