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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ void RicCreateDepthAdjustedLasFilesImpl::createDestinationWellLasFile( const QSt
const std::vector<double>& tvdMslValues,
const std::vector<double>& tvdRkbValues,
const std::map<QString, std::vector<double>>& propertyMap,
const RigWellLogFile* sourceWellLogData,
const RigWellLogLasFile* sourceWellLogData,
const QString& exportFolder )
{
const auto depthUnitText = createDepthUnitText( sourceWellLogData->depthUnit() );
@ -393,7 +393,7 @@ std::map<int, RicCreateDepthAdjustedLasFilesImpl::IndexKDepthData>
//--------------------------------------------------------------------------------------------------
std::map<QString, std::vector<double>>
RicCreateDepthAdjustedLasFilesImpl::createDefaultPropertyMap( const std::vector<QString>& selectedProperties,
const RigWellLogFile* wellLogFile )
const RigWellLogLasFile* wellLogFile )
{
const QStringList lasDepthNames = QStringList(
{ RiaDefines::propertyNameMeasuredDepth(), RiaDefines::propertyNameTvdMslDepth(), RiaDefines::propertyNameTvdRkbDepth() } );

6
ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesImpl.h
View File

@ -25,7 +25,7 @@
class RigEclipseWellLogExtractor;
class RigGeoMechWellLogExtractor;
class RigResultAccessor;
class RigWellLogFile;
class RigWellLogLasFile;
class RimCase;
class RimEclipseCase;
class RimWellPath;
@ -77,7 +77,7 @@ void createDestinationWellLasFile( const QString&
const std::vector<double>& tvdMslValues,
const std::vector<double>& tvdRkbValues,
const std::map<QString, std::vector<double>>& propertyMap,
const RigWellLogFile* sourceWellLogData,
const RigWellLogLasFile* sourceWellLogData,
const QString& exportFolder );
std::string createDepthUnitText( RiaDefines::DepthUnitType depthUnitType );
@ -95,6 +95,6 @@ std::map<int, IndexKDepthData> createIndexKDepthDataMapFromVectors( const std::v
const std::vector<double>& wellIndexKValues );
std::map<QString, std::vector<double>> createDefaultPropertyMap( const std::vector<QString>& selectedProperties,
const RigWellLogFile* wellLogFile );
const RigWellLogLasFile* wellLogFile );
}; // namespace RicCreateDepthAdjustedLasFilesImpl

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

@ -34,7 +34,7 @@
#include "RimWellPathCollection.h"
#include "RiuPlotMainWindowTools.h"
#include "RigWellLogFile.h"
#include "RigWellLogLasFile.h"
#include "RiuQwtPlotWidget.h"
@ -83,7 +83,7 @@ void RicAddWellLogToPlotFeature::onActionTriggered( bool isChecked )
plotTrack->addCurve( curve );
RigWellLogFile* wellLogDataFile = wellLogFile->wellLogFileData();
RigWellLogLasFile* wellLogDataFile = wellLogFile->wellLogFileData();
CVF_ASSERT( wellLogDataFile );
if ( wlIdx == 0 )

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 )
{

4
ApplicationLibCode/ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake
View File

@ -4,7 +4,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapperTools.h
${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.h
${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RigWellLogFile.h
${CMAKE_CURRENT_LIST_DIR}/RigWellLogLasFile.h
${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.h
)
@ -14,7 +14,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapperTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.cpp
${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellLogFile.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellLogLasFile.cpp
${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.cpp
)

38
ApplicationLibCode/ReservoirDataModel/RigWellLogFile.cpp → ApplicationLibCode/ReservoirDataModel/RigWellLogLasFile.cpp
View File

@ -17,7 +17,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RigWellLogFile.h"
#include "RigWellLogLasFile.h"
#include "RigWellLogCurveData.h"
@ -37,7 +37,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigWellLogFile::RigWellLogFile()
RigWellLogLasFile::RigWellLogLasFile()
: cvf::Object()
{
m_wellLogFile = nullptr;
@ -46,7 +46,7 @@ RigWellLogFile::RigWellLogFile()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigWellLogFile::~RigWellLogFile()
RigWellLogLasFile::~RigWellLogLasFile()
{
close();
}
@ -54,7 +54,7 @@ RigWellLogFile::~RigWellLogFile()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RigWellLogFile::open( const QString& fileName, QString* errorMessage )
bool RigWellLogLasFile::open( const QString& fileName, QString* errorMessage )
{
close();
@ -119,7 +119,7 @@ bool RigWellLogFile::open( const QString& fileName, QString* errorMessage )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigWellLogFile::close()
void RigWellLogLasFile::close()
{
if ( m_wellLogFile )
{
@ -134,7 +134,7 @@ void RigWellLogFile::close()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigWellLogFile::wellName() const
QString RigWellLogLasFile::wellName() const
{
CVF_ASSERT( m_wellLogFile );
return RiaStringEncodingTools::fromNativeEncoded( m_wellLogFile->GetWellName().data() );
@ -143,7 +143,7 @@ QString RigWellLogFile::wellName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigWellLogFile::date() const
QString RigWellLogLasFile::date() const
{
CVF_ASSERT( m_wellLogFile );
return QString::fromStdString( m_wellLogFile->GetDate() );
@ -152,7 +152,7 @@ QString RigWellLogFile::date() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList RigWellLogFile::wellLogChannelNames() const
QStringList RigWellLogLasFile::wellLogChannelNames() const
{
return m_wellLogChannelNames;
}
@ -160,7 +160,7 @@ QStringList RigWellLogFile::wellLogChannelNames() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double> RigWellLogFile::depthValues() const
std::vector<double> RigWellLogLasFile::depthValues() const
{
return values( m_depthLogName );
}
@ -168,7 +168,7 @@ std::vector<double> RigWellLogFile::depthValues() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double> RigWellLogFile::tvdMslValues() const
std::vector<double> RigWellLogLasFile::tvdMslValues() const
{
return values( m_tvdMslLogName );
}
@ -176,7 +176,7 @@ std::vector<double> RigWellLogFile::tvdMslValues() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double> RigWellLogFile::tvdRkbValues() const
std::vector<double> RigWellLogLasFile::tvdRkbValues() const
{
return values( m_tvdRkbLogName );
}
@ -184,7 +184,7 @@ std::vector<double> RigWellLogFile::tvdRkbValues() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double> RigWellLogFile::values( const QString& name ) const
std::vector<double> RigWellLogLasFile::values( const QString& name ) const
{
CVF_ASSERT( m_wellLogFile );
@ -210,7 +210,7 @@ std::vector<double> RigWellLogFile::values( const QString& name ) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigWellLogFile::depthUnitString() const
QString RigWellLogLasFile::depthUnitString() const
{
QString unit;
@ -226,7 +226,7 @@ QString RigWellLogFile::depthUnitString() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigWellLogFile::wellLogChannelUnitString( const QString& wellLogChannelName, RiaDefines::DepthUnitType displayDepthUnit ) const
QString RigWellLogLasFile::wellLogChannelUnitString( const QString& wellLogChannelName, RiaDefines::DepthUnitType displayDepthUnit ) const
{
QString unit;
@ -262,7 +262,7 @@ QString RigWellLogFile::wellLogChannelUnitString( const QString& wellLogChannelN
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigWellLogFile::wellLogChannelUnitString( const QString& wellLogChannelName ) const
QString RigWellLogLasFile::wellLogChannelUnitString( const QString& wellLogChannelName ) const
{
QString unit;
@ -277,7 +277,7 @@ QString RigWellLogFile::wellLogChannelUnitString( const QString& wellLogChannelN
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RigWellLogFile::hasTvdMslChannel() const
bool RigWellLogLasFile::hasTvdMslChannel() const
{
return !m_tvdMslLogName.isEmpty();
}
@ -285,7 +285,7 @@ bool RigWellLogFile::hasTvdMslChannel() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RigWellLogFile::hasTvdRkbChannel() const
bool RigWellLogLasFile::hasTvdRkbChannel() const
{
return !m_tvdRkbLogName.isEmpty();
}
@ -293,7 +293,7 @@ bool RigWellLogFile::hasTvdRkbChannel() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigWellLogFile::getMissingValue() const
double RigWellLogLasFile::getMissingValue() const
{
return m_wellLogFile->GetContMissing();
}
@ -301,7 +301,7 @@ double RigWellLogFile::getMissingValue() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaDefines::DepthUnitType RigWellLogFile::depthUnit() const
RiaDefines::DepthUnitType RigWellLogLasFile::depthUnit() const
{
RiaDefines::DepthUnitType unitType = RiaDefines::DepthUnitType::UNIT_METER;

6
ApplicationLibCode/ReservoirDataModel/RigWellLogFile.h → ApplicationLibCode/ReservoirDataModel/RigWellLogLasFile.h
View File

@ -36,11 +36,11 @@ class RimWellLogCurve;
//==================================================================================================
///
//==================================================================================================
class RigWellLogFile : public cvf::Object
class RigWellLogLasFile : public cvf::Object
{
public:
RigWellLogFile();
~RigWellLogFile() override;
RigWellLogLasFile();
~RigWellLogLasFile() override;
bool open( const QString& fileName, QString* errorMessage );