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

#2042 Well import. Match wells, well paths and sim wells. Set 'master' well path name

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-10-27 15:01:55 +02:00
parent 9f9fb21cbe
commit 1abc5e0e27
6 changed files with 192 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@@ -23,6 +23,7 @@
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RiaColorTables.h"
#include "RiaWellNameComparer.h"
#include "RigWellPath.h"
#include "RigEclipseCaseData.h"
@@ -250,13 +251,16 @@ void RimWellPathCollection::readAndAddWellPaths(std::vector<RimWellPath*>& wellP
progress.setProgressDescription(QString("Reading file %1").arg(wellPath->name()));
// If a well path with this name exists already, make it read the well path file
RimWellPath* existingWellPath = wellPathByName(wellPath->name());
RimWellPath* existingWellPath = tryFindMatchingWellPath(wellPath->name());
if (existingWellPath)
{
existingWellPath->filepath = wellPath->filepath;
existingWellPath->wellPathIndexInFile = wellPath->wellPathIndexInFile;
existingWellPath->readWellPathFile(NULL, m_wellPathImporter);
// Let name from well path file override name from well log file
existingWellPath->setName(wellPath->name());
delete wellPath;
}
else
@@ -296,7 +300,7 @@ RimWellLogFile* RimWellPathCollection::addWellLogs(const QStringList& filePaths)
logFileInfo = RimWellLogFile::readWellLogFile(filePath);
if (logFileInfo)
{
RimWellPath* wellPath = wellPathByName(logFileInfo->wellName());
RimWellPath* wellPath = tryFindMatchingWellPath(logFileInfo->wellName());
if (!wellPath)
{
wellPath = new RimWellPath();
@@ -428,7 +432,17 @@ RimWellPath* RimWellPathCollection::wellPathByName(const QString& wellPathName)
}
}
return NULL;
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPath* RimWellPathCollection::tryFindMatchingWellPath(const QString& wellName) const
{
QString matchedWellPath = RiaWellNameComparer::tryFindMatchingWellPath(wellName);
return !matchedWellPath.isEmpty() ? wellPathByName(matchedWellPath) : nullptr;
}
//--------------------------------------------------------------------------------------------------