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

Merge pull request #8791 from OPM/8790-rename-to-group

Browse Source 
Rename summary references to "Group"
This commit is contained in:
Magne Sjaastad
2022-04-07 21:06:40 +02:00
committed by GitHub
parent f099a8c89f
commit 93614ef272
42 changed files with 631 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp
View File

@@ -55,8 +55,8 @@ RifEclipseSummaryAddress::RifEclipseSummaryAddress( SummaryVarCategory
m_regionNumber = reg2regPair.first;
m_regionNumber2 = reg2regPair.second;
break;
case SUMMARY_WELL_GROUP:
m_wellGroupName = identifiers[INPUT_WELL_GROUP_NAME];
case SUMMARY_GROUP:
m_groupName = identifiers[INPUT_GROUP_NAME];
break;
case SUMMARY_WELL:
m_wellName = identifiers[INPUT_WELL_NAME];
@@ -251,13 +251,13 @@ RifEclipseSummaryAddress
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RifEclipseSummaryAddress::wellGroupAddress( const std::string& quantityName,
const std::string& wellGroupName )
RifEclipseSummaryAddress RifEclipseSummaryAddress::groupAddress( const std::string& quantityName,
const std::string& groupName )
{
RifEclipseSummaryAddress addr;
addr.m_variableCategory = SUMMARY_WELL_GROUP;
addr.m_variableCategory = SUMMARY_GROUP;
addr.m_quantityName = quantityName;
addr.m_wellGroupName = wellGroupName;
addr.m_groupName = groupName;
return addr;
}
@@ -509,9 +509,9 @@ std::string RifEclipseSummaryAddress::itemUiText() const
text += formatUiTextRegionToRegion();
}
break;
case SUMMARY_WELL_GROUP:
case SUMMARY_GROUP:
{
text += this->wellGroupName();
text += this->groupName();
}
break;
case SUMMARY_WELL:
@@ -584,8 +584,8 @@ std::string
return formatUiTextRegionToRegion();
case INPUT_WELL_NAME:
return wellName();
case INPUT_WELL_GROUP_NAME:
return wellGroupName();
case INPUT_GROUP_NAME:
return groupName();
case INPUT_CELL_IJK:
return blockAsString();
case INPUT_LGR_NAME:
@@ -643,8 +643,8 @@ bool RifEclipseSummaryAddress::isValid() const
if ( m_regionNumber2 == -1 ) return false;
return true;
case SUMMARY_WELL_GROUP:
if ( m_wellGroupName.size() == 0 ) return false;
case SUMMARY_GROUP:
if ( m_groupName.size() == 0 ) return false;
return true;
case SUMMARY_WELL:
@@ -789,8 +789,8 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::fromTokens( const std::vector
}
break;
case SUMMARY_WELL_GROUP:
if ( !token1.empty() ) return wellGroupAddress( quantityName, token1 );
case SUMMARY_GROUP:
if ( !token1.empty() ) return groupAddress( quantityName, token1 );
break;
case SUMMARY_WELL:
@@ -889,7 +889,7 @@ bool RifEclipseSummaryAddress::isValidEclipseCategory() const
case SUMMARY_MISC:
case SUMMARY_REGION:
case SUMMARY_REGION_2_REGION:
case SUMMARY_WELL_GROUP:
case SUMMARY_GROUP:
case SUMMARY_WELL:
case SUMMARY_WELL_COMPLETION:
case SUMMARY_WELL_LGR:
@@ -985,9 +985,9 @@ bool operator==( const RifEclipseSummaryAddress& first, const RifEclipseSummaryA
if ( first.regionNumber2() != second.regionNumber2() ) return false;
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP:
case RifEclipseSummaryAddress::SUMMARY_GROUP:
{
if ( first.wellGroupName() != second.wellGroupName() ) return false;
if ( first.groupName() != second.groupName() ) return false;
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL:
@@ -1083,10 +1083,9 @@ bool operator<( const RifEclipseSummaryAddress& first, const RifEclipseSummaryAd
return first.regionNumber2() < second.regionNumber2();
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP:
case RifEclipseSummaryAddress::SUMMARY_GROUP:
{
if ( first.wellGroupName() != second.wellGroupName() )
return first.wellGroupName() < second.wellGroupName();
if ( first.groupName() != second.groupName() ) return first.groupName() < second.groupName();
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL: