(#565) Fixed invalid guarding of index when calculating well pipe visibility

Reverts two previous commits cfc8c72137
and 7c8fe47683
This commit is contained in:
Magne Sjaastad
2015-10-22 10:39:11 +02:00
parent 6747fe5976
commit 6e0c6b89b1

View File

@@ -197,9 +197,7 @@ bool RimEclipseWell::calculateWellPipeVisibility(size_t frameIndex)
if (gridIndex != cvf::UNDEFINED_SIZE_T && gridCellIndex != cvf::UNDEFINED_SIZE_T)
{
cvf::cref<cvf::UByteArray> cellVisibility = rvMan->cellVisibility(visGridParts[gpIdx], gridIndex, frameIndex);
if ((*cellVisibility).size() > 0 &&
(*cellVisibility).size() - 1 < gridCellIndex &&
(*cellVisibility)[gridCellIndex])
if ((*cellVisibility)[gridCellIndex])
{
return true;
}
@@ -219,9 +217,7 @@ bool RimEclipseWell::calculateWellPipeVisibility(size_t frameIndex)
gridCellIndex = wsResCells[cIdx].m_gridCellIndex;
cvf::cref<cvf::UByteArray> cellVisibility = rvMan->cellVisibility(visGridParts[gpIdx], gridIndex, frameIndex);
if ((*cellVisibility).size() > 0 &&
(*cellVisibility).size() - 1 < gridCellIndex &&
(*cellVisibility)[gridCellIndex])
if ((*cellVisibility)[gridCellIndex])
{
return true;
}