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

#10367 Janitor: Remove unneccessary 'this' pointers

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-08-04 09:04:14 +02:00
parent 2614cf3d62
commit 5bf2c2a89d
292 changed files with 1625 additions and 1664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp
View File

@@ -520,11 +520,11 @@ std::string RifEclipseSummaryAddress::itemUiText() const
{
std::string text;
switch ( this->category() )
switch ( category() )
{
case SUMMARY_REGION:
{
text += std::to_string( this->regionNumber() );
text += std::to_string( regionNumber() );
}
break;
case SUMMARY_REGION_2_REGION:
@@ -534,37 +534,37 @@ std::string RifEclipseSummaryAddress::itemUiText() const
break;
case SUMMARY_GROUP:
{
text += this->groupName();
text += groupName();
}
break;
case SUMMARY_WELL:
{
text += this->wellName();
text += wellName();
}
break;
case SUMMARY_WELL_COMPLETION:
{
text += this->wellName();
text += wellName();
text += ":" + blockAsString();
}
break;
case SUMMARY_WELL_LGR:
{
text += this->lgrName();
text += ":" + this->wellName();
text += lgrName();
text += ":" + wellName();
}
break;
case SUMMARY_WELL_COMPLETION_LGR:
{
text += this->lgrName();
text += ":" + this->wellName();
text += lgrName();
text += ":" + wellName();
text += ":" + blockAsString();
}
break;
case SUMMARY_WELL_SEGMENT:
{
text += this->wellName();
text += ":" + std::to_string( this->wellSegmentNumber() );
text += wellName();
text += ":" + std::to_string( wellSegmentNumber() );
}
break;
case SUMMARY_BLOCK:
@@ -574,18 +574,18 @@ std::string RifEclipseSummaryAddress::itemUiText() const
break;
case SUMMARY_BLOCK_LGR:
{
text += this->lgrName();
text += lgrName();
text += ":" + blockAsString();
}
break;
case SUMMARY_AQUIFER:
{
text += std::to_string( this->aquiferNumber() );
text += std::to_string( aquiferNumber() );
}
break;
case SUMMARY_IMPORTED:
{
text += this->vectorName();
text += vectorName();
}
break;
}
@@ -968,7 +968,7 @@ std::string RifEclipseSummaryAddress::blockAsString() const
{
// Avoid space in address text https://github.com/OPM/ResInsight/issues/9707
return std::to_string( this->cellI() ) + "," + std::to_string( this->cellJ() ) + "," + std::to_string( this->cellK() );
return std::to_string( cellI() ) + "," + std::to_string( cellJ() ) + "," + std::to_string( cellK() );
}
//--------------------------------------------------------------------------------------------------
@@ -990,7 +990,7 @@ std::tuple<int, int, int> RifEclipseSummaryAddress::ijkTupleFromUiText( const st
//--------------------------------------------------------------------------------------------------
std::string RifEclipseSummaryAddress::formatUiTextRegionToRegion() const
{
return std::to_string( this->regionNumber() ) + " - " + std::to_string( this->regionNumber2() );
return std::to_string( regionNumber() ) + " - " + std::to_string( regionNumber2() );
}
//--------------------------------------------------------------------------------------------------

22
ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -613,11 +613,11 @@ const size_t* RifReaderEclipseOutput::eclipseCellIndexMapping()
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseOutput::importFaults( const QStringList& fileSet, cvf::Collection<RigFault>* faults )
{
if ( this->filenamesWithFaults().size() > 0 )
if ( filenamesWithFaults().size() > 0 )
{
for ( size_t i = 0; i < this->filenamesWithFaults().size(); i++ )
for ( size_t i = 0; i < filenamesWithFaults().size(); i++ )
{
QString faultFilename = this->filenamesWithFaults()[i];
QString faultFilename = filenamesWithFaults()[i];
RifEclipseInputFileTools::parseAndReadFaults( faultFilename, faults );
}
@@ -635,7 +635,7 @@ void RifReaderEclipseOutput::importFaults( const QStringList& fileSet, cvf::Coll
std::vector<QString>::iterator last = std::unique( filenamesWithFaults.begin(), filenamesWithFaults.end() );
filenamesWithFaults.erase( last, filenamesWithFaults.end() );
this->setFilenamesWithFaults( filenamesWithFaults );
setFilenamesWithFaults( filenamesWithFaults );
}
}
}
@@ -1481,7 +1481,7 @@ public:
if ( ert_wellhead )
{
size_t localGridCellidx = localGridCellIndexFromErtConnection( m_mainGrid->gridByIndex( gridNr ), ert_wellhead, nullptr );
this->insertTheParentCells( gridNr, localGridCellidx );
insertTheParentCells( gridNr, localGridCellidx );
}
std::string gridname = gridNr == 0 ? ECL_GRID_GLOBAL_GRID : m_mainGrid->gridByIndex( gridNr )->gridName();
@@ -1498,7 +1498,7 @@ public:
size_t localGridCellidx =
localGridCellIndexFromErtConnection( m_mainGrid->gridByIndex( gridNr ), ert_connection, nullptr );
this->insertTheParentCells( gridNr, localGridCellidx );
insertTheParentCells( gridNr, localGridCellidx );
}
}
}
@@ -1723,7 +1723,7 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo
for ( int gridNr = lastGridNr; gridNr >= 0; --gridNr )
{
std::string gridName = this->ertGridName( gridNr );
std::string gridName = ertGridName( gridNr );
// If this segment has connections in any grid, transfer the innermost ones
@@ -1808,7 +1808,7 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo
for ( int gridNr = lastGridNr; gridNr >= 0; --gridNr )
{
std::string gridName = this->ertGridName( gridNr );
std::string gridName = ertGridName( gridNr );
// If this segment has connections in any grid, use the deepest innermost one
@@ -1881,7 +1881,7 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo
for ( int gridNr = lastGridNr; gridNr >= 0; --gridNr )
{
std::string gridName = this->ertGridName( gridNr );
std::string gridName = ertGridName( gridNr );
// If this segment has connections in any grid, stop traversal
@@ -2047,7 +2047,7 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo
}
const well_conn_collection_type* connections =
well_state_get_grid_connections( ert_well_state, this->ertGridName( gridNr ).data() );
well_state_get_grid_connections( ert_well_state, ertGridName( gridNr ).data() );
// Import all well result cells for all connections
if ( connections )
@@ -2222,7 +2222,7 @@ std::vector<RigEclipseTimeStepInfo> RifReaderEclipseOutput::createFilteredTimeSt
for ( size_t i = 0; i < timeStepsOnFile.size(); i++ )
{
if ( this->isTimeStepIncludedByFilter( i ) )
if ( isTimeStepIncludedByFilter( i ) )
{
timeStepInfos.push_back(
RigEclipseTimeStepInfo( timeStepsOnFile[i], reportNumbersOnFile[i], daysSinceSimulationStartOnFile[i] ) );

2
ApplicationLibCode/FileInterface/RifReaderMockModel.cpp
View File

@@ -88,7 +88,7 @@ bool RifReaderMockModel::open( const QString& fileName, RigEclipseCaseData* ecli
cellResults->setTimeStepInfos( resAddr, staticResultTimeStepInfos ); \
cellResults->modifiableCellScalarResultTimesteps( resAddr )->resize( 1 ); \
std::vector<double>& values = cellResults->modifiableCellScalarResultTimesteps( resAddr )->at( 0 ); \
this->inputProperty( resultName, &values ); \
inputProperty( resultName, &values ); \
}
ADD_INPUT_PROPERTY( "PORO" );

2
ApplicationLibCode/FileInterface/RifReaderRftInterface.cpp
View File

@@ -23,7 +23,7 @@
std::set<RifEclipseRftAddress> RifReaderRftInterface::eclipseRftAddresses( const QString& wellName, const QDateTime& timeStep )
{
std::set<RifEclipseRftAddress> matchingAddresses;
std::set<RifEclipseRftAddress> allAddresses = this->eclipseRftAddresses();
std::set<RifEclipseRftAddress> allAddresses = eclipseRftAddresses();
for ( const RifEclipseRftAddress& address : allAddresses )
{
if ( address.wellName() == wellName && address.timeStep() == timeStep )