OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-18 21:32:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

adapt to the SimulatorTimer renames of opm-core

Browse Source
This commit is contained in:
Andreas Lauser 2014-03-18 12:42:42 +01:00
parent 911e55c5e6
commit 3cce559d52
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/polymer/SimulatorCompressiblePolymer.cpp
View File

@ -388,7 +388,7 @@ namespace Opm
Opm::computeTransportSource(props_, wells_, well_state, transport_src); Opm::computeTransportSource(props_, wells_, well_state, transport_src);
// Find inflow rate. // Find inflow rate.
const double current_time = timer.currentTime(); const double current_time = timer.simulationTimeElapsed();
double stepsize = timer.currentStepLength(); double stepsize = timer.currentStepLength();
polymer_inflow_.getInflowValues(current_time, current_time + stepsize, polymer_inflow_c); polymer_inflow_.getInflowValues(current_time, current_time + stepsize, polymer_inflow_c);
@ -488,12 +488,12 @@ 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_, state.pressure(), state.surfacevol(), wellreport.push(props_, *wells_, state.pressure(), state.surfacevol(),
state.saturation(), timer.currentTime() + timer.currentStepLength(), state.saturation(), timer.simulationTimeElapsed() + timer.currentStepLength(),
well_state.bhp(), well_state.perfRates()); well_state.bhp(), well_state.perfRates());
} }
} }

8
opm/polymer/SimulatorPolymer.cpp
View File

@ -410,7 +410,7 @@ namespace Opm
wells_, well_state.perfRates(), transport_src); wells_, well_state.perfRates(), transport_src);
// Find inflow rate. // Find inflow rate.
const double current_time = timer.currentTime(); const double current_time = timer.simulationTimeElapsed();
double stepsize = timer.currentStepLength(); double stepsize = timer.currentStepLength();
polymer_inflow_.getInflowValues(current_time, current_time + stepsize, polymer_inflow_c); polymer_inflow_.getInflowValues(current_time, current_time + stepsize, polymer_inflow_c);
@ -497,12 +497,12 @@ 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_, 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());
} }
} }
@ -620,7 +620,7 @@ namespace Opm
Opm::estimateCellVelocity(grid, state.faceflux(), cell_velocity); Opm::estimateCellVelocity(grid, state.faceflux(), cell_velocity);
dm["velocity"] = &cell_velocity; dm["velocity"] = &cell_velocity;
writeECLData(grid, dm, simtimer.currentStepNum(), simtimer.currentTime(), simtimer.currentDateTime(), writeECLData(grid, dm, simtimer.currentStepNum(), simtimer.simulationTimeElapsed(), simtimer.currentDateTime(),
output_dir, "polymer_ecl"); output_dir, "polymer_ecl");
#else #else
OPM_THROW(std::runtime_error, "Cannot call outputStateBinary() without ert library support. Reconfigure with --with-ert and recompile."); OPM_THROW(std::runtime_error, "Cannot call outputStateBinary() without ert library support. Reconfigure with --with-ert and recompile.");