OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Edit msg

Browse Source
This commit is contained in:
Joakim Hove 2020-09-29 22:59:03 +02:00
parent 4c016660d8
commit 1206570da5
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
View File

@ -442,7 +442,7 @@ namespace Opm
}
}
std::string simulationDate(std::size_t currentStep) const;
static std::string formatDate(std::time_t t);
std::string simulationDays(const UnitSystem&, std::size_t currentStep) const;
void applyEXIT(const DeckKeyword&, std::size_t currentStep);

42
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@ -305,6 +305,9 @@ namespace {
void Schedule::iterateScheduleSection(std::shared_ptr<const Opm::Python> python, const std::string& input_path, const ParseContext& parseContext , ErrorGuard& errors, const SCHEDULESection& section , const EclipseGrid& grid,
const FieldPropsManager& fp) {
std::vector<std::pair< const DeckKeyword* , std::size_t> > rftProperties;
const auto& unit_system = section.unitSystem();
std::string time_unit = unit_system.name(UnitSystem::measure::time);
auto convert_time = [&unit_system](double seconds) { return unit_system.from_si(UnitSystem::measure::time, seconds); };
std::size_t keywordIdx = 0;
/*
The keywords in the skiprest_whitelist set are loaded from the
@ -314,8 +317,6 @@ namespace {
*/
std::unordered_set<std::string> skiprest_whitelist = {"VFPPROD", "VFPINJ", "RPTSCHED", "RPTRST", "TUNING", "MESSAGES"};
std::size_t currentStep = 0;
const auto restart_offset = this->m_timeMap.restart_offset();
/*
The behavior of variable restart_skip is more lenient than the
SKIPREST keyword. If this is a restarted[1] run the loop iterating
@ -332,13 +333,14 @@ namespace {
these keywords will be assigned to report step 0.
*/
auto restart_skip = restart_offset > 0;
auto restart_skip = currentStep < this->m_timeMap.restart_offset();
while (true) {
if (keywordIdx == section.size())
break;
const auto& keyword = section.getKeyword(keywordIdx);
if (keyword.name() == "DATES") {
const auto& location = keyword.location();
checkIfAllConnectionsIsShut(currentStep);
for (const auto& record : keyword) {
if (restart_skip) {
@ -346,12 +348,24 @@ namespace {
if (deck_time == this->m_timeMap.restart_time()) {
restart_skip = false;
currentStep = this->m_timeMap.restart_offset();
OpmLog::info(fmt::format("Found restart date"));
OpmLog::info(fmt::format("Found restart date {}", Schedule::formatDate(deck_time)));
} else
OpmLog::info(fmt::format("Skipping date"));
OpmLog::info(fmt::format("Skipping DATES keyword {}", Schedule::formatDate(deck_time)));
} else {
OpmLog::info(fmt::format("End of report step ... at ... Processing simulation date {} ({}, step {}).", simulationDate(currentStep), simulationDays(section.unitSystem(), currentStep), currentStep));
currentStep += 1;
if (currentStep < this->size()) {
const auto& end_date = Schedule::formatDate(this->simTime(currentStep));
const auto& start_date = Schedule::formatDate(this->simTime(currentStep - 1));
const auto& days = convert_time(this->stepLength(currentStep - 1));
OpmLog::info(fmt::format("Complete report step {:4}: {} - {} {:3.0f} {} {} line {}",
currentStep,
start_date,
end_date,
days,
time_unit,
location.filename,
location.lineno));
}
}
}
keywordIdx++;
@ -360,8 +374,15 @@ namespace {
if (keyword.name() == "TSTEP") {
checkIfAllConnectionsIsShut(currentStep);
currentStep += keyword.getRecord(0).getItem(0).data_size();
OpmLog::info(fmt::format("Advancing simulation by with TSTEP"));
if (restart_skip)
OpmLog::info(OpmInputError::format("Skipping TSTEP keyword at {file} line {line}", keyword.location()));
else {
for (const auto& tstep : keyword.getRecord(0).getItem(0).getSIDoubleData()) {
currentStep += 1;
const auto& end_date = Schedule::formatDate( this->simTime(currentStep) );
OpmLog::info(fmt::format("TSTEP {:4} {} {} -> {}", currentStep, convert_time(tstep), time_unit, end_date));
}
}
keywordIdx++;
continue;
}
@ -1482,8 +1503,9 @@ namespace {
this->wellgroup_events == data.wellgroup_events;
}
std::string Schedule::simulationDate(std::size_t currentStep) const {
const auto ts { TimeStampUTC(simTime(currentStep)) } ;
std::string Schedule::formatDate(std::time_t t) {
const auto ts { TimeStampUTC(t) } ;
return fmt::format("{:04d}-{:02d}-{:02d}" , ts.year(), ts.month(), ts.day());
}