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

#2101 PLT plot. Support for regex matching when comparing flow channels

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-11-09 13:11:44 +01:00
parent d3d5a89979
commit f131f1274a
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.cpp
View File

@@ -39,6 +39,20 @@
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include <regex>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::set<QString> RimWellPlotTools::PRESSURE_DATA_NAMES = { "PRESSURE", "PRES_FORM" };
const std::set<QString> RimWellPlotTools::OIL_CHANNEL_NAMES = { "QOZT", "QOIL", "^.*\\D_QOIL" };
const std::set<QString> RimWellPlotTools::GAS_CHANNEL_NAMES = { "QGZT", "QGAS", "^.*\\D_QGAS" };
const std::set<QString> RimWellPlotTools::WATER_CHANNEL_NAMES = { "QWZT", "QWAT", "^.*\\D_QWAT" };
const std::set<QString> RimWellPlotTools::TOTAL_CHANNEL_NAMES = { "QTZT", "QTOT", "^.*\\D_QTOT" };
std::set<QString> RimWellPlotTools::FLOW_DATA_NAMES = {};
//--------------------------------------------------------------------------------------------------
///
@@ -46,7 +60,7 @@
class StaticFieldsInitializer
{
public:
StaticFieldsInitializer()
StaticFieldsInitializer()
{
// Init static list
RimWellPlotTools::FLOW_DATA_NAMES.insert(RimWellPlotTools::OIL_CHANNEL_NAMES.begin(), RimWellPlotTools::OIL_CHANNEL_NAMES.end());
@@ -54,20 +68,7 @@ public:
RimWellPlotTools::FLOW_DATA_NAMES.insert(RimWellPlotTools::WATER_CHANNEL_NAMES.begin(), RimWellPlotTools::WATER_CHANNEL_NAMES.end());
RimWellPlotTools::FLOW_DATA_NAMES.insert(RimWellPlotTools::TOTAL_CHANNEL_NAMES.begin(), RimWellPlotTools::TOTAL_CHANNEL_NAMES.end());
}
};
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::set<QString> RimWellPlotTools::PRESSURE_DATA_NAMES = { "PRESSURE", "PRES_FORM" };
const std::set<QString> RimWellPlotTools::OIL_CHANNEL_NAMES = { "QOZT", "QOIL" };
const std::set<QString> RimWellPlotTools::GAS_CHANNEL_NAMES = { "QGZT", "QGAS" };
const std::set<QString> RimWellPlotTools::WATER_CHANNEL_NAMES = { "QWZT", "QWAT" };
const std::set<QString> RimWellPlotTools::TOTAL_CHANNEL_NAMES = { "QTZT", "QTOT" };
std::set<QString> RimWellPlotTools::FLOW_DATA_NAMES = {};
} staticFieldsInitializer;
//--------------------------------------------------------------------------------------------------
///
@@ -167,7 +168,7 @@ bool RimWellPlotTools::hasFlowData(RimWellPath* wellPath)
//--------------------------------------------------------------------------------------------------
bool RimWellPlotTools::isFlowChannel(RimWellLogFileChannel* channel)
{
return FLOW_DATA_NAMES.count(channel->name()) > 0;
return tryMatchChannelName(FLOW_DATA_NAMES, channel->name());
}
//--------------------------------------------------------------------------------------------------
@@ -175,7 +176,7 @@ bool RimWellPlotTools::isFlowChannel(RimWellLogFileChannel* channel)
//--------------------------------------------------------------------------------------------------
bool RimWellPlotTools::isOilFlowChannel(const QString& channelName)
{
return OIL_CHANNEL_NAMES.count(channelName) > 0;
return tryMatchChannelName(OIL_CHANNEL_NAMES, channelName);
}
//--------------------------------------------------------------------------------------------------
@@ -183,7 +184,7 @@ bool RimWellPlotTools::isOilFlowChannel(const QString& channelName)
//--------------------------------------------------------------------------------------------------
bool RimWellPlotTools::isGasFlowChannel(const QString& channelName)
{
return GAS_CHANNEL_NAMES.count(channelName) > 0;
return tryMatchChannelName(GAS_CHANNEL_NAMES, channelName);
}
//--------------------------------------------------------------------------------------------------
@@ -191,7 +192,7 @@ bool RimWellPlotTools::isGasFlowChannel(const QString& channelName)
//--------------------------------------------------------------------------------------------------
bool RimWellPlotTools::isWaterFlowChannel(const QString& channelName)
{
return WATER_CHANNEL_NAMES.count(channelName) > 0;
return tryMatchChannelName(WATER_CHANNEL_NAMES, channelName);
}
//--------------------------------------------------------------------------------------------------
@@ -662,7 +663,15 @@ bool RimWellPlotTools::tryMatchChannelName(const std::set<QString>& channelNames
{
auto itr = std::find_if(channelNames.begin(), channelNames.end(), [&](const QString& channelName)
{
return channelName.contains(channelNameToMatch, Qt::CaseInsensitive);
if (channelName.startsWith('^'))
{
std::regex pattern(channelName.toStdString());
return std::regex_match(channelNameToMatch.toStdString(), pattern);
}
else
{
return (bool)channelName.contains(channelNameToMatch, Qt::CaseInsensitive);
}
});
return itr != channelNames.end();
}

4
ApplicationCode/ProjectDataModel/Flow/RimWellPlotTools.h
View File

@@ -36,7 +36,6 @@ class RimWellPath;
class RiuWellRftPlot;
class RigEclipseCaseData;
//==================================================================================================
///
//==================================================================================================
@@ -109,10 +108,7 @@ public:
template<typename T>
static void appendSet(std::set<T>& destSet, const std::set<T>& setToAppend);
private:
friend class StaticFieldsInitializer;
static StaticFieldsInitializer ms_staticFieldInitializer;
};
//--------------------------------------------------------------------------------------------------