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

(#544) Allowing "DEPT" and "DEPTH" as depth values from LAS files

Browse Source
This commit is contained in:
Pål Hagen 2015-09-24 11:02:39 +02:00
parent 529b68e073
commit c78fdffeaf
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp
View File

@ -54,7 +54,6 @@ bool RigWellLogFile::open(const QString& fileName, QString* errorMessage)
{
close();
int wellFormat = NRLib::Well::LAS;
NRLib::Well* well = NULL;
try
@ -89,7 +88,13 @@ bool RigWellLogFile::open(const QString& fileName, QString* errorMessage)
std::map<std::string, std::vector<double> >::const_iterator itCL;
for (itCL = contLogs.begin(); itCL != contLogs.end(); itCL++)
{
wellLogNames.append(QString::fromStdString(itCL->first));
QString logName = QString::fromStdString(itCL->first);
wellLogNames.append(logName);
if (logName.toUpper() == "DEPT" || logName.toUpper() == "DEPTH")
{
m_depthLogName = logName;
}
}
// TODO: Possibly handle discrete logs
@ -120,6 +125,7 @@ void RigWellLogFile::close()
}
m_wellLogChannelNames.clear();
m_depthLogName.clear();
}
//--------------------------------------------------------------------------------------------------
@ -144,7 +150,7 @@ QStringList RigWellLogFile::wellLogChannelNames() const
//--------------------------------------------------------------------------------------------------
std::vector<double> RigWellLogFile::depthValues() const
{
return values("DEPT");
return values(m_depthLogName);
}
//--------------------------------------------------------------------------------------------------
@ -158,7 +164,7 @@ std::vector<double> RigWellLogFile::values(const QString& name) const
if (m_wellLogFile->HasContLog(name.toStdString()))
{
if (depthUnit().toUpper() == "FT")
if (name == m_depthLogName && depthUnit().toUpper() == "FT")
{
std::vector<double> footValues = m_wellLogFile->GetContLog(name.toStdString());

1
ApplicationCode/ReservoirDataModel/RigWellLogFile.h
View File

@ -56,4 +56,5 @@ private:
NRLib::Well* m_wellLogFile;
QStringList m_wellLogChannelNames;
QString m_depthLogName;
};