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

54
ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.h
View File

@@ -90,7 +90,7 @@ public:
}
RifEclipseSummaryAddress( SummaryVarCategory category,
const std::string& quantityName,
const std::string& vectorName,
int16_t regionNumber,
int16_t regionNumber2,
const std::string& groupName,
@@ -104,7 +104,7 @@ public:
bool isErrorResult,
int32_t id )
: m_variableCategory( category )
, m_quantityName( quantityName )
, m_vectorName( vectorName )
, m_regionNumber( regionNumber )
, m_regionNumber2( regionNumber2 )
, m_groupName( groupName )
@@ -127,36 +127,36 @@ public:
static RifEclipseSummaryAddress fromEclipseTextAddress( const std::string& textAddress );
static RifEclipseSummaryAddress fromEclipseTextAddressParseErrorTokens( const std::string& textAddress );
static SummaryVarCategory identifyCategory( const std::string& quantityName );
static SummaryVarCategory identifyCategory( const std::string& vectorName );
static RifEclipseSummaryAddress fieldAddress( const std::string& quantityName );
static RifEclipseSummaryAddress aquiferAddress( const std::string& quantityName, int aquiferNumber );
static RifEclipseSummaryAddress networkAddress( const std::string& quantityName );
static RifEclipseSummaryAddress miscAddress( const std::string& quantityName );
static RifEclipseSummaryAddress regionAddress( const std::string& quantityName, int regionNumber );
static RifEclipseSummaryAddress fieldAddress( const std::string& vectorName );
static RifEclipseSummaryAddress aquiferAddress( const std::string& vectorName, int aquiferNumber );
static RifEclipseSummaryAddress networkAddress( const std::string& vectorName );
static RifEclipseSummaryAddress miscAddress( const std::string& vectorName );
static RifEclipseSummaryAddress regionAddress( const std::string& vectorName, int regionNumber );
static RifEclipseSummaryAddress
regionToRegionAddress( const std::string& quantityName, int regionNumber, int region2Number );
static RifEclipseSummaryAddress groupAddress( const std::string& quantityName, const std::string& groupName );
static RifEclipseSummaryAddress wellAddress( const std::string& quantityName, const std::string& wellName );
regionToRegionAddress( const std::string& vectorName, int regionNumber, int region2Number );
static RifEclipseSummaryAddress groupAddress( const std::string& vectorName, const std::string& groupName );
static RifEclipseSummaryAddress wellAddress( const std::string& vectorName, const std::string& wellName );
static RifEclipseSummaryAddress
wellCompletionAddress( const std::string& quantityName, const std::string& wellName, int i, int j, int k );
wellCompletionAddress( const std::string& vectorName, const std::string& wellName, int i, int j, int k );
static RifEclipseSummaryAddress
wellLgrAddress( const std::string& quantityName, const std::string& lgrName, const std::string& wellName );
static RifEclipseSummaryAddress wellCompletionLgrAddress( const std::string& quantityName,
wellLgrAddress( const std::string& vectorName, const std::string& lgrName, const std::string& wellName );
static RifEclipseSummaryAddress wellCompletionLgrAddress( const std::string& vectorName,
const std::string& lgrName,
const std::string& wellName,
int i,
int j,
int k );
static RifEclipseSummaryAddress
wellSegmentAddress( const std::string& quantityName, const std::string& wellName, int segmentNumber );
static RifEclipseSummaryAddress blockAddress( const std::string& quantityName, int i, int j, int k );
wellSegmentAddress( const std::string& vectorName, const std::string& wellName, int segmentNumber );
static RifEclipseSummaryAddress blockAddress( const std::string& vectorName, int i, int j, int k );
static RifEclipseSummaryAddress
blockLgrAddress( const std::string& quantityName, const std::string& lgrName, int i, int j, int k );
static RifEclipseSummaryAddress calculatedAddress( const std::string& quantityName, int id );
static RifEclipseSummaryAddress importedAddress( const std::string& quantityName );
static RifEclipseSummaryAddress ensembleStatisticsAddress( const std::string& quantityName,
const std::string& dataQuantityName );
blockLgrAddress( const std::string& vectorName, const std::string& lgrName, int i, int j, int k );
static RifEclipseSummaryAddress calculatedAddress( const std::string& vectorName, int id );
static RifEclipseSummaryAddress importedAddress( const std::string& vectorName );
static RifEclipseSummaryAddress ensembleStatisticsAddress( const std::string& vectorName,
const std::string& datavectorName );
static std::string generateStringFromAddresses( const std::vector<RifEclipseSummaryAddress>& addressVector,
const std::string jointString = "; " );
@@ -166,8 +166,8 @@ public:
// Access methods
SummaryVarCategory category() const { return m_variableCategory; }
const std::string& quantityName() const { return m_quantityName; }
bool isHistoryQuantity() const;
const std::string& vectorName() const { return m_vectorName; }
bool isHistoryVector() const;
int regionNumber() const { return m_regionNumber; }
int regionNumber2() const { return m_regionNumber2; }
@@ -183,7 +183,7 @@ public:
int id() const { return m_id; }
std::string blockAsString() const;
const std::string ensembleStatisticsQuantityName() const;
const std::string ensembleStatisticsVectorName() const;
// Derived properties
@@ -193,7 +193,7 @@ public:
bool isUiTextMatchingFilterText( const QString& filterString ) const;
bool isValid() const;
void setQuantityName( const std::string& quantity ) { m_quantityName = quantity; }
void setVectorName( const std::string& vectorName ) { m_vectorName = vectorName; }
void setWellName( const std::string& wellName ) { m_wellName = wellName; }
void setGroupName( const std::string& groupName ) { m_groupName = groupName; }
void setRegion( int region ) { m_regionNumber = (int16_t)region; }
@@ -208,7 +208,7 @@ public:
bool hasAccumulatedData() const;
static std::string baseQuantityName( const std::string& quantityName );
static std::string baseVectorName( const std::string& vectorName );
private:
static RifEclipseSummaryAddress fromTokens( const std::vector<std::string>& tokens );
@@ -218,7 +218,7 @@ private:
std::string formatUiTextRegionToRegion() const;
std::pair<int16_t, int16_t> regionToRegionPairFromUiText( const std::string& s );
std::string m_quantityName;
std::string m_vectorName;
std::string m_groupName;
std::string m_wellName;
std::string m_lgrName;