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 RigWellLogFile to RigWellLogLasFile.

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-09-27 14:09:50 +02:00
parent 1b70eaabb4
commit 9832604c66
15 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,7 +600,7 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
{
using ChannelValNameIdxTuple = std::tuple<double, QString, int>;
RigWellLogFile* wellLogFileData = sourceDef.wellLogFile()->wellLogFileData();
RigWellLogLasFile* wellLogFileData = sourceDef.wellLogFile()->wellLogFileData();
QStringList channelNames = wellLogFileData->wellLogChannelNames();

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

@@ -18,7 +18,7 @@
#include "Rim3dWellLogExtractionCurve.h"
#include "RigWellLogFile.h"
#include "RigWellLogLasFile.h"
#include "RiaCurveDataTools.h"
#include "RiaExtractionTools.h"

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

@@ -18,7 +18,7 @@
#include "Rim3dWellLogFileCurve.h"
#include "RigWellLogFile.h"
#include "RigWellLogLasFile.h"
#include "RimWellLogFile.h"
#include "RimWellLogFileChannel.h"
@@ -89,7 +89,7 @@ void Rim3dWellLogFileCurve::curveValuesAndMds( std::vector<double>* values, std:
if ( m_wellLogFile )
{
RigWellLogFile* wellLogFile = m_wellLogFile->wellLogFileData();
RigWellLogLasFile* wellLogFile = m_wellLogFile->wellLogFileData();
if ( wellLogFile )
{
*values = wellLogFile->values( m_wellLogChannelName );
@@ -135,7 +135,7 @@ QString Rim3dWellLogFileCurve::createAutoName() const
channelNameAvailable = true;
}
RigWellLogFile* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
RigWellLogLasFile* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
if ( wellLogFile )
{

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

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

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

@@ -26,8 +26,8 @@
#include "RiaWellLogUnitTools.h"
#include "RigStatisticsMath.h"
#include "RigWellLogFile.h"
#include "RigWellLogIndexDepthOffset.h"
#include "RigWellLogLasFile.h"
#include "RimWellLogFile.h"
@@ -95,7 +95,7 @@ void RimEnsembleWellLogStatistics::calculate( const std::vector<RimWellLogFile*>
QString errorMessage;
if ( wellLogFile->readFile( &errorMessage ) )
{
RigWellLogFile* fileData = wellLogFile->wellLogFileData();
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData();
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 ) )
{
RigWellLogFile* fileData = wellLogFile->wellLogFileData();
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData();
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 ) )
{
RigWellLogFile* fileData = wellLogFile->wellLogFileData();
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData();
std::vector<double> depths = fileData->depthValues();
std::vector<double> tvdDepths = fileData->tvdMslValues();

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

@@ -888,6 +888,8 @@ void RimWellLogExtractionCurve::findAndLoadWbsParametersFromLasFiles( const RimW
RiaLogging::error( errMsg );
}
}
// csv
}
}

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

@@ -26,7 +26,7 @@
#include "RiaFieldHandleTools.h"
#include "RiaQDateTimeTools.h"
#include "RigWellLogFile.h"
#include "RigWellLogLasFile.h"
#include "RimFileWellPath.h"
#include "RimTools.h"
@@ -144,7 +144,7 @@ bool RimWellLogFile::readFile( QString* errorMessage )
{
if ( !m_wellLogDataFile.p() )
{
m_wellLogDataFile = new RigWellLogFile;
m_wellLogDataFile = new RigWellLogLasFile;
}
m_name = QFileInfo( m_fileName().path() ).fileName();
@@ -242,7 +242,7 @@ std::vector<std::pair<double, double>> RimWellLogFile::findMdAndChannelValuesFor
std::vector<RimWellLogFile*> wellLogFiles = wellPath->descendantsIncludingThisOfType<RimWellLogFile>();
for ( RimWellLogFile* wellLogFile : wellLogFiles )
{
RigWellLogFile* fileData = wellLogFile->wellLogFileData();
RigWellLogLasFile* fileData = wellLogFile->wellLogFileData();
std::vector<double> channelValues = fileData->values( channelName );
if ( !channelValues.empty() )
{

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

@@ -19,7 +19,7 @@
#pragma once
#include "RigWellLogFile.h"
#include "RigWellLogLasFile.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
@@ -57,7 +57,7 @@ public:
QString wellName() const;
QDateTime date() const;
RigWellLogFile* wellLogFileData() { return m_wellLogDataFile.p(); }
RigWellLogLasFile* wellLogFileData() { return m_wellLogDataFile.p(); }
std::vector<RimWellLogFileChannel*> wellLogChannels() const;
bool hasFlowData() const;
@@ -86,7 +86,7 @@ private:
caf::PdmChildArrayField<RimWellLogFileChannel*> m_wellLogChannelNames;
private:
cvf::ref<RigWellLogFile> m_wellLogDataFile;
cvf::ref<RigWellLogLasFile> m_wellLogDataFile;
caf::PdmField<QString> m_wellName;
caf::PdmField<caf::FilePath> m_fileName;
caf::PdmField<QString> m_name;

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

@@ -84,7 +84,7 @@ void RimWellLogFileCurve::onLoadDataAndUpdate( bool updateParentPlot )
if ( m_wellPath && m_wellLogFile )
{
RigWellLogFile* wellLogFile = m_wellLogFile->wellLogFileData();
RigWellLogLasFile* wellLogFile = m_wellLogFile->wellLogFileData();
if ( wellLogFile )
{
std::vector<double> values = wellLogFile->values( m_wellLogChannelName );
@@ -456,7 +456,7 @@ QString RimWellLogFileCurve::createCurveAutoName()
channelNameAvailable = true;
}
RigWellLogFile* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
RigWellLogLasFile* wellLogFile = m_wellLogFile ? m_wellLogFile->wellLogFileData() : nullptr;
if ( wellLogFile )
{