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

Janitor: move historyIdentifier/differenceIdentifier.

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-12-04 14:16:46 +01:00
committed by Magne Sjaastad
parent ca87cee79b
commit 08f9e9b5bb
10 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
ApplicationLibCode/ProjectDataModel/Summary/RimObjectiveFunctionTools.cpp
View File

@@ -62,7 +62,7 @@ std::string RimObjectiveFunctionTools::nativeQuantityName( const std::string& qu
std::string nativeName = quantityName;
{
auto stringToRemove = RifReaderEclipseSummary::differenceIdentifier();
auto stringToRemove = RifEclipseSummaryAddressDefines::differenceIdentifier();
if ( RiaStdStringTools::endsWith( nativeName, stringToRemove ) )
{
nativeName = nativeName.substr( 0, nativeName.size() - stringToRemove.size() );
@@ -70,7 +70,7 @@ std::string RimObjectiveFunctionTools::nativeQuantityName( const std::string& qu
}
{
auto stringToRemove = RifReaderEclipseSummary::historyIdentifier();
auto stringToRemove = RifEclipseSummaryAddressDefines::historyIdentifier();
if ( RiaStdStringTools::endsWith( nativeName, stringToRemove ) )
{
nativeName = nativeName.substr( 0, nativeName.size() - stringToRemove.size() );

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -2417,7 +2417,7 @@ RimSummaryPlot::CurveInfo RimSummaryPlot::handleAddressCollectionDrop( RimSummar
if ( !addr.isHistoryVector() && RiaPreferencesSummary::current()->appendHistoryVectors() )
{
auto historyAddr = addr;
historyAddr.setVectorName( addr.vectorName() + RifReaderEclipseSummary::historyIdentifier() );
historyAddr.setVectorName( addr.vectorName() + RifEclipseSummaryAddressDefines::historyIdentifier() );
auto historyCurveDef = newCurveDef;
historyCurveDef.setSummaryAddressY( historyAddr );
@@ -2477,7 +2477,7 @@ RimSummaryPlot::CurveInfo RimSummaryPlot::handleSummaryAddressDrop( RimSummaryAd
if ( !summaryAddr->address().isHistoryVector() && RiaPreferencesSummary::current()->appendHistoryVectors() )
{
auto historyAddr = summaryAddr->address();
historyAddr.setVectorName( summaryAddr->address().vectorName() + RifReaderEclipseSummary::historyIdentifier() );
historyAddr.setVectorName( summaryAddr->address().vectorName() + RifEclipseSummaryAddressDefines::historyIdentifier() );
newCurveAddresses.push_back( historyAddr );
}