OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 02:30:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1104 from atgeirr/allow-restart-without-opmextra

Browse Source 
Allow restarting without OPMEXTRA field in restart file.
This commit is contained in:
Bård Skaflestad 2017-03-17 11:18:06 +01:00 committed by GitHub
commit d700f3e946
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/SimulatorBase_impl.hpp
View File

@ -118,7 +118,9 @@ namespace Opm
adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, terminal_output_ ) );
}
if (output_writer_.isRestart()) {
adaptiveTimeStepping->setSuggestedNextStep(extra.suggested_step);
if (extra.suggested_step > 0.0) {
adaptiveTimeStepping->setSuggestedNextStep(extra.suggested_step);
}
}
}

4
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -174,7 +174,9 @@ public:
}
if (output_writer_.isRestart()) {
adaptiveTimeStepping->setSuggestedNextStep(extra.suggested_step);
if (extra.suggested_step > 0.0) {
adaptiveTimeStepping->setSuggestedNextStep(extra.suggested_step);
}
}
}

3
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -467,7 +467,8 @@ namespace Opm
assert(opmextra.size() == 1);
extra.suggested_step = opmextra[0];
} else {
OPM_THROW(std::runtime_error, "Cannot restart, restart data is missing OPMEXTRA field.");
OpmLog::warning("Restart data is missing OPMEXTRA field, restart run may deviate from original run.");
extra.suggested_step = -1.0;
}
}