diff --git a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp index 67f1f1f12b..bbe1da4ece 100644 --- a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp @@ -371,7 +371,7 @@ void RimCellEdgeColors::cellEdgeMetaData(std::vector* metaD for (size_t i = 0; i < 6; i++) { RimCellEdgeMetaData metaData; - metaData.m_resultIndex = resultIndices[i]; + metaData.m_eclipseResultAddress = resultIndices[i]; metaData.m_resultVariable = resultNames[i]; metaData.m_isStatic = isStatic; diff --git a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.h b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.h index cdf9fbe3e8..2d61307e01 100644 --- a/ApplicationCode/ProjectDataModel/RimCellEdgeColors.h +++ b/ApplicationCode/ProjectDataModel/RimCellEdgeColors.h @@ -38,7 +38,7 @@ class RimRegularLegendConfig; class RimCellEdgeMetaData { public: - RigEclipseResultAddress m_resultIndex; + RigEclipseResultAddress m_eclipseResultAddress; QString m_resultVariable; bool m_isStatic; }; diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseResultAddress.h b/ApplicationCode/ReservoirDataModel/RigEclipseResultAddress.h index 6710c640ad..98b6abbf88 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseResultAddress.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseResultAddress.h @@ -62,7 +62,7 @@ public: return (m_resultName < other.m_resultName); } - size_t scalarResultIndex; + size_t scalarResultIndex; // Temporary. Must be removed RiaDefines::ResultCatType m_resultCatType; QString m_resultName; diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index fbd8052e28..8ca40b4560 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -612,14 +612,14 @@ QString RiuResultTextBuilder::cellEdgeResultDetails() std::vector metaData; m_reservoirView->cellEdgeResult()->cellEdgeMetaData(&metaData); - std::set uniqueResultIndices; + std::set uniqueResultIndices; for (int idx = 0; idx < 6; idx++) { - size_t resultIndex = metaData[idx].m_resultIndex.scalarResultIndex; - if (resultIndex == cvf::UNDEFINED_SIZE_T) continue; + RigEclipseResultAddress resultAddr = metaData[idx].m_eclipseResultAddress; + if ( !resultAddr.isValid()) continue; - if (uniqueResultIndices.find(resultIndex) != uniqueResultIndices.end()) continue; + if (uniqueResultIndices.find(resultAddr) != uniqueResultIndices.end()) continue; size_t adjustedTimeStep = m_timeStepIndex; if (metaData[idx].m_isStatic) @@ -628,13 +628,17 @@ QString RiuResultTextBuilder::cellEdgeResultDetails() } RiaDefines::PorosityModelType porosityModel = m_reservoirView->cellResult()->porosityModel(); - cvf::ref resultAccessor = RigResultAccessorFactory::createFromResultIdx(m_reservoirView->eclipseCase()->eclipseCaseData(), m_gridIndex, porosityModel, adjustedTimeStep, RigEclipseResultAddress(resultIndex)); + cvf::ref resultAccessor = RigResultAccessorFactory::createFromResultIdx(m_reservoirView->eclipseCase()->eclipseCaseData(), + m_gridIndex, + porosityModel, + adjustedTimeStep, + resultAddr); if (resultAccessor.notNull()) { double scalarValue = resultAccessor->cellScalar(m_cellIndex); text.append(QString("%1 : %2\n").arg(metaData[idx].m_resultVariable).arg(scalarValue)); - uniqueResultIndices.insert(resultIndex); + uniqueResultIndices.insert(resultAddr); } } }