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

Merge pull request #3679 from bska/rsmry-udef-regset

Browse Source 
Support Region Set Tags For All Region Level Summary Vectors
This commit is contained in:
Bård Skaflestad
2023-09-22 10:39:51 +02:00
committed by GitHub
parent fb37bf5db5 ecbfd4e9c4
commit 44cd3eafe2
2 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/opm/input/eclipse/share/keywords/000_Eclipse100/R/REGION_PROBE
View File

@@ -5,9 +5,9 @@
],
"comment": "Tracer keywords where the 2nd letter is a 'T' should be compounded with the tracer name",
"deck_names": [
"RRPV_[0-9A-Z][0-9A-Z][0-9A-Z]",
"ROEW_[0-9A-Z][0-9A-Z][0-9A-Z]",
"RHPV_[0-9A-Z][0-9A-Z][0-9A-Z]",
"RRPV",
"ROEW",
"RHPV",
"ROSAT",
"ROIP",
"ROIPL",
@@ -109,9 +109,9 @@
"RTFTTSUR",
"RTADSUR"
],
"CommentFip": "This regexp should work for region output of arbitrary named FIPxxxx regions. Current implementation is not entirely correct",
"CommentTracer": "???",
"deck_name_regex": "R[OGW]?[OIP][EPRT]_.+|RU.+|RTIPF.+|RTIPS.+|RTFTF.+|RTFTS.+|RTFTT.+|RTIPT.+|RTIPF.+|RTIPS.+|RTIP[1-9][0-9]*.+|RTFTT.+|RTFTF.+|RTFTS.+|RTFT[1-9][0-9]*.+|RTADS.+|RTDCY.+",
"deck_name_regex": "RU.+|RTIPF.+|RTIPS.+|RTFTF.+|RTFTS.+|RTFTT.+|RTIPT.+|RTIPF.+|RTIPS.+|RTIP[1-9][0-9]*.+|RTFTT.+|RTFTF.+|RTFTS.+|RTFT[1-9][0-9]*.+|RTADS.+|RTDCY.+",
"deck_name_regex_suffix": "_{0,2}[A-Z0-9]{3}",
"data": {
"value_type": "INT"
}

74
tests/parser/SummaryConfigTests.cpp
View File

@@ -1950,12 +1950,23 @@ RUNSUM
BOOST_AUTO_TEST_CASE(FIPREG) {
std::string deck_string = R"(
-- The FIPREG region has three distinct values, i.e.
-- there will be three different RPR__REG keywords.
const std::string deck_string = R"(
-- Both the FIPREG and the FIPXYZ region sets have three distinct
-- values (i.e., region IDs). Consequently, there will be three
-- separate *_REG or *XYZ summary configuration nodes for each
-- region level summary vector requested here.
RPR__REG
/
RPRP_REG
/
RPRH_REG
/
RODENXYZ
/
ROPT_REG
/
@@ -1969,34 +1980,51 @@ RHPV_REG
/
)";
const auto& summary_config = createSummary(deck_string);
// The +5 corresponds to five additional COPT summary config keywords which
// have been automatically added for the ROEW calculation.
BOOST_CHECK_EQUAL(summary_config.size(), 15 + 5);
BOOST_CHECK(summary_config.hasKeyword("RPR__REG"));
BOOST_CHECK(summary_config.hasKeyword("ROPT_REG"));
BOOST_CHECK(summary_config.hasKeyword("RRPV_REG"));
BOOST_CHECK(summary_config.hasKeyword("ROEW_REG"));
BOOST_CHECK(summary_config.hasKeyword("RHPV_REG"));
const auto summary_config = createSummary(deck_string);
// The +5 corresponds to five additional COPT summary config keywords
// which have been automatically added for the ROEW calculation.
const auto numRegKw = 8;
BOOST_CHECK_EQUAL(summary_config.size(), numRegKw*3 + 5);
BOOST_CHECK( summary_config.hasKeyword("RPR__REG"));
BOOST_CHECK( summary_config.hasKeyword("RPRP_REG"));
BOOST_CHECK( summary_config.hasKeyword("RPRH_REG"));
BOOST_CHECK( summary_config.hasKeyword("RODENXYZ"));
BOOST_CHECK( summary_config.hasKeyword("ROPT_REG"));
BOOST_CHECK( summary_config.hasKeyword("RRPV_REG"));
BOOST_CHECK( summary_config.hasKeyword("ROEW_REG"));
BOOST_CHECK( summary_config.hasKeyword("RHPV_REG"));
BOOST_CHECK(!summary_config.hasKeyword("RPR"));
BOOST_CHECK(!summary_config.match("BPR*"));
BOOST_CHECK(summary_config.match("RPR*"));
BOOST_CHECK( summary_config.match("RPR*"));
for (const auto& node : summary_config) {
if (node.category() == EclIO::SummaryNode::Category::Region)
BOOST_CHECK_EQUAL( node.fip_region(), "FIPREG" );
if (node.category() == EclIO::SummaryNode::Category::Region) {
if (node.keyword() == "RODENXYZ") {
BOOST_CHECK_EQUAL(node.fip_region(), "FIPXYZ");
}
else {
BOOST_CHECK_EQUAL(node.fip_region(), "FIPREG");
}
}
}
const auto& fip_regions = summary_config.fip_regions();
BOOST_CHECK_EQUAL(fip_regions.size(), 1U);
{
const auto& fip_regions = summary_config.fip_regions();
BOOST_CHECK_EQUAL(fip_regions.size(), 2U);
auto reg_iter = fip_regions.find("FIPREG");
BOOST_CHECK( reg_iter != fip_regions.end() );
auto reg_iter = fip_regions.find("FIPREG");
BOOST_CHECK(reg_iter != fip_regions.end());
}
{
auto rpr = summary_config.keywords("RP*");
BOOST_CHECK_EQUAL(rpr.size(), 9U);
}
auto rpr = summary_config.keywords("RP*");
BOOST_CHECK_EQUAL(rpr.size(), 3U);
// See comment on the roew() function in Summary.cpp for this uglyness.
// See comment on the roew() function in Summary.cpp for this ugliness.
BOOST_CHECK(summary_config.hasKeyword("COPT"));
}