mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-24 22:27:55 -05:00
#13306: Fix local grid connection summary vectors (LCGFRU) missing for ESMRY
Categorize LCGFRU/LCOFRU/LCWFRU as SUMMARY_WELL_CONNECTION_LGR and fix token count check when parsing LGR connection addresses.
This commit is contained in:
1 parent
71be2d0911
commit
f8b4da83e8
3 files changed
+18
-4
No files matched your search
@@ -4584,15 +4584,15 @@
|
||||
"description": "Brine concentration interpolated at a defined coordinate within a local grid"
|
||||
},
|
||||
"LCGFRU": {
|
||||
"category": "SUMMARY_WELL_CONNECTION",
|
||||
"category": "SUMMARY_WELL_CONNECTION_LGR",
|
||||
"description": "As CGFRU but for local grids"
|
||||
},
|
||||
"LCOFRU": {
|
||||
"category": "SUMMARY_WELL_CONNECTION",
|
||||
"category": "SUMMARY_WELL_CONNECTION_LGR",
|
||||
"description": "As COFRU but for local grids"
|
||||
},
|
||||
"LCWFRU": {
|
||||
"category": "SUMMARY_WELL_CONNECTION",
|
||||
"category": "SUMMARY_WELL_CONNECTION_LGR",
|
||||
"description": "As CWFRU but for local grids"
|
||||
},
|
||||
"MLINEARS": {
|
||||
|
||||
@@ -1264,7 +1264,7 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector
|
||||
break;
|
||||
|
||||
case SummaryCategory::SUMMARY_WELL_CONNECTION_LGR:
|
||||
if ( tokens.size() > 2 )
|
||||
if ( tokens.size() > 3 )
|
||||
{
|
||||
const auto& token3 = tokens[3];
|
||||
const auto ijk = RiaStdStringTools::splitString( token3, ',' );
|
||||
|
||||
@@ -188,6 +188,20 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellCompletionLgr
|
||||
EXPECT_FALSE( addr.isErrorResult() );
|
||||
}
|
||||
|
||||
TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellCompletionLgr_Lcgfru )
|
||||
{
|
||||
auto addr = RifEclipseSummaryAddress::fromEclipseTextAddress( "LCGFRU:LGR1:B-1H:11,12,13" );
|
||||
|
||||
EXPECT_TRUE( addr.isValid() );
|
||||
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_CONNECTION_LGR, addr.category() );
|
||||
EXPECT_EQ( "LGR1", addr.lgrName() );
|
||||
EXPECT_EQ( "B-1H", addr.wellName() );
|
||||
EXPECT_EQ( 13, addr.cellK() );
|
||||
|
||||
// Too few tokens must not read out of bounds
|
||||
EXPECT_FALSE( RifEclipseSummaryAddress::fromEclipseTextAddress( "LCGFRU:LGR1:B-1H" ).isValid() );
|
||||
}
|
||||
|
||||
TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellSegment )
|
||||
{
|
||||
std::string addrString = "SOFR:B-5H:32";
|
||||
|
||||
Reference in new issue
Block a user