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

#2060 Rft Curve: Variable option menu grows and grows

Browse Source
This commit is contained in:
Rebecca Cox 2017-10-27 16:00:47 +02:00
parent 1abc5e0e27
commit 88b8bdf5c2
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ApplicationCode/FileInterface/RifReaderEclipseRft.cpp
View File

@ -50,6 +50,8 @@ void RifReaderEclipseRft::open()
int fileSize = ecl_rft_file_get_size(m_ecl_rft_file); int fileSize = ecl_rft_file_get_size(m_ecl_rft_file);
m_eclipseRftAddresses.clear();
for (int i = 0; i < fileSize; i++) for (int i = 0; i < fileSize; i++)
{ {
ecl_rft_node_type* node = ecl_rft_file_iget_node(m_ecl_rft_file, i); ecl_rft_node_type* node = ecl_rft_file_iget_node(m_ecl_rft_file, i);
@ -276,17 +278,64 @@ std::vector<RifEclipseRftAddress::RftWellLogChannelName> RifReaderEclipseRft::av
if (wellName == "") return wellLogChannelNames; if (wellName == "") return wellLogChannelNames;
bool pressureAndDepthFound = false;
bool rftFound = false;
bool pltFound = false;
for (const RifEclipseRftAddress& address : m_eclipseRftAddresses) for (const RifEclipseRftAddress& address : m_eclipseRftAddresses)
{ {
if (address.wellName() == wellName) if (address.wellName() == wellName)
{ {
RifEclipseRftAddress::RftWellLogChannelName name = address.wellLogChannelName(); RifEclipseRftAddress::RftWellLogChannelName name = address.wellLogChannelName();
if (name != RifEclipseRftAddress::RftWellLogChannelName::DEPTH)
if (!pressureAndDepthFound)
{ {
wellLogChannelNames.push_back(address.wellLogChannelName()); if ( name == RifEclipseRftAddress::PRESSURE )
{
pressureAndDepthFound = true;
if (rftFound && pltFound) break;
}
}
if (!rftFound)
{
if ( name == RifEclipseRftAddress::RftWellLogChannelName::SWAT )
{
rftFound = true;
if (pltFound && pressureAndDepthFound) break;
continue;
}
}
if (!pltFound)
{
if ( name == RifEclipseRftAddress::RftWellLogChannelName::WRAT )
{
pltFound = true;
if (rftFound && pressureAndDepthFound) break;
}
} }
} }
} }
if (pressureAndDepthFound)
{
wellLogChannelNames.push_back(RifEclipseRftAddress::PRESSURE);
wellLogChannelNames.push_back(RifEclipseRftAddress::DEPTH);
}
if (rftFound)
{
wellLogChannelNames.push_back(RifEclipseRftAddress::RftWellLogChannelName::SWAT);
wellLogChannelNames.push_back(RifEclipseRftAddress::RftWellLogChannelName::SOIL);
wellLogChannelNames.push_back(RifEclipseRftAddress::RftWellLogChannelName::SGAS);
}
if (pltFound)
{
wellLogChannelNames.push_back(RifEclipseRftAddress::RftWellLogChannelName::WRAT);
wellLogChannelNames.push_back(RifEclipseRftAddress::RftWellLogChannelName::ORAT);
wellLogChannelNames.push_back(RifEclipseRftAddress::RftWellLogChannelName::GRAT);
}
return wellLogChannelNames; return wellLogChannelNames;
} }

5
ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp
View File

@ -351,7 +351,6 @@ QList<caf::PdmOptionItemInfo> RimWellLogRftCurve::calculateValueOptions(const ca
} }
else if (fieldNeedingOptions == &m_wellLogChannelName) else if (fieldNeedingOptions == &m_wellLogChannelName)
{ {
options.push_back(caf::PdmOptionItemInfo(caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::uiText(RifEclipseRftAddress::NONE), RifEclipseRftAddress::NONE));
RifReaderEclipseRft* reader = rftReader(); RifReaderEclipseRft* reader = rftReader();
if (reader) if (reader)
{ {
@ -360,6 +359,10 @@ QList<caf::PdmOptionItemInfo> RimWellLogRftCurve::calculateValueOptions(const ca
options.push_back(caf::PdmOptionItemInfo(caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::uiText(channelName), channelName)); options.push_back(caf::PdmOptionItemInfo(caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::uiText(channelName), channelName));
} }
} }
if (options.empty())
{
options.push_back(caf::PdmOptionItemInfo(caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelName>::uiText(RifEclipseRftAddress::NONE), RifEclipseRftAddress::NONE));
}
} }
else if (fieldNeedingOptions == &m_timeStep) else if (fieldNeedingOptions == &m_timeStep)
{ {