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

Rename to SummaryCategory

Browse Source
This commit is contained in:
Magne Sjaastad
2023-09-18 09:28:29 +02:00
parent c06cda3883
commit 806f367566
49 changed files with 598 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp
View File

@@ -239,45 +239,45 @@ void RimSummaryCalculation::substituteVariables( std::vector<SummaryCalculationV
QVariant oldValue;
QVariant newValue;
bool isHandledBySteppingTools = false;
if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL )
if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL )
{
oldValue = QString::fromStdString( firstVariable.summaryAddress.wellName() );
newValue = QString::fromStdString( address.wellName() );
isHandledBySteppingTools = true;
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION )
{
oldValue = firstVariable.summaryAddress.regionNumber();
newValue = address.regionNumber();
isHandledBySteppingTools = true;
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP )
{
oldValue = QString::fromStdString( firstVariable.summaryAddress.groupName() );
newValue = QString::fromStdString( address.groupName() );
isHandledBySteppingTools = true;
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER )
{
oldValue = firstVariable.summaryAddress.aquiferNumber();
newValue = address.aquiferNumber();
isHandledBySteppingTools = true;
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL_COMPLETION ||
category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_BLOCK )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL_COMPLETION ||
category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_BLOCK )
{
oldValue = QString::fromStdString( firstVariable.summaryAddress.blockAsString() );
newValue = QString::fromStdString( address.blockAsString() );
isHandledBySteppingTools = true;
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC ||
category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD ||
category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC ||
category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD ||
category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_IMPORTED )
{
// No need to do anything for these types
return;
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION )
{
oldValue = QString::fromStdString( firstVariable.summaryAddress.formatUiTextRegionToRegion() );
newValue = QString::fromStdString( address.formatUiTextRegionToRegion() );
@@ -493,17 +493,17 @@ std::vector<RimSummaryCalculationAddress> RimSummaryCalculation::allAddressesFor
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCalculationAddress>
RimSummaryCalculation::allAddressesForCategory( RifEclipseSummaryAddressDefines::SummaryVarCategory category,
RimSummaryCalculation::allAddressesForCategory( RifEclipseSummaryAddressDefines::SummaryCategory category,
const std::set<RifEclipseSummaryAddress>& allResultAddresses ) const
{
std::vector<RimSummaryCalculationAddress> addresses;
std::string name = shortName().toStdString();
if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD )
if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD )
{
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::fieldAddress( name, m_id ) ) );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER )
{
std::set<int> uniqueNumbers;
std::for_each( allResultAddresses.begin(),
@@ -515,11 +515,11 @@ std::vector<RimSummaryCalculationAddress>
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::aquiferAddress( name, num, m_id ) ) );
}
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC )
{
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::miscAddress( name, m_id ) ) );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK )
{
std::set<std::string> uniqueNames;
std::for_each( allResultAddresses.begin(),
@@ -531,7 +531,7 @@ std::vector<RimSummaryCalculationAddress>
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::networkAddress( name, networkName, m_id ) ) );
}
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL )
{
std::set<std::string> uniqueWellNames;
std::for_each( allResultAddresses.begin(),
@@ -543,7 +543,7 @@ std::vector<RimSummaryCalculationAddress>
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::wellAddress( name, wellName, m_id ) ) );
}
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP )
{
std::set<std::string> uniqueGroupNames;
std::for_each( allResultAddresses.begin(),
@@ -555,7 +555,7 @@ std::vector<RimSummaryCalculationAddress>
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::groupAddress( name, groupName, m_id ) ) );
}
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION )
{
std::set<int> uniqueRegionNumbers;
std::for_each( allResultAddresses.begin(),
@@ -567,7 +567,7 @@ std::vector<RimSummaryCalculationAddress>
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::regionAddress( name, regionNumber, m_id ) ) );
}
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION )
{
std::set<std::pair<int, int>> uniqueRegionNumbers;
std::for_each( allResultAddresses.begin(),
@@ -580,7 +580,7 @@ std::vector<RimSummaryCalculationAddress>
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::regionToRegionAddress( name, r1, r2, m_id ) ) );
}
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_IMPORTED )
{
addresses.push_back( RimSummaryCalculationAddress( RifEclipseSummaryAddress::importedAddress( name, m_id ) ) );
}
@@ -595,40 +595,40 @@ RimSummaryCalculationAddress RimSummaryCalculation::singleAddressesForCategory(
{
std::string name = shortName().toStdString();
RifEclipseSummaryAddressDefines::SummaryVarCategory category = address.category();
if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_FIELD )
RifEclipseSummaryAddressDefines::SummaryCategory category = address.category();
if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_FIELD )
{
return RifEclipseSummaryAddress::fieldAddress( name, m_id );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_AQUIFER )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_AQUIFER )
{
return RifEclipseSummaryAddress::aquiferAddress( name, address.aquiferNumber(), m_id );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_MISC )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_MISC )
{
return RifEclipseSummaryAddress::miscAddress( name, m_id );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_NETWORK )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_NETWORK )
{
return RifEclipseSummaryAddress::networkAddress( name, address.networkName(), m_id );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_WELL )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_WELL )
{
return RifEclipseSummaryAddress::wellAddress( name, address.wellName(), m_id );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_GROUP )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_GROUP )
{
return RifEclipseSummaryAddress::groupAddress( name, address.groupName(), m_id );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION )
{
return RifEclipseSummaryAddress::regionAddress( name, address.regionNumber(), m_id );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_REGION_2_REGION )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_REGION_2_REGION )
{
return RifEclipseSummaryAddress::regionToRegionAddress( name, address.regionNumber(), address.regionNumber2(), m_id );
}
else if ( category == RifEclipseSummaryAddressDefines::SummaryVarCategory::SUMMARY_IMPORTED )
else if ( category == RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_IMPORTED )
{
return RifEclipseSummaryAddress::importedAddress( name, m_id );
}