OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reduce memory use for summary address object

Browse Source 
* Use one common variable for object name, use three ints
* Move enums to separate file
* Refactor use of enums
* Move implementation to cpp
* Refactor includes
This commit is contained in:
Magne Sjaastad
2023-08-21 07:12:08 +02:00
committed by GitHub
parent 1b886c1a1e
commit 96b3bef878
70 changed files with 1252 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/UnitTests/ObservedDataParser-Test.cpp
View File

@@ -991,7 +991,7 @@ TEST( RifKeywordBasedRsmspecParserTest, TestAddressCreation )
RifEclipseSummaryAddress address = RifEclipseUserDataKeywordTools::makeAndFillAddress( quantityName, headerColumn );
EXPECT_TRUE( address.isValid() );
EXPECT_EQ( address.category(), RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR );
EXPECT_EQ( address.category(), RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR );
EXPECT_EQ( address.uiText(), "LCABC:lgrName:wellName:12,14,16" );
}

2
ApplicationLibCode/UnitTests/RiaSummaryAddressAnalyzer-Test.cpp
View File

@@ -168,6 +168,6 @@ TEST( RiaSummaryAddressAnalyzer, QuantitiesPerCategory )
auto categories = analyzer.categories();
EXPECT_EQ( 2u, categories.size() );
auto vectorNamesForWells = analyzer.vectorNamesForCategory( RifEclipseSummaryAddress::SUMMARY_WELL );
auto vectorNamesForWells = analyzer.vectorNamesForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL );
EXPECT_EQ( 3u, vectorNamesForWells.size() );
}

60
ApplicationLibCode/UnitTests/RifEclipseSummaryAddress-Test.cpp
View File

@@ -18,7 +18,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Field )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_FIELD, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD, addr.category() );
EXPECT_EQ( "FOPT", addr.vectorName() );
EXPECT_FALSE( addr.isErrorResult() );
}
@@ -30,7 +30,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Aquifer )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_AQUIFER, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER, addr.category() );
EXPECT_EQ( "AAQR", addr.vectorName() );
EXPECT_EQ( 456, addr.aquiferNumber() );
EXPECT_FALSE( addr.isErrorResult() );
@@ -43,7 +43,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Network )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_NETWORK, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK, addr.category() );
EXPECT_EQ( "NETW", addr.vectorName() );
EXPECT_FALSE( addr.isErrorResult() );
}
@@ -55,7 +55,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Network_name )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_NETWORK, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK, addr.category() );
EXPECT_EQ( "NETW", addr.vectorName() );
EXPECT_EQ( "MYNAME", addr.networkName() );
EXPECT_FALSE( addr.isErrorResult() );
@@ -68,7 +68,7 @@ TEST( RifEclipseSummaryAddressTest, DISABLED_TestEclipseAddressParsing_Misc )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_MISC, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC, addr.category() );
EXPECT_EQ( "CPU", addr.vectorName() );
EXPECT_FALSE( addr.isErrorResult() );
}
@@ -80,7 +80,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Region )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_REGION, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION, addr.category() );
EXPECT_EQ( "RPR", addr.vectorName() );
EXPECT_EQ( 7081, addr.regionNumber() );
EXPECT_FALSE( addr.isErrorResult() );
@@ -93,7 +93,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_RegionToRegion )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION, addr.category() );
EXPECT_EQ( "ROFR", addr.vectorName() );
EXPECT_EQ( 7081, addr.regionNumber() );
EXPECT_EQ( 8001, addr.regionNumber2() );
@@ -107,7 +107,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellGroup )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_GROUP, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP, addr.category() );
EXPECT_EQ( "GOPR", addr.vectorName() );
EXPECT_EQ( "WELLS1", addr.groupName() );
EXPECT_FALSE( addr.isErrorResult() );
@@ -120,7 +120,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Well )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_WELL, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL, addr.category() );
EXPECT_EQ( "WOPR", addr.vectorName() );
EXPECT_EQ( "B-2H", addr.wellName() );
EXPECT_FALSE( addr.isErrorResult() );
@@ -133,7 +133,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellCompletion )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION, addr.category() );
EXPECT_EQ( "COFRL", addr.vectorName() );
EXPECT_EQ( "B-1H", addr.wellName() );
EXPECT_EQ( 15, addr.cellI() );
@@ -149,7 +149,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellLgr )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_WELL_LGR, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_LGR, addr.category() );
EXPECT_EQ( "LWABC", addr.vectorName() );
EXPECT_EQ( "LGRNA", addr.lgrName() );
EXPECT_EQ( "B-10H", addr.wellName() );
@@ -163,7 +163,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellCompletionLgr
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR, addr.category() );
EXPECT_EQ( "LCGAS", addr.vectorName() );
EXPECT_EQ( "LGR1", addr.lgrName() );
EXPECT_EQ( "B-1H", addr.wellName() );
@@ -180,7 +180,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_WellSegment )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT, addr.category() );
EXPECT_EQ( "SOFR", addr.vectorName() );
EXPECT_EQ( "B-5H", addr.wellName() );
EXPECT_EQ( 32, addr.wellSegmentNumber() );
@@ -194,7 +194,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Block )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_BLOCK, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK, addr.category() );
EXPECT_EQ( "BPR", addr.vectorName() );
EXPECT_EQ( 123, addr.cellI() );
EXPECT_EQ( 122, addr.cellJ() );
@@ -209,7 +209,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_BlockLgr )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK_LGR, addr.category() );
EXPECT_EQ( "LBABC", addr.vectorName() );
EXPECT_EQ( "LGRN", addr.lgrName() );
EXPECT_EQ( 45, addr.cellI() );
@@ -225,7 +225,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_Imported )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_IMPORTED, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED, addr.category() );
EXPECT_EQ( "FAULT (Imp)", addr.vectorName() );
EXPECT_FALSE( addr.isErrorResult() );
}
@@ -237,7 +237,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_ErrorResult1 )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_AQUIFER, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER, addr.category() );
EXPECT_EQ( "AAQR", addr.vectorName() );
EXPECT_EQ( 456, addr.aquiferNumber() );
EXPECT_TRUE( addr.isErrorResult() );
@@ -250,7 +250,7 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_ErrorResult2 )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION_LGR, addr.category() );
EXPECT_EQ( "LCGAS", addr.vectorName() );
EXPECT_EQ( "LGR1", addr.lgrName() );
EXPECT_EQ( "B-1H", addr.wellName() );
@@ -267,24 +267,24 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressParsing_ErrorResult3 )
RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::fromEclipseTextAddressParseErrorTokens( addrString );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_IMPORTED, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED, addr.category() );
EXPECT_EQ( "FAULT (Imp)", addr.vectorName() );
EXPECT_TRUE( addr.isErrorResult() );
}
TEST( RifEclipseSummaryAddressTest, TestEclipseAddressIjkParsing )
{
RifEclipseSummaryAddress::SummaryVarCategory cat = RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION;
std::map<RifEclipseSummaryAddress::SummaryIdentifierType, std::string> identifiers( {
{ RifEclipseSummaryAddress::INPUT_WELL_NAME, "1-BH" },
{ RifEclipseSummaryAddress::INPUT_CELL_IJK, "6, 7, 8" },
{ RifEclipseSummaryAddress::INPUT_VECTOR_NAME, "WOPR" },
RifEclipseSummaryAddressDefines::SummaryVarCategory cat = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION;
std::map<RifEclipseSummaryAddressDefines::SummaryIdentifierType, std::string> identifiers( {
{ RifEclipseSummaryAddressDefines::SummaryIdentifierType::INPUT_WELL_NAME, "1-BH" },
{ RifEclipseSummaryAddressDefines::SummaryIdentifierType::INPUT_CELL_IJK, "6, 7, 8" },
{ RifEclipseSummaryAddressDefines::SummaryIdentifierType::INPUT_VECTOR_NAME, "WOPR" },
} );
RifEclipseSummaryAddress addr( cat, identifiers );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION, addr.category() );
EXPECT_EQ( "WOPR", addr.vectorName() );
EXPECT_EQ( "1-BH", addr.wellName() );
EXPECT_EQ( 6, addr.cellI() );
@@ -295,16 +295,16 @@ TEST( RifEclipseSummaryAddressTest, TestEclipseAddressIjkParsing )
TEST( RifEclipseSummaryAddressTest, TestEclipseAddressRegToRegParsing )
{
RifEclipseSummaryAddress::SummaryVarCategory cat = RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION;
std::map<RifEclipseSummaryAddress::SummaryIdentifierType, std::string> identifiers( {
{ RifEclipseSummaryAddress::INPUT_REGION_2_REGION, "123 - 456" },
{ RifEclipseSummaryAddress::INPUT_VECTOR_NAME, "ROFR" },
RifEclipseSummaryAddressDefines::SummaryVarCategory cat = RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION;
std::map<RifEclipseSummaryAddressDefines::SummaryIdentifierType, std::string> identifiers( {
{ RifEclipseSummaryAddressDefines::SummaryIdentifierType::INPUT_REGION_2_REGION, "123 - 456" },
{ RifEclipseSummaryAddressDefines::SummaryIdentifierType::INPUT_VECTOR_NAME, "ROFR" },
} );
RifEclipseSummaryAddress addr( cat, identifiers );
EXPECT_TRUE( addr.isValid() );
EXPECT_EQ( RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION, addr.category() );
EXPECT_EQ( RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION, addr.category() );
EXPECT_EQ( "ROFR", addr.vectorName() );
EXPECT_EQ( 123, addr.regionNumber() );
EXPECT_EQ( 456, addr.regionNumber2() );

4
ApplicationLibCode/UnitTests/RifRevealCsvSectionSummaryReader-Test.cpp
View File

@@ -27,7 +27,7 @@ TEST( RifRevealCsvSectionSummaryReaderTest, ExpectedText )
QString errorMessage;
RifRevealCsvSectionSummaryReader reader;
bool isOk = reader.parse( fileContents, RifEclipseSummaryAddress::SummaryVarCategory::SUMMARY_WELL, &errorMessage );
bool isOk = reader.parse( fileContents, RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL, &errorMessage );
ASSERT_TRUE( isOk );
EXPECT_TRUE( errorMessage.isEmpty() );
@@ -46,6 +46,6 @@ TEST( RifRevealCsvSectionSummaryReaderTest, EmptyText )
QString fileContents = "";
QString errorMessage;
bool isOk = reader.parse( fileContents, RifEclipseSummaryAddress::SummaryVarCategory::SUMMARY_MISC, &errorMessage );
bool isOk = reader.parse( fileContents, RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC, &errorMessage );
ASSERT_FALSE( isOk );
}

10
ApplicationLibCode/UnitTests/RiuSummaryVectorDescriptionMap-Test.cpp
View File

@@ -11,7 +11,7 @@ TEST( RiuSummaryQuantityNameInfoProvider, TestInit )
{
std::string s( "SRSFC" );
auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s );
EXPECT_TRUE( cat == RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT );
EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT );
auto longName = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( s );
EXPECT_TRUE( longName == "Reach brine concentration" );
@@ -27,7 +27,7 @@ TEST( RiuSummaryQuantityNameInfoProvider, TestInit )
{
std::string s( "does not exist" );
auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s );
EXPECT_TRUE( cat == RifEclipseSummaryAddress::SUMMARY_INVALID );
EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_INVALID );
auto longName = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( s );
@@ -57,7 +57,7 @@ TEST( RiuSummaryQuantityNameInfoProvider, TestCustomNaming )
{
std::string s( "SRSFCABC" );
auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s );
EXPECT_TRUE( cat == RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT );
EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_SEGMENT );
auto longName = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( s );
EXPECT_TRUE( longName == "Reach brine concentration" );
@@ -79,13 +79,13 @@ TEST( RiuSummaryQuantityNameInfoProvider, Test6x )
{
std::string s( "GLIT" );
auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s );
EXPECT_TRUE( cat == RifEclipseSummaryAddress::SUMMARY_GROUP );
EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP );
}
{
std::string s( "WSBVPROP" );
auto cat = RiuSummaryQuantityNameInfoProvider::instance()->identifyCategory( s );
EXPECT_TRUE( cat == RifEclipseSummaryAddress::SUMMARY_WELL );
EXPECT_TRUE( cat == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL );
}
}