mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
fix the fallout of the SimulatorTimer::currentTime() -> SimulatorTimer::simulationTimeElapsed() rename
This commit is contained in:
@@ -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();
|
||||||
|
|||||||
@@ -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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user