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

Refactor: Rename method name.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-05-27 14:48:28 +02:00
parent 6e1289507f
commit 74ba0c8b8c
13 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesImpl.cpp
View File

@@ -123,7 +123,7 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellsLasFiles( RimCase
{
if ( !selectedCase || !sourceWell || !soureWellLogFile || destinationWells.empty() ) return;
auto* sourceWellLogData = soureWellLogFile->wellLogFileData();
auto* sourceWellLogData = soureWellLogFile->wellLogData();
const auto defaultPropertyMap = createDefaultPropertyMap( selectedResultProperties, sourceWellLogData );
// NOTE: map createIndexKDepthDataMapFromCase is created using well extractor, while sourceWellLogData depth

2
ApplicationLibCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp
View File

@@ -83,7 +83,7 @@ void RicAddWellLogToPlotFeature::onActionTriggered( bool isChecked )
plotTrack->addCurve( curve );
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogFileData();
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogData();
CVF_ASSERT( wellLogDataFile );
if ( wlIdx == 0 )

4
ApplicationLibCode/FileInterface/RifDataSourceForRftPlt.cpp
View File

@@ -146,9 +146,9 @@ std::vector<RiaDefines::EclipseUnitSystem> RifDataSourceForRftPlt::availableUnit
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 );
}

12
ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@@ -590,7 +590,7 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
}
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();
@@ -599,9 +599,9 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
{
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::vector<std::vector<double>> channelData;
@@ -610,16 +610,16 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
for ( int chIdx = 0; chIdx < channelNames.size(); ++chIdx )
{
QString channelName = channelNames[chIdx];
channelData[chIdx] = wellLogFileData->values( channelName );
channelData[chIdx] = wellLogData->values( channelName );
if ( !channelData[chIdx].empty() )
{
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 )
{

4
ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogFileCurve.cpp
View File

@@ -91,7 +91,7 @@ void Rim3dWellLogFileCurve::curveValuesAndMds( std::vector<double>* values, std:
if ( m_wellLogFile )
{
RigWellLogData* wellLogFile = m_wellLogFile->wellLogFileData();
RigWellLogData* wellLogFile = m_wellLogFile->wellLogData();
if ( wellLogFile )
{
*values = wellLogFile->values( m_wellLogChannelName );
@@ -137,7 +137,7 @@ QString Rim3dWellLogFileCurve::createAutoName() const
channelNameAvailable = true;
}
RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogData() : nullptr;
if ( wellLogFile )
{

4
ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp
View File

@@ -774,7 +774,7 @@ void RimEnsembleWellLogCurveSet::updateEnsembleCurves( const std::vector<RimWell
QString errorMessage;
if ( wellLogFile->readFile( &errorMessage ) )
{
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogFileData();
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogData();
CVF_ASSERT( wellLogDataFile );
if ( isFirst )
@@ -1264,7 +1264,7 @@ bool RimEnsembleWellLogCurveSet::hasPropertyInFile( const QString& property ) co
QString errorMessage;
if ( !wellLogFile->readFile( &errorMessage ) ) return false;
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogFileData();
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogData();
CVF_ASSERT( wellLogDataFile );
std::vector<double> values = wellLogDataFile->values( RiaResultNames::indexKResultName() );

6
ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogStatistics.cpp
View File

@@ -95,7 +95,7 @@ void RimEnsembleWellLogStatistics::calculate( const std::vector<RimWellLogLasFil
QString errorMessage;
if ( wellLogFile->readFile( &errorMessage ) )
{
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData();
RigWellLogLasFile* fileData = wellLogFile->wellLogData();
RiaDefines::DepthUnitType depthUnitInFile = fileData->depthUnit();
if ( m_depthUnit != RiaDefines::DepthUnitType::UNIT_NONE && m_depthUnit != depthUnitInFile )
{
@@ -197,7 +197,7 @@ void RimEnsembleWellLogStatistics::calculateByKLayer( const std::vector<RimWellL
QString errorMessage;
if ( wellLogFile->readFile( &errorMessage ) )
{
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData();
RigWellLogLasFile* fileData = wellLogFile->wellLogData();
std::vector<double> kIndexValues = fileData->values( RiaResultNames::indexKResultName() );
std::vector<double> values = fileData->values( wellLogChannelName );
@@ -300,7 +300,7 @@ std::shared_ptr<RigWellLogIndexDepthOffset>
QString errorMessage;
if ( wellLogFile->readFile( &errorMessage ) )
{
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData();
RigWellLogLasFile* fileData = wellLogFile->wellLogData();
std::vector<double> depths = fileData->depthValues();
std::vector<double> tvdDepths = fileData->tvdMslValues();

4
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp
View File

@@ -117,7 +117,7 @@ std::vector<std::pair<double, double>> RimWellLogCsvFile::findMdAndChannelValues
std::vector<RimWellLogCsvFile*> wellLogFiles = wellPath.descendantsIncludingThisOfType<RimWellLogCsvFile>();
for ( RimWellLogCsvFile* wellLogFile : wellLogFiles )
{
RigWellLogCsvFile* fileData = wellLogFile->wellLogFileData();
RigWellLogCsvFile* fileData = wellLogFile->wellLogData();
if ( fileData )
{
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();
}

2
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.h
View File

@@ -49,7 +49,7 @@ public:
QString wellName() const override;
RigWellLogCsvFile* wellLogFileData() override;
RigWellLogCsvFile* wellLogData() override;
std::vector<std::pair<double, double>>
findMdAndChannelValuesForWellPath( const RimWellPath& wellPath, const QString& channelName, QString* unitString = nullptr ) override;

2
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.h
View File

@@ -49,7 +49,7 @@ public:
virtual QString wellName() const = 0;
virtual QString name() const = 0;
virtual bool readFile( QString* errorMessage ) = 0;
virtual RigWellLogData* wellLogFileData() = 0;
virtual RigWellLogData* wellLogData() = 0;
virtual QDateTime date() const;

2
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp
View File

@@ -198,7 +198,7 @@ std::vector<std::pair<double, double>> RimWellLogLasFile::findMdAndChannelValues
std::vector<RimWellLogLasFile*> wellLogFiles = wellPath.descendantsIncludingThisOfType<RimWellLogLasFile>();
for ( RimWellLogLasFile* wellLogFile : wellLogFiles )
{
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData();
RigWellLogLasFile* fileData = wellLogFile->wellLogData();
std::vector<double> channelValues = fileData->values( channelName );
if ( !channelValues.empty() )
{

2
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h
View File

@@ -54,7 +54,7 @@ public:
QString wellName() const override;
RigWellLogLasFile* wellLogFileData() override { return m_wellLogDataFile.p(); }
RigWellLogLasFile* wellLogData() override { return m_wellLogDataFile.p(); }
bool hasFlowData() const;

8
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFileCurve.cpp
View File

@@ -85,7 +85,7 @@ void RimWellLogLasFileCurve::onLoadDataAndUpdate( bool updateParentPlot )
if ( m_wellPath && m_wellLogFile )
{
RigWellLogData* wellLogFile = m_wellLogFile->wellLogFileData();
RigWellLogData* wellLogFile = m_wellLogFile->wellLogData();
if ( wellLogFile )
{
std::vector<double> values = wellLogFile->values( m_wellLogChannelName );
@@ -457,7 +457,7 @@ QString RimWellLogLasFileCurve::createCurveAutoName()
channelNameAvailable = true;
}
RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
RigWellLogData* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogData() : nullptr;
if ( wellLogFile )
{
@@ -498,9 +498,9 @@ QString RimWellLogLasFileCurve::wellLogChannelUiName() 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();
}