OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#3958 Refactoring: Removed result index from NNC data

Browse Source
This commit is contained in:
Jacob Støren
2019-01-25 16:19:15 +01:00
parent 09011862cd
commit d8eded7d49
10 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
+5 -5
View File
@@ -691,9 +691,9 @@ void RivFaultPartMgr::updateNNCColors(size_t timeStepIndex, RimEclipseCellColors
if (cellResultColors)
{
RigEclipseResultAddress scalarSetIndex = cellResultColors->eclipseResultAddress();
RigEclipseResultAddress eclResAddr = cellResultColors->eclipseResultAddress();
if (m_grid->mainGrid()->nncData()->hasScalarValues(scalarSetIndex.scalarResultIndex))
if (m_grid->mainGrid()->nncData()->hasScalarValues(eclResAddr))
{
showNncsWithScalarMappedColor = true;
}
@@ -702,8 +702,8 @@ void RivFaultPartMgr::updateNNCColors(size_t timeStepIndex, RimEclipseCellColors
if (showNncsWithScalarMappedColor)
{
RigEclipseResultAddress scalarSetIndex = cellResultColors->eclipseResultAddress();
RiaDefines::ResultCatType resultType = cellResultColors->resultType();
RigEclipseResultAddress eclResAddr = cellResultColors->eclipseResultAddress();
RiaDefines::ResultCatType resultType = cellResultColors->resultType();
const cvf::ScalarMapper* mapper = cellResultColors->legendConfig()->scalarMapper();
@@ -714,7 +714,7 @@ void RivFaultPartMgr::updateNNCColors(size_t timeStepIndex, RimEclipseCellColors
{
size_t nativeTimeStepIndex = eclipseCase->uiToNativeTimeStepIndex(timeStepIndex);
m_NNCGenerator->textureCoordinates(
m_NNCTextureCoords.p(), mapper, resultType, scalarSetIndex.scalarResultIndex, nativeTimeStepIndex);
m_NNCTextureCoords.p(), mapper, resultType, eclResAddr, nativeTimeStepIndex);
}
}