#1044 - pre-proto - Fixed eternal loop

This commit is contained in:
astridkbjorke
2017-01-03 15:06:06 +01:00
parent fe9ac8f908
commit a5e8001745

View File

@@ -182,6 +182,7 @@ RivSimWellPipesPartMgr::RivPipeBranchData* RivSimWellPipesPartMgr::pipeBranchDat
while (i < branchIndex) while (i < branchIndex)
{ {
brIt++; brIt++;
i++;
} }
return &(*brIt); return &(*brIt);
@@ -337,10 +338,10 @@ void RivSimWellPipesPartMgr::findGridIndexAndCellIndex(size_t branchIndex, size_
RivPipeBranchData* branchData = pipeBranchData(branchIndex); RivPipeBranchData* branchData = pipeBranchData(branchIndex);
if (branchData) if (branchData)
{ {
size_t segmentIndex = branchData->m_pipeGeomGenerator->segmentIndexFromTriangleIndex(triangleIndex); size_t resultIndex = branchData->m_pipeGeomGenerator->pipeResultIndexFromTriangleIndex(triangleIndex);
*gridIndex = branchData->m_cellIds[segmentIndex].m_gridIndex; *gridIndex = branchData->m_cellIds[resultIndex].m_gridIndex;
*cellIndex = branchData->m_cellIds[segmentIndex].m_gridCellIndex; *cellIndex = branchData->m_cellIds[resultIndex].m_gridCellIndex;
} }
else else
{ {