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

#2043 WellPath import. Improve well path name and sim well name matching

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-10-27 09:11:03 +02:00
parent 0db436a181
commit 4cf80e3fe6
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -710,23 +710,19 @@ bool RimWellPath::tryAssociateWithSimulationWell()
QString wellPathName = QString(m_name);
// Try to remove prefix on the format 'xx xxxx/xx-'
std::regex pattern("^.*\\d*[/]\\d*[-_]");
wellPathName = QString::fromStdString(std::regex_replace(wellPathName.toStdString(), pattern, ""));
// Try exact name match
if (tryMatchName(wellPathName, simWellNames)) return true;
// Try matching ignoring spaces
wellPathName = QString(m_name).remove(' ');
if (tryMatchName(wellPathName, simWellNames)) return true;
// Try to remove prefix on the format 'xxxx/xx-'
std::regex pattern("^\\d*[/]\\d*-");
wellPathName = QString::fromStdString(std::regex_replace(m_name().toStdString(), pattern, ""));
if (tryMatchName(wellPathName, simWellNames)) return true;
wellPathName = wellPathName.remove(' ');
if (tryMatchName(wellPathName, simWellNames)) return true;
return false;
// Try matching ignoring spaces, dashes and underscores
return tryMatchName(wellPathName, simWellNames, [](const QString& str) {
QString s = str;
return s.remove(' ').remove('-').remove('_');
});
}
//--------------------------------------------------------------------------------------------------
@ -740,13 +736,23 @@ bool RimWellPath::isAssociatedWithSimulationWell() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimWellPath::tryMatchName(QString wellPathName, const std::vector<QString>& simWellNames)
bool RimWellPath::tryMatchName(QString wellPathName, const std::vector<QString>& simWellNames, std::function<QString (QString)> stringFormatter)
{
if (wellPathName.isEmpty()) return false;
if (stringFormatter != nullptr)
{
wellPathName = stringFormatter(wellPathName);
}
for (const auto& simWellName : simWellNames)
{
if (QString::compare(simWellName, wellPathName, Qt::CaseInsensitive) == 0)
QString simWn = simWellName;
if (stringFormatter != nullptr)
{
simWn = stringFormatter(simWn);
}
if (QString::compare(simWn, wellPathName, Qt::CaseInsensitive) == 0)
{
m_simWellName = simWellName;
return true;

6
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@ -34,6 +34,8 @@
#include "cafPdmChildArrayField.h"
#include "cvfObject.h"
#include <functional>
class RifWellPathImporter;
class RigWellPath;
class RimProject;
@ -120,7 +122,9 @@ public:
int associatedSimulationWellBranch() const;
bool tryAssociateWithSimulationWell();
bool isAssociatedWithSimulationWell() const;
bool tryMatchName(QString wellPathName, const std::vector<QString>& simWellNames);
bool tryMatchName(QString wellPathName,
const std::vector<QString>& simWellNames,
std::function<QString(QString)> stringFormatter = nullptr);
private: