From 0c1588435a8c368e07e86d982b9ebdc4495ad6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 26 Aug 2014 16:50:11 +0200 Subject: [PATCH] CellEdge: Fixed trouble with mixup of MULT and riMULT --- ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp | 4 ++-- .../ProjectDataModel/RimReservoirCellResultsStorage.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp b/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp index 5ef2e8ba73..f3cf44dabc 100644 --- a/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp @@ -222,7 +222,7 @@ QStringList RimCellEdgeResultSlot::findResultVariableNames() { if (RimDefines::isPerCellFaceResult(varList[i])) continue; - if (varList[i].contains(resultVariable)) + if (varList[i].startsWith(resultVariable)) { varNames.append(varList[i]); } @@ -292,7 +292,7 @@ bool RimCellEdgeResultSlot::hasResult() const //-------------------------------------------------------------------------------------------------- void RimCellEdgeResultSlot::updateIgnoredScalarValue() { - if (resultVariable == "MULT") + if (resultVariable == "MULT" || resultVariable == "riMULT") { m_ignoredResultScalar = 1.0; } diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp index 9e8837797a..17e2dabdfa 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp @@ -296,6 +296,7 @@ size_t RimReservoirCellResultsStorage::findOrLoadScalarResult(RimDefines::Result computeRiMULTComponent(RimDefines::riMultXResultName()); computeRiMULTComponent(RimDefines::riMultYResultName()); computeRiMULTComponent(RimDefines::riMultZResultName()); + computeNncCombRiTrans(); computeNncCombRiMULT(); } else if (resultName == RimDefines::riMultXResultName()