OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-30 00:50:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

#12427 Support both single and double underscore as keyword divider

Browse Source
This commit is contained in:
Magne Sjaastad committed 2025-05-09 08:32:04 +02:00
1 parent d2d50a4866
commit 5c2869d75f
3 files changed
+46 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/FileInterface/RifEclEclipseSummary.cpp
+21 -20
View File
@@ -320,21 +320,6 @@ void RifEclEclipseSummary::buildMetaData()
if ( m_ecl_SmSpec )
{
auto transformString = []( const std::string& input ) -> std::string
{
// Pattern 1: Handle "WGPRL__2:MY-WELL1-A5" format
// Matches text followed by __, number, colon, alphanumeric text, hyphen, alphanumeric
std::regex pattern1( "([A-Za-z]+)__([0-9]+):([A-Za-z0-9]+)-([A-Za-z0-9]+)" );
std::smatch matches;
if ( std::regex_search( input, matches, pattern1 ) )
{
return matches[1].str() + ":" + matches[3].str() + "-" + matches[4].str() + ":" + matches[2].str();
}
return input; // Return original string if pattern doesn't match
};
int varCount = ecl_smspec_num_nodes( m_ecl_SmSpec );
for ( int i = 0; i < varCount; i++ )
{
@@ -342,12 +327,12 @@ void RifEclEclipseSummary::buildMetaData()
RifEclipseSummaryAddress addr = addressFromErtSmSpecNode( ertSumVarNode );
if ( ertSumVarNode.get_gen_key1() )
if ( addr.category() == SummaryCategory::SUMMARY_WELL && ertSumVarNode.get_gen_key1() )
{
std::string completeVectorName = std::string( ertSumVarNode.get_gen_key1() );
completeVectorName = transformString( completeVectorName );
auto nativeAddress = std::string( ertSumVarNode.get_gen_key1() );
auto normalizedAddress = normalizeCompletionAddress( nativeAddress );
auto adrFromTextParsing = RifEclipseSummaryAddress::fromEclipseTextAddress( completeVectorName );
auto adrFromTextParsing = RifEclipseSummaryAddress::fromEclipseTextAddress( normalizedAddress );
bool debugOutput = false;
if ( debugOutput )
@@ -359,7 +344,7 @@ void RifEclEclipseSummary::buildMetaData()
QString detectedInconsiteny =
QString( "Full text from ERT: %1, Address from ERT: %2, Address from text parsing: %3 " )
.arg( QString::fromStdString( completeVectorName ) )
.arg( QString::fromStdString( nativeAddress ) )
.arg( QString::fromStdString( ertAdrText ) )
.arg( QString::fromStdString( adrFromText ) );
@@ -401,3 +386,19 @@ RiaDefines::EclipseUnitSystem RifEclEclipseSummary::unitSystem() const
{
return m_unitSystem;
}
//--------------------------------------------------------------------------------------------------
// Convert "WGPRL__2:MY-WELL1-A5" to "WGPRL:MY-WELL1-A5:2"
// Matches text followed by _ or __, number, colon, alphanumeric text
// If the completion number is larger than 9, a single underscore is used due to maximum keyword length of 8 characters
//--------------------------------------------------------------------------------------------------
std::string RifEclEclipseSummary::normalizeCompletionAddress( const std::string& address )
{
std::regex pattern( R"((\w+?)(?:_{1,2})(\d+):(\w[\w-]*))" );
if ( std::regex_match( address, pattern ) )
{
return std::regex_replace( address, pattern, "$1:$3:$2" );
}
return address; // Return original string if pattern doesn't match
}
ApplicationLibCode/FileInterface/RifEclEclipseSummary.h
+2
View File
@@ -54,6 +54,8 @@ public:
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;
static std::string normalizeCompletionAddress( const std::string& address );
private:
int indexFromAddress( const RifEclipseSummaryAddress& resultAddress ) const;
void buildMetaData() override;
ApplicationLibCode/UnitTests/RifReaderEclipseSummary-Test.cpp
+23
View File
@@ -20,6 +20,7 @@
#include "RiaTestDataDirectory.h"
#include "RifEclEclipseSummary.h"
#include "RifEclipseSummaryTools.h"
#include "RifReaderEclipseSummary.h"
#include "RifSummaryReaderMultipleFiles.h"
@@ -29,6 +30,28 @@
#include <memory>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST( RifEclEclipseSummary, TestConversionFromNativeCompletionSyntax )
{
std::vector<std::pair<std::string, std::string>> nativeAndExpected;
nativeAndExpected.push_back( { "WOPRL__0:WELL-1", "WOPRL:WELL-1:0" } );
nativeAndExpected.push_back( { "WOPRL__10:WELL-1", "WOPRL:WELL-1:10" } );
nativeAndExpected.push_back( { "WOPRL_10:WELL-1", "WOPRL:WELL-1:10" } );
nativeAndExpected.push_back( { "WOPRL_99:WELL-1", "WOPRL:WELL-1:99" } );
nativeAndExpected.push_back( { "WOPRL_999:WELL-1", "WOPRL:WELL-1:999" } );
nativeAndExpected.push_back( { "WOPRL_3:ABC", "WOPRL:ABC:3" } );
nativeAndExpected.push_back( { "WOPR:ABC", "WOPR:ABC" } );
nativeAndExpected.push_back( { "FOPT", "FOPT" } );
for ( const auto& [native, expected] : nativeAndExpected )
{
std::string result = RifEclEclipseSummary::normalizeCompletionAddress( native );
EXPECT_EQ( result, expected ) << "Expected: " << expected << " but got: " << result;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------