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

Update deck access api

Browse Source
This commit is contained in:
Joakim Hove
2021-11-18 15:05:45 +01:00
parent 2903814649
commit 36281b2aed
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/eclgenericthresholdpressure.cc
View File

@@ -208,7 +208,7 @@ applyExplicitThresholdPressures_()
if (enableExperiments_) { if (enableExperiments_) {
// apply threshold pressures accross faults (experimental!) // apply threshold pressures accross faults (experimental!)
if (deck_.hasKeyword("THPRESFT")) if (deck_.hasKeyword("THPRESFT"))
extractThpresft_(deck_.getKeyword("THPRESFT")); extractThpresft_(deck_["THPRESFT"].back());
} }
} }

66
tests/test_keyword_validator.cpp
View File

@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(non_critical_keyword)
ECHO ECHO
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("ECHO"); const auto& test_keyword = deck["ECHO"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE(critical_keyword)
NOECHO NOECHO
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("NOECHO"); const auto& test_keyword = deck["NOECHO"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -125,7 +125,7 @@ PINCH
0.41 FOO 1* 1* / 0.41 FOO 1* 1* /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("PINCH"); const auto& test_keyword = deck["PINCH"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -143,7 +143,7 @@ PINCH
0.41 GAP 1* FOO / 0.41 GAP 1* FOO /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("PINCH"); const auto& test_keyword = deck["PINCH"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -161,7 +161,7 @@ ENDSCALE
NODIR REVERS 0 20 / NODIR REVERS 0 20 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("ENDSCALE"); const auto& test_keyword = deck["ENDSCALE"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -179,7 +179,7 @@ ENDSCALE
NODIR REVERS 1 0 / NODIR REVERS 1 0 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("ENDSCALE"); const auto& test_keyword = deck["ENDSCALE"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -196,7 +196,7 @@ EHYSTR
1.0 0 1.0/ 1.0 0 1.0/
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("EHYSTR"); const auto& test_keyword = deck["EHYSTR"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -210,7 +210,7 @@ EHYSTR
1.0 0 10.0 / 1.0 0 10.0 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("EHYSTR"); const auto& test_keyword = deck["EHYSTR"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -227,7 +227,7 @@ EHYSTR
-1.0 0 1.0 / -1.0 0 1.0 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("EHYSTR"); const auto& test_keyword = deck["EHYSTR"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -246,8 +246,8 @@ ENDSCALE
NODIR REVERS 1 0 / NODIR REVERS 1 0 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword1 = deck.getKeyword("PINCH"); const auto& test_keyword1 = deck["PINCH"].back();
const auto& test_keyword2 = deck.getKeyword("ENDSCALE"); const auto& test_keyword2 = deck["ENDSCALE"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword1, errors); validator.validateDeckKeyword(test_keyword1, errors);
@@ -269,7 +269,7 @@ BOOST_AUTO_TEST_CASE(report_not_critical)
ECHO ECHO
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("ECHO"); const auto& test_keyword = deck["ECHO"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -288,7 +288,7 @@ BOOST_AUTO_TEST_CASE(report_critical_missing)
ECHO ECHO
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("ECHO"); const auto& test_keyword = deck["ECHO"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -303,7 +303,7 @@ BOOST_AUTO_TEST_CASE(report_critical)
NOECHO NOECHO
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("NOECHO"); const auto& test_keyword = deck["NOECHO"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE(report_not_critical_missing)
NOECHO NOECHO
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("NOECHO"); const auto& test_keyword = deck["NOECHO"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -337,7 +337,7 @@ PINCH
0.41 FOO 1* 1* / 0.41 FOO 1* 1* /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("PINCH"); const auto& test_keyword = deck["PINCH"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -360,7 +360,7 @@ COMPDAT
/ /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("COMPDAT"); const auto& test_keyword = deck["COMPDAT"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -381,7 +381,7 @@ PINCH
0.41 FOO 1* 1* / 0.41 FOO 1* 1* /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("PINCH"); const auto& test_keyword = deck["PINCH"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -397,7 +397,7 @@ ENDSCALE
NODIR REVERS 0 20 / NODIR REVERS 0 20 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("ENDSCALE"); const auto& test_keyword = deck["ENDSCALE"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -416,7 +416,7 @@ ENDSCALE
NODIR REVERS 0 20 / NODIR REVERS 0 20 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("ENDSCALE"); const auto& test_keyword = deck["ENDSCALE"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -432,7 +432,7 @@ ENDSCALE
NODIR REVERS 1 0 / NODIR REVERS 1 0 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("ENDSCALE"); const auto& test_keyword = deck["ENDSCALE"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -451,7 +451,7 @@ ENDSCALE
NODIR REVERS 1 0 / NODIR REVERS 1 0 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("ENDSCALE"); const auto& test_keyword = deck["ENDSCALE"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -471,10 +471,10 @@ ENDSCALE
NODIR REVERS 0 20 / NODIR REVERS 0 20 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword1 = deck.getKeyword("ECHO"); const auto& test_keyword1 = deck["ECHO"].back();
const auto& test_keyword2 = deck.getKeyword("NOECHO"); const auto& test_keyword2 = deck["NOECHO"].back();
const auto& test_keyword3 = deck.getKeyword("PINCH"); const auto& test_keyword3 = deck["PINCH"].back();
const auto& test_keyword4 = deck.getKeyword("ENDSCALE"); const auto& test_keyword4 = deck["ENDSCALE"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword1, errors); validator.validateDeckKeyword(test_keyword1, errors);
@@ -502,10 +502,10 @@ ENDSCALE
NODIR REVERS 0 20 / NODIR REVERS 0 20 /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword1 = deck.getKeyword("ECHO"); const auto& test_keyword1 = deck["ECHO"].back();
const auto& test_keyword2 = deck.getKeyword("NOECHO"); const auto& test_keyword2 = deck["NOECHO"].back();
const auto& test_keyword3 = deck.getKeyword("PINCH"); const auto& test_keyword3 = deck["PINCH"].back();
const auto& test_keyword4 = deck.getKeyword("ENDSCALE"); const auto& test_keyword4 = deck["ENDSCALE"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword1, errors); validator.validateDeckKeyword(test_keyword1, errors);
@@ -530,7 +530,7 @@ EQLOPTS
1* / 1* /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("EQLOPTS"); const auto& test_keyword = deck["EQLOPTS"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -546,7 +546,7 @@ EQLOPTS
FOO / FOO /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("EQLOPTS"); const auto& test_keyword = deck["EQLOPTS"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);
@@ -565,7 +565,7 @@ EQLOPTS
1* 1* THPRESS / 1* 1* THPRESS /
)"}; )"};
const auto deck = Parser {}.parseString(keywords_string); const auto deck = Parser {}.parseString(keywords_string);
const auto& test_keyword = deck.getKeyword("EQLOPTS"); const auto& test_keyword = deck["EQLOPTS"].back();
KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {}); KeywordValidator validator(test_unsupported_keywords, test_string_items, test_int_items, test_double_items, {});
std::vector<ValidationError> errors; std::vector<ValidationError> errors;
validator.validateDeckKeyword(test_keyword, errors); validator.validateDeckKeyword(test_keyword, errors);

4
tests/test_vfpproperties.cpp
View File

@@ -593,7 +593,7 @@ VFPPROD \n\
auto units = Opm::UnitSystem::newFIELD(); auto units = Opm::UnitSystem::newFIELD();
Opm::Parser parser; Opm::Parser parser;
auto deck = parser.parseString(table_str); auto deck = parser.parseString(table_str);
Opm::VFPProdTable table(deck.getKeyword("VFPPROD", 0), units); Opm::VFPProdTable table(deck["VFPPROD"].front(), units);
Opm::VFPProdProperties properties; Opm::VFPProdProperties properties;
properties.addTable( table ); properties.addTable( table );
@@ -653,7 +653,7 @@ BOOST_AUTO_TEST_CASE(ParseInterpolateRealisticVFPPROD)
BOOST_REQUIRE(deck.hasKeyword("VFPPROD")); BOOST_REQUIRE(deck.hasKeyword("VFPPROD"));
BOOST_CHECK_EQUAL(deck.count("VFPPROD"), 1); BOOST_CHECK_EQUAL(deck.count("VFPPROD"), 1);
Opm::VFPProdTable table(deck.getKeyword("VFPPROD", 0), units); Opm::VFPProdTable table(deck["VFPPROD"].front(), units);
Opm::VFPProdProperties properties; Opm::VFPProdProperties properties;
properties.addTable(table); properties.addTable(table);