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

#8893 Rename quantity name -> vector name

Browse Source
This commit is contained in:
Magne Sjaastad
2022-05-06 16:34:37 +02:00
parent 6f1819ba96
commit f52acd9a64
64 changed files with 359 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/Application/RiaSummaryCurveDefinition.cpp
View File

@@ -229,7 +229,7 @@ void RiaSummaryCurveDefinitionAnalyser::setCurveDefinitions( const std::vector<R
{
m_singleSummaryCases.clear();
m_ensembles.clear();
m_quantityNames.clear();
m_vectorNames.clear();
m_summaryAdresses.clear();
for ( const auto& curveDef : curveDefs )
@@ -255,7 +255,7 @@ void RiaSummaryCurveDefinitionAnalyser::setCurveDefinitions( const std::vector<R
{
const RifEclipseSummaryAddress& address = curveDef.summaryAddress();
m_quantityNames.insert( address.quantityName() );
m_vectorNames.insert( address.vectorName() );
m_summaryAdresses.insert( address );
}
}

2
ApplicationLibCode/Application/RiaSummaryCurveDefinition.h
View File

@@ -75,5 +75,5 @@ public:
std::set<RimSummaryCaseCollection*> m_ensembles; // All the ensembles referenced by the summary cases
std::set<RifEclipseSummaryAddress> m_summaryAdresses;
std::set<std::string> m_quantityNames; // Quantity names from the addresses
std::set<std::string> m_vectorNames;
};

4
ApplicationLibCode/Application/Tools/RiaSummaryAddressAnalyzer.cpp
View File

@@ -383,9 +383,9 @@ void RiaSummaryAddressAnalyzer::analyzeSingleAddress( const RifEclipseSummaryAdd
m_wellNames.insert( { wellName, address } );
}
if ( !address.quantityName().empty() )
if ( !address.vectorName().empty() )
{
m_quantities.insert( address.quantityName() );
m_quantities.insert( address.vectorName() );
}
if ( !address.groupName().empty() )

2
ApplicationLibCode/Application/Tools/RiaSummaryStringTools.cpp
View File

@@ -261,7 +261,7 @@ std::set<RifEclipseSummaryAddress>
std::set<RifEclipseSummaryAddress> addressesWithoutDiffVectors;
for ( const auto& adr : addresses )
{
if ( RiaStdStringTools::endsWith( adr.quantityName(), diffText ) ) continue;
if ( RiaStdStringTools::endsWith( adr.vectorName(), diffText ) ) continue;
addressesWithoutDiffVectors.insert( adr );
}