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

CellEdge: Fixed trouble with mixup of MULT and riMULT

Browse Source
This commit is contained in:
Jacob Støren 2014-08-26 16:50:11 +02:00
parent 03a9bf459d
commit 0c1588435a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
View File

@ -222,7 +222,7 @@ QStringList RimCellEdgeResultSlot::findResultVariableNames()
{ {
if (RimDefines::isPerCellFaceResult(varList[i])) continue; if (RimDefines::isPerCellFaceResult(varList[i])) continue;
if (varList[i].contains(resultVariable)) if (varList[i].startsWith(resultVariable))
{ {
varNames.append(varList[i]); varNames.append(varList[i]);
} }
@ -292,7 +292,7 @@ bool RimCellEdgeResultSlot::hasResult() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::updateIgnoredScalarValue() void RimCellEdgeResultSlot::updateIgnoredScalarValue()
{ {
if (resultVariable == "MULT") if (resultVariable == "MULT" || resultVariable == "riMULT")
{ {
m_ignoredResultScalar = 1.0; m_ignoredResultScalar = 1.0;
} }

1
ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
View File

@ -296,6 +296,7 @@ size_t RimReservoirCellResultsStorage::findOrLoadScalarResult(RimDefines::Result
computeRiMULTComponent(RimDefines::riMultXResultName()); computeRiMULTComponent(RimDefines::riMultXResultName());
computeRiMULTComponent(RimDefines::riMultYResultName()); computeRiMULTComponent(RimDefines::riMultYResultName());
computeRiMULTComponent(RimDefines::riMultZResultName()); computeRiMULTComponent(RimDefines::riMultZResultName());
computeNncCombRiTrans();
computeNncCombRiMULT(); computeNncCombRiMULT();
} }
else if (resultName == RimDefines::riMultXResultName() else if (resultName == RimDefines::riMultXResultName()