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

due to the new timer, simulator class should not do time iteration once again.

Browse Source
This commit is contained in:
Liu Ming 2014-10-28 13:31:35 +08:00
parent 5242d6bbf7
commit c0a61c9655
3 changed files with 453 additions and 474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/polymer/SimulatorCompressiblePolymer.cpp
View File

@ -292,7 +292,6 @@ namespace Opm
wellreport.push(props_, *wells_, state.pressure(), state.surfacevol(),
state.saturation(), 0.0, well_state.bhp(), well_state.perfRates());
}
// for (; !timer.done(); ++timer) {
// Report timestep and (optionally) write state to disk.
timer.report(std::cout);
if (output_ && (timer.currentStepNum() % output_interval_ == 0)) {
@ -493,7 +492,6 @@ namespace Opm
state.saturation(), timer.simulationTimeElapsed() + timer.currentStepLength(),
well_state.bhp(), well_state.perfRates());
}
// }
if (output_) {
if (output_vtk_) {

2
opm/polymer/SimulatorPolymer.cpp
View File

@ -315,7 +315,6 @@ namespace Opm
well_resflows_phase.resize((wells_->number_of_phases)*(wells_->number_of_wells), 0.0);
wellreport.push(props_, *wells_, state.saturation(), 0.0, well_state.bhp(), well_state.perfRates());
}
for (; !timer.done(); ++timer) {
// Report timestep and (optionally) write state to disk.
timer.report(std::cout);
if (output_ && (timer.currentStepNum() % output_interval_ == 0)) {
@ -504,7 +503,6 @@ namespace Opm
timer.simulationTimeElapsed() + timer.currentStepLength(),
well_state.bhp(), well_state.perfRates());
}
}
if (output_) {
if (output_vtk_) {

17
opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.cpp
View File

@ -267,7 +267,6 @@ namespace Opm
std::string filename = output_dir_ + "/step_timing.param";
tstep_os.open(filename.c_str(), std::fstream::out | std::fstream::app);
}
// while (!timer.done()) {
// Report timestep and (optionally) write state to disk.
step_timer.start();
timer.report(std::cout);
@ -276,24 +275,13 @@ namespace Opm
outputStateVtk(grid_, state, timer.currentStepNum(), output_dir_);
}
outputStateMatlab(grid_, state, timer.currentStepNum(), output_dir_);
// outputWellStateMatlab(well_state,timer.currentStepNum(), output_dir_);
}
SimulatorReport sreport;
// Solve pressure equation.
// if (check_well_controls_) {
// computeFractionalFlow(props_, allcells_,
// state.pressure(), state.surfacevol(), state.saturation(),
// fractional_flows);
// wells_manager_.applyExplicitReinjectionControls(well_resflows_phase, well_resflows_phase);
// }
bool well_control_passed = !check_well_controls_;
int well_control_iteration = 0;
do {
// Process transport sources (to include bdy terms and well flows).
// Opm::computeTransportSource(props_, wells_, well_state, transport_src);
// Run solver.
const double current_time = timer.simulationTimeElapsed();
double stepsize = timer.currentStepLength();
@ -379,11 +367,6 @@ namespace Opm
tstep_os.close();
}
// advance to next timestep before reporting at this location
// ++timer;
// }
total_timer.stop();
SimulatorReport report;