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

Merge pull request #2343 from joakim-hove/move-rstconfig

Browse Source 
RestartConfig has moved from EclipseState to Schedule
This commit is contained in:
Joakim Hove
2020-02-20 07:07:37 +01:00
committed by GitHub
parent 8b7e65bf8c 5ad4936025
commit d3bfa83c7c
9 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ebos/eclbasevanguard.hh
View File

@@ -327,7 +327,7 @@ public:
}
if (!externalEclState_) {
internalEclState_.reset(new Opm::EclipseState(*deck_, *parseContext_, *errorGuard_));
internalEclState_.reset(new Opm::EclipseState(*deck_));
eclState_ = internalEclState_.get();
}
else {
@@ -375,7 +375,7 @@ public:
// written to disk (every N report step)
int outputInterval = EWOMS_GET_PARAM(TypeTag, int, EclOutputInterval);
if (outputInterval >= 0)
eclState_->getRestartConfig().overrideRestartWriteInterval(outputInterval);
schedule().restart().overrideRestartWriteInterval(outputInterval);
}
/*!

2
ebos/ecloutputblackoilmodule.hh
View File

@@ -219,7 +219,7 @@ public:
const Opm::SummaryConfig summaryConfig = simulator_.vanguard().summaryConfig();
// Only output RESTART_AUXILIARY asked for by the user.
const Opm::RestartConfig& restartConfig = simulator_.vanguard().eclState().getRestartConfig();
const Opm::RestartConfig& restartConfig = simulator_.vanguard().schedule().restart();
std::map<std::string, int> rstKeywords = restartConfig.getRestartKeywords(reportStepNum);
for (auto& keyValue: rstKeywords) {
keyValue.second = restartConfig.getKeyword(keyValue.first, reportStepNum);