OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Rename method name.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2024-05-28 10:44:44 +02:00
1 parent 6e1289507f
commit 74ba0c8b8c
13 files changed
+27 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesImpl.cpp
+1 -1
View File
@@ -123,7 +123,7 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( RimCase
{ {
if ( !selectedCase || !sourceWell || !soureWellLogFile || destinationWells.empty() ) return; if ( !selectedCase || !sourceWell || !soureWellLogFile || destinationWells.empty() ) return;
auto* sourceWellLogData = soureWellLogFile->wellLogFileData(); auto* sourceWellLogData = soureWellLogFile->wellLogData();
const auto defaultPropertyMap = createDefaultPropertyMap( selectedResultProperties, sourceWellLogData ); const auto defaultPropertyMap = createDefaultPropertyMap( selectedResultProperties, sourceWellLogData );
// NOTE: map createIndexKDepthDataMapFromCase is created using well extractor, while sourceWellLogData depth // NOTE: map createIndexKDepthDataMapFromCase is created using well extractor, while sourceWellLogData depth
ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ void RicAddWellLogToPlotFeature::onActionTriggered( bool isChecked )
plotTrack->addCurve( curve ); plotTrack->addCurve( curve );
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogFileData(); RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogData();
CVF_ASSERT( wellLogDataFile ); CVF_ASSERT( wellLogDataFile );
if ( wlIdx == 0 ) if ( wlIdx == 0 )
ApplicationLibCode/FileInterface/RifDataSourceForRftPlt.cpp
+2 -2
View File
@@ -146,9 +146,9 @@ std::vector<RiaDefines::EclipseUnitSystem> RifDataSourceForRftPlt::availableUnit
systems.push_back( m_eclCase->eclipseCaseData()->unitsType() ); systems.push_back( m_eclCase->eclipseCaseData()->unitsType() );
} }
if ( m_wellLogFile && m_wellLogFile->wellLogFileData() ) if ( m_wellLogFile && m_wellLogFile->wellLogData() )
{ {
auto eclipseUnit = RiaDefines::fromDepthUnit( m_wellLogFile->wellLogFileData()->depthUnit() ); auto eclipseUnit = RiaDefines::fromDepthUnit( m_wellLogFile->wellLogData()->depthUnit() );
systems.push_back( eclipseUnit ); systems.push_back( eclipseUnit );
} }
ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
+6 -6
View File
@@ -590,7 +590,7 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
} }
else if ( sourceDef.sourceType() == RifDataSourceForRftPlt::SourceType::OBSERVED_LAS_FILE ) else if ( sourceDef.sourceType() == RifDataSourceForRftPlt::SourceType::OBSERVED_LAS_FILE )
{ {
if ( sourceDef.wellLogFile() && sourceDef.wellLogFile()->wellLogFileData() ) if ( sourceDef.wellLogFile() && sourceDef.wellLogFile()->wellLogData() )
{ {
RimWellLogLasFile::WellFlowCondition flowCondition = sourceDef.wellLogFile()->wellFlowRateCondition(); RimWellLogLasFile::WellFlowCondition flowCondition = sourceDef.wellLogFile()->wellFlowRateCondition();
@@ -599,9 +599,9 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
{ {
using ChannelValNameIdxTuple = std::tuple<double, QString, int>; using ChannelValNameIdxTuple = std::tuple<double, QString, int>;
RigWellLogLasFile* wellLogFileData = sourceDef.wellLogFile()->wellLogFileData(); RigWellLogLasFile* wellLogData = sourceDef.wellLogFile()->wellLogData();
QStringList channelNames = wellLogFileData->wellLogChannelNames(); QStringList channelNames = wellLogData->wellLogChannelNames();
std::multiset<ChannelValNameIdxTuple> sortedChannels; std::multiset<ChannelValNameIdxTuple> sortedChannels;
std::vector<std::vector<double>> channelData; std::vector<std::vector<double>> channelData;
@@ -610,16 +610,16 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
for ( int chIdx = 0; chIdx < channelNames.size(); ++chIdx ) for ( int chIdx = 0; chIdx < channelNames.size(); ++chIdx )
{ {
QString channelName = channelNames[chIdx]; QString channelName = channelNames[chIdx];
channelData[chIdx] = wellLogFileData->values( channelName ); channelData[chIdx] = wellLogData->values( channelName );
if ( !channelData[chIdx].empty() ) if ( !channelData[chIdx].empty() )
{ {
sortedChannels.insert( ChannelValNameIdxTuple( -fabs( channelData[chIdx].front() ), channelName, chIdx ) ); sortedChannels.insert( ChannelValNameIdxTuple( -fabs( channelData[chIdx].front() ), channelName, chIdx ) );
} }
} }
std::vector<double> depthValues = wellLogFileData->depthValues(); std::vector<double> depthValues = wellLogData->depthValues();
RiaDefines::EclipseUnitSystem unitSystem = RiaDefines::fromDepthUnit( wellLogFileData->depthUnit() ); RiaDefines::EclipseUnitSystem unitSystem = RiaDefines::fromDepthUnit( wellLogData->depthUnit() );
for ( const ChannelValNameIdxTuple& channelInfo : sortedChannels ) for ( const ChannelValNameIdxTuple& channelInfo : sortedChannels )
{ {
ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp
+2 -2
View File
@@ -91,7 +91,7 @@ void Rim3dWellLogFileCurve::curveValuesAndMds( std::vector<double>* values, std:
if ( m_wellLogFile ) if ( m_wellLogFile )
{ {
RigWellLogData* wellLogFile = m_wellLogFile->wellLogFileData(); RigWellLogData* wellLogFile = m_wellLogFile->wellLogData();
if ( wellLogFile ) if ( wellLogFile )
{ {
*values = wellLogFile->values( m_wellLogChannelName ); *values = wellLogFile->values( m_wellLogChannelName );
@@ -137,7 +137,7 @@ QString Rim3dWellLogFileCurve::createAutoName() const
channelNameAvailable = true; channelNameAvailable = true;
} }
RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr; RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogData() : nullptr;
if ( wellLogFile ) if ( wellLogFile )
{ {
ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp
+2 -2
View File
@@ -774,7 +774,7 @@ void RimEnsembleWellLogCurveSet::updateEnsembleCurves( const std::vector<RimWell
QString errorMessage; QString errorMessage;
if ( wellLogFile->readFile( &errorMessage ) ) if ( wellLogFile->readFile( &errorMessage ) )
{ {
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogFileData(); RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogData();
CVF_ASSERT( wellLogDataFile ); CVF_ASSERT( wellLogDataFile );
if ( isFirst ) if ( isFirst )
@@ -1264,7 +1264,7 @@ bool RimEnsembleWellLogCurveSet::hasPropertyInFile( const QString& property ) co
QString errorMessage; QString errorMessage;
if ( !wellLogFile->readFile( &errorMessage ) ) return false; if ( !wellLogFile->readFile( &errorMessage ) ) return false;
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogFileData(); RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogData();
CVF_ASSERT( wellLogDataFile ); CVF_ASSERT( wellLogDataFile );
std::vector<double> values = wellLogDataFile->values( RiaResultNames::indexKResultName() ); std::vector<double> values = wellLogDataFile->values( RiaResultNames::indexKResultName() );
ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatistics.cpp
+3 -3
View File
@@ -95,7 +95,7 @@ void RimEnsembleWellLogStatistics::calculate( const std::vector<RimWellLogLasFil
QString errorMessage; QString errorMessage;
if ( wellLogFile->readFile( &errorMessage ) ) if ( wellLogFile->readFile( &errorMessage ) )
{ {
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData(); RigWellLogLasFile* fileData = wellLogFile->wellLogData();
RiaDefines::DepthUnitType depthUnitInFile = fileData->depthUnit(); RiaDefines::DepthUnitType depthUnitInFile = fileData->depthUnit();
if ( m_depthUnit != RiaDefines::DepthUnitType::UNIT_NONE && m_depthUnit != depthUnitInFile ) if ( m_depthUnit != RiaDefines::DepthUnitType::UNIT_NONE && m_depthUnit != depthUnitInFile )
{ {
@@ -197,7 +197,7 @@ void RimEnsembleWellLogStatistics::calculateByKLayer( const std::vector<RimWellL
QString errorMessage; QString errorMessage;
if ( wellLogFile->readFile( &errorMessage ) ) if ( wellLogFile->readFile( &errorMessage ) )
{ {
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData(); RigWellLogLasFile* fileData = wellLogFile->wellLogData();
std::vector<double> kIndexValues = fileData->values( RiaResultNames::indexKResultName() ); std::vector<double> kIndexValues = fileData->values( RiaResultNames::indexKResultName() );
std::vector<double> values = fileData->values( wellLogChannelName ); std::vector<double> values = fileData->values( wellLogChannelName );
@@ -300,7 +300,7 @@ std::shared_ptr<RigWellLogIndexDepthOffset>
QString errorMessage; QString errorMessage;
if ( wellLogFile->readFile( &errorMessage ) ) if ( wellLogFile->readFile( &errorMessage ) )
{ {
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData(); RigWellLogLasFile* fileData = wellLogFile->wellLogData();
std::vector<double> depths = fileData->depthValues(); std::vector<double> depths = fileData->depthValues();
std::vector<double> tvdDepths = fileData->tvdMslValues(); std::vector<double> tvdDepths = fileData->tvdMslValues();
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp
+2 -2
View File
@@ -117,7 +117,7 @@ std::vector<std::pair<double, double>> RimWellLogCsvFile::findMdAndChannelValues
std::vector<RimWellLogCsvFile*> wellLogFiles = wellPath.descendantsIncludingThisOfType<RimWellLogCsvFile>(); std::vector<RimWellLogCsvFile*> wellLogFiles = wellPath.descendantsIncludingThisOfType<RimWellLogCsvFile>();
for ( RimWellLogCsvFile* wellLogFile : wellLogFiles ) for ( RimWellLogCsvFile* wellLogFile : wellLogFiles )
{ {
RigWellLogCsvFile* fileData = wellLogFile->wellLogFileData(); RigWellLogCsvFile* fileData = wellLogFile->wellLogData();
if ( fileData ) if ( fileData )
{ {
std::vector<double> channelValues = fileData->values( channelName ); std::vector<double> channelValues = fileData->values( channelName );
@@ -144,7 +144,7 @@ std::vector<std::pair<double, double>> RimWellLogCsvFile::findMdAndChannelValues
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigWellLogCsvFile* RimWellLogCsvFile::wellLogFileData() RigWellLogCsvFile* RimWellLogCsvFile::wellLogData()
{ {
return m_wellLogDataFile.p(); return m_wellLogDataFile.p();
} }
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
QString wellName() const override; QString wellName() const override;
RigWellLogCsvFile* wellLogFileData() override; RigWellLogCsvFile* wellLogData() override;
std::vector<std::pair<double, double>> std::vector<std::pair<double, double>>
findMdAndChannelValuesForWellPath( const RimWellPath& wellPath, const QString& channelName, QString* unitString = nullptr ) override; findMdAndChannelValuesForWellPath( const RimWellPath& wellPath, const QString& channelName, QString* unitString = nullptr ) override;
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
virtual QString wellName() const = 0; virtual QString wellName() const = 0;
virtual QString name() const = 0; virtual QString name() const = 0;
virtual bool readFile( QString* errorMessage ) = 0; virtual bool readFile( QString* errorMessage ) = 0;
virtual RigWellLogData* wellLogFileData() = 0; virtual RigWellLogData* wellLogData() = 0;
virtual QDateTime date() const; virtual QDateTime date() const;
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp
+1 -1
View File
@@ -198,7 +198,7 @@ std::vector<std::pair<double, double>> RimWellLogLasFile::findMdAndChannelValues
std::vector<RimWellLogLasFile*> wellLogFiles = wellPath.descendantsIncludingThisOfType<RimWellLogLasFile>(); std::vector<RimWellLogLasFile*> wellLogFiles = wellPath.descendantsIncludingThisOfType<RimWellLogLasFile>();
for ( RimWellLogLasFile* wellLogFile : wellLogFiles ) for ( RimWellLogLasFile* wellLogFile : wellLogFiles )
{ {
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData(); RigWellLogLasFile* fileData = wellLogFile->wellLogData();
std::vector<double> channelValues = fileData->values( channelName ); std::vector<double> channelValues = fileData->values( channelName );
if ( !channelValues.empty() ) if ( !channelValues.empty() )
{ {
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h
+1 -1
View File
@@ -54,7 +54,7 @@ public:
QString wellName() const override; QString wellName() const override;
RigWellLogLasFile* wellLogFileData() override { return m_wellLogDataFile.p(); } RigWellLogLasFile* wellLogData() override { return m_wellLogDataFile.p(); }
bool hasFlowData() const; bool hasFlowData() const;
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp
+4 -4
View File
@@ -85,7 +85,7 @@ void RimWellLogLasFileCurve::onLoadDataAndUpdate( bool updateParentPlot )
if ( m_wellPath && m_wellLogFile ) if ( m_wellPath && m_wellLogFile )
{ {
RigWellLogData* wellLogFile = m_wellLogFile->wellLogFileData(); RigWellLogData* wellLogFile = m_wellLogFile->wellLogData();
if ( wellLogFile ) if ( wellLogFile )
{ {
std::vector<double> values = wellLogFile->values( m_wellLogChannelName ); std::vector<double> values = wellLogFile->values( m_wellLogChannelName );
@@ -457,7 +457,7 @@ QString RimWellLogLasFileCurve::createCurveAutoName()
channelNameAvailable = true; channelNameAvailable = true;
} }
RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr; RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogData() : nullptr;
if ( wellLogFile ) if ( wellLogFile )
{ {
@@ -498,9 +498,9 @@ QString RimWellLogLasFileCurve::wellLogChannelUiName() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimWellLogLasFileCurve::wellLogChannelUnits() const QString RimWellLogLasFileCurve::wellLogChannelUnits() const
{ {
if ( m_wellLogFile && m_wellLogFile->wellLogFileData() ) if ( m_wellLogFile && m_wellLogFile->wellLogData() )
{ {
return m_wellLogFile->wellLogFileData()->wellLogChannelUnitString( m_wellLogChannelName ); return m_wellLogFile->wellLogData()->wellLogChannelUnitString( m_wellLogChannelName );
} }
return RiaWellLogUnitTools<double>::noUnitString(); return RiaWellLogUnitTools<double>::noUnitString();
} }