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

wrtiting state to report at the end of each time step

Browse Source 
insead of writing in the begining of each time step.
This commit is contained in:
Kai Bao
2016-07-04 11:39:56 +02:00
parent 8e52e71993
commit 6a70450422
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
opm/autodiff/SimulatorBase_impl.hpp
View File

@@ -165,9 +165,10 @@ namespace Opm
// give the polymer and surfactant simulators the chance to do their stuff // give the polymer and surfactant simulators the chance to do their stuff
asImpl().handleAdditionalWellInflow(timer, wells_manager, well_state, wells); asImpl().handleAdditionalWellInflow(timer, wells_manager, well_state, wells);
// write simulation state at the report stage // write the inital state at the report stage
output_writer_.writeTimeStep( timer, state, well_state ); if (timer.initialStep()) {
output_writer_.writeTimeStep( timer, state, well_state );
}
// Max oil saturation (for VPPARS), hysteresis update. // Max oil saturation (for VPPARS), hysteresis update.
props_.updateSatOilMax(state.saturation()); props_.updateSatOilMax(state.saturation());
@@ -265,6 +266,10 @@ namespace Opm
// Increment timer, remember well state. // Increment timer, remember well state.
++timer; ++timer;
// write simulation state at the report stage
output_writer_.writeTimeStep( timer, state, well_state );
prev_well_state = well_state; prev_well_state = well_state;
// The well potentials are only computed if they are needed // The well potentials are only computed if they are needed
// For now thay are only used to determine default guide rates for group controlled wells // For now thay are only used to determine default guide rates for group controlled wells
@@ -275,8 +280,6 @@ namespace Opm
asImpl().updateListEconLimited(solver, eclipse_state_->getSchedule(), timer.currentStepNum(), wells, asImpl().updateListEconLimited(solver, eclipse_state_->getSchedule(), timer.currentStepNum(), wells,
well_state, dynamic_list_econ_limited); well_state, dynamic_list_econ_limited);
} }
// Write final simulation state.
output_writer_.writeTimeStep( timer, state, prev_well_state );
// Stop timer and create timing report // Stop timer and create timing report
total_timer.stop(); total_timer.stop();

13
opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment_impl.hpp
View File

@@ -126,8 +126,10 @@ namespace Opm
// give the polymer and surfactant simulators the chance to do their stuff // give the polymer and surfactant simulators the chance to do their stuff
Base::asImpl().handleAdditionalWellInflow(timer, wells_manager, well_state, wells); Base::asImpl().handleAdditionalWellInflow(timer, wells_manager, well_state, wells);
// write simulation state at the report stage // write the inital state at the report stage
output_writer_.writeTimeStep( timer, state, well_state ); if (timer.initialStep()) {
output_writer_.writeTimeStep( timer, state, well_state );
}
// Max oil saturation (for VPPARS), hysteresis update. // Max oil saturation (for VPPARS), hysteresis update.
props_.updateSatOilMax(state.saturation()); props_.updateSatOilMax(state.saturation());
@@ -179,12 +181,13 @@ namespace Opm
// Increment timer, remember well state. // Increment timer, remember well state.
++timer; ++timer;
// write simulation state at the report stage
output_writer_.writeTimeStep( timer, state, well_state );
prev_well_state = well_state; prev_well_state = well_state;
} }
// Write final simulation state.
output_writer_.writeTimeStep( timer, state, prev_well_state );
// Stop timer and create timing report // Stop timer and create timing report
total_timer.stop(); total_timer.stop();
SimulatorReport report; SimulatorReport report;