OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-03 12:10:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1724 Fix merge issues

Browse Source
This commit is contained in:
Magne Sjaastad 2017-08-04 10:45:04 +02:00
parent c481a275ee
commit 3c5016cb8c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.cpp
View File

@ -590,7 +590,7 @@ void RivPipeGeometryGenerator::clearComputedData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RivPipeGeometryGenerator::pipeSegmentIndexFromTriangleIndex(size_t triangleIndex) const size_t RivPipeGeometryGenerator::segmentIndexFromTriangleIndex(size_t triangleIndex) const
{ {
size_t segIndex = triangleIndex / (m_crossSectionNodeCount * 2); size_t segIndex = triangleIndex / (m_crossSectionNodeCount * 2);

2
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@ -445,7 +445,7 @@ void RivWellPathPartMgr::clearAllBranchData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RivWellPathPartMgr::segmentIndexFromTriangleIndex(size_t triangleIndex) size_t RivWellPathPartMgr::segmentIndexFromTriangleIndex(size_t triangleIndex)
{ {
return m_pipeBranchData.m_pipeGeomGenerator->pipeSegmentIndexFromTriangleIndex(triangleIndex); return m_pipeBranchData.m_pipeGeomGenerator->segmentIndexFromTriangleIndex(triangleIndex);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------