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

14
ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunction.cpp
View File

@@ -108,20 +108,20 @@ double RimObjectiveFunction::value( RimSummaryCase*
for ( auto vectorSummaryAddress : vectorSummaryAddresses )
{
std::string s = vectorSummaryAddress.quantityName() + RifReaderEclipseSummary::differenceIdentifier();
if ( !vectorSummaryAddress.quantityName().empty() )
std::string s = vectorSummaryAddress.vectorName() + RifReaderEclipseSummary::differenceIdentifier();
if ( !vectorSummaryAddress.vectorName().empty() )
{
if ( vectorSummaryAddress.quantityName().find( RifReaderEclipseSummary::differenceIdentifier() ) !=
if ( vectorSummaryAddress.vectorName().find( RifReaderEclipseSummary::differenceIdentifier() ) !=
std::string::npos )
{
s = vectorSummaryAddress.quantityName();
s = vectorSummaryAddress.vectorName();
}
RifEclipseSummaryAddress vectorSummaryAddressDiff = vectorSummaryAddress;
vectorSummaryAddressDiff.setQuantityName( s );
vectorSummaryAddressDiff.setVectorName( s );
RifEclipseSummaryAddress vectorSummaryAddressHistory = vectorSummaryAddress;
vectorSummaryAddressHistory.setQuantityName( vectorSummaryAddress.quantityName() +
RifReaderEclipseSummary::historyIdentifier() );
vectorSummaryAddressHistory.setVectorName( vectorSummaryAddress.vectorName() +
RifReaderEclipseSummary::historyIdentifier() );
if ( readerInterface->allResultAddresses().count( vectorSummaryAddressDiff ) )
{