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

TimeMap iterate only over SCHEDULE section

Browse Source
This commit is contained in:
Joakim Hove
2020-01-28 14:37:14 +01:00
parent 084b4721f9
commit d36b6fa287
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp
View File

@@ -25,6 +25,7 @@
#include <opm/parser/eclipse/Parser/ParserKeywords/S.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
@@ -115,7 +116,7 @@ namespace {
}
}
for( const auto& keyword : deck ) {
for( const auto& keyword : SCHEDULESection(deck)) {
// We're only interested in "TSTEP" and "DATES" keywords,
// so we ignore everything else here...
if (keyword.name() != "TSTEP" && keyword.name() != "DATES")

6
tests/parser/TimeMapTest.cpp
View File

@@ -165,6 +165,7 @@ BOOST_AUTO_TEST_CASE(TimeStepsCorrect) {
"START\n"
" 21 MAY 1981 /\n"
"\n"
"SCHEDULE\n"
"TSTEP\n"
" 1 2 3 4 5 /\n"
"\n"
@@ -230,6 +231,7 @@ BOOST_AUTO_TEST_CASE(initTimestepsYearsAndMonths) {
"START\n"
" 21 MAY 1981 /\n"
"\n"
"SCHEDULE\n"
"TSTEP\n"
" 1 2 3 4 5 /\n"
"\n"
@@ -296,6 +298,7 @@ BOOST_AUTO_TEST_CASE(initTimestepsYearsAndMonthsSkippingMonthsFrequency) {
"START\n"
" 21 MAY 1981 /\n"
"\n"
"SCHEDULE\n"
"DATES\n"
" 5 JUL 1981 /\n"
" 6 JUL 1981 /\n"
@@ -445,6 +448,7 @@ BOOST_AUTO_TEST_CASE(initTimestepsLongStep) {
"START\n"
" 1 JAN 1983 /\n"
"\n"
"SCHEDULE\n"
"TSTEP\n"
" 25550 /\n";
@@ -471,6 +475,7 @@ BOOST_AUTO_TEST_CASE(TimestepsLabUnit) {
"\n"
"LAB\n"
" \n"
"SCHEDULE\n"
"TSTEP\n"
" 24*10 /\n";
@@ -495,6 +500,7 @@ BOOST_AUTO_TEST_CASE(initTimestepsDistantDates) {
"START\n"
" 1 JAN 1983 /\n"
"\n"
"SCHEDULE\n"
"DATES\n"
" 1 JAN 2040 /\n"
" 1 JAN 2050 /\n"