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

Added riMULTXYZ to result selection UI

Browse Source
This commit is contained in:
Magne Sjaastad
2014-08-19 13:20:12 +02:00
parent e6358a1289
commit be224149f0
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/RimDefines.h
View File

@@ -39,10 +39,11 @@ public:
FRACTURE_MODEL
};
static QString undefinedResultName() { return "None"; }
static QString undefinedGridFaultName() { return "Undefined grid faults"; }
static QString undefinedResultName() { return "None"; }
static QString undefinedGridFaultName() { return "Undefined grid faults"; }
static QString combinedTransmissibilityResultName() { return "TRANSXYZ"; }
static QString ternarySaturationResultName() { return "TERNARY"; }
static QString combinedMultResultName() { return "riMULTXYZ"; }
// Mock model text identifiers

43
ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
View File

@@ -145,16 +145,16 @@ QList<caf::PdmOptionItemInfo> RimResultDefinition::calculateValueOptions(const c
{
if (varList[i].compare(RimDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive) == 0)
{
hasCombinedTransmissibility = true;
continue;
optionList.push_front(caf::PdmOptionItemInfo(RimDefines::combinedTransmissibilityResultName(), RimDefines::combinedTransmissibilityResultName()));
}
else if (varList[i].compare(RimDefines::combinedMultResultName(), Qt::CaseInsensitive) == 0)
{
optionList.push_front(caf::PdmOptionItemInfo(RimDefines::combinedMultResultName(), RimDefines::combinedMultResultName()));
}
else
{
optionList.push_back(caf::PdmOptionItemInfo(varList[i], varList[i]));
}
optionList.push_back(caf::PdmOptionItemInfo(varList[i], varList[i]));
}
if (hasCombinedTransmissibility)
{
optionList.push_front(caf::PdmOptionItemInfo(RimDefines::combinedTransmissibilityResultName(), RimDefines::combinedTransmissibilityResultName()));
}
bool hasAtLeastOneTernaryComponent = false;
@@ -199,12 +199,27 @@ void RimResultDefinition::loadResult()
RimReservoirCellResultsStorage* gridCellResults = this->currentGridCellResults();
if (gridCellResults)
{
if (m_resultType() == RimDefines::STATIC_NATIVE &&
m_resultVariable().compare(RimDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive) == 0)
if (m_resultType() == RimDefines::STATIC_NATIVE)
{
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANX");
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANY");
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANZ");
if (m_resultVariable().compare(RimDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive) == 0)
{
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANX");
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANY");
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANZ");
}
else if (m_resultVariable().compare(RimDefines::combinedMultResultName(), Qt::CaseInsensitive) == 0)
{
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTX");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTX-");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTY");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTY-");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTZ");
gridCellResults->findOrLoadScalarResult(m_resultType(), "MULTZ-");
}
else
{
gridCellResults->findOrLoadScalarResult(m_resultType(), m_resultVariable);
}
}
else
{