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

Add restart I/O of suggested timestep length.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2017-02-24 14:52:12 +01:00
parent 650f863785
commit ffaa48295a
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@@ -144,9 +144,10 @@ public:
{
WellState prev_well_state;
ExtraData extra;
if (output_writer_.isRestart()) {
// This is a restart, populate WellState and ReservoirState state objects from restart file
output_writer_.initFromRestartFile(props_.phaseUsage(), grid(), state, prev_well_state);
output_writer_.initFromRestartFile(props_.phaseUsage(), grid(), state, prev_well_state, extra);
initHydroCarbonState(state, props_.phaseUsage(), Opm::UgGridHelpers::numCells(grid()), has_disgas_, has_vapoil_);
}
@@ -170,6 +171,10 @@ public:
} else {
adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, terminal_output_ ) );
}
if (output_writer_.isRestart()) {
adaptiveTimeStepping->setSuggestedNextStep(extra.suggested_step);
}
}
std::string restorefilename = param_.getDefault("restorefile", std::string("") );
@@ -354,7 +359,8 @@ public:
// write simulation state at the report stage
Dune::Timer perfTimer;
perfTimer.start();
output_writer_.writeTimeStep( timer, state, well_state, solver->model() );
const double nextstep = adaptiveTimeStepping ? adaptiveTimeStepping->suggestedNextStep() : -1.0;
output_writer_.writeTimeStep( timer, state, well_state, solver->model(), false, nextstep );
report.output_write_time += perfTimer.stop();
prev_well_state = well_state;