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

#14596 Remove dead ordered clause and per-triangle lock in NNC geometry generation

Browse Source 
The loop was declared with an ordered clause, but the body contains no ordered region, so the clause only enabled the ordered scheduling machinery without providing any ordering. The intended deterministic vertex order was not achieved either, because the actual synchronization was a critical section, which does not preserve iteration order.

Collect vertices in per thread buffers and merge them in thread order after the parallel region, following the pattern already used in RivFaultGeometryGenerator. This removes a lock acquisition per triangle in the innermost polygon loop, and makes the generated geometry identical from run to run.
This commit is contained in:
Magne Sjaastad
2026-08-25 08:22:29 +02:00
parent fa85100da7
commit ad0f5f1bce
1 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ModelVisualization/RivNNCGeometryGenerator.cpp
+60 -41
View File
@@ -21,6 +21,8 @@
#include <cmath>
#include "RiaOpenMPTools.h"
#include "RigCell.h"
#include "RigMainGrid.h"
#include "RigNNCData.h"
@@ -86,63 +88,80 @@ void RivNNCGeometryGenerator::computeArrays()
mainGrid = m_grid->mainGrid();
}
#pragma omp parallel for ordered
for ( long long nIdx = 0; nIdx < numConnections; ++nIdx )
int numberOfThreads = RiaOpenMPTools::availableThreadCount();
std::vector<std::vector<cvf::Vec3f>> threadVertices( numberOfThreads );
std::vector<std::vector<size_t>> threadTriangleToNNC( numberOfThreads );
#pragma omp parallel
{
size_t conIdx = m_nncIndexes.empty() ? nIdx : m_nncIndexes[nIdx];
int myThread = RiaOpenMPTools::currentThreadIndex();
if ( !m_includeAllanDiagramGeometry && conIdx >= m_nncData->eclipseConnectionCount() )
// NB! We are inside a parallel section, do not use "parallel for" here
#pragma omp for
for ( long long nIdx = 0; nIdx < numConnections; ++nIdx )
{
continue;
}
size_t conIdx = m_nncIndexes.empty() ? nIdx : m_nncIndexes[nIdx];
const RigConnection& conn = m_nncData->allConnections()[conIdx];
if ( !conn.polygon().empty() )
{
bool isVisible = true;
if ( isVisibilityCalcActive )
if ( !m_includeAllanDiagramGeometry && conIdx >= m_nncData->eclipseConnectionCount() )
{
bool cell1Visible = false;
bool cell2Visible = false;
if ( mainGrid->cell( conn.c1GlobIdx() ).hostGrid() == m_grid.p() )
{
size_t cell1GridLocalIdx = mainGrid->cell( conn.c1GlobIdx() ).gridLocalCellIndex();
cell1Visible = ( *m_cellVisibility )[cell1GridLocalIdx];
}
if ( mainGrid->cell( conn.c2GlobIdx() ).hostGrid() == m_grid.p() )
{
size_t cell2GridLocalIdx = mainGrid->cell( conn.c2GlobIdx() ).gridLocalCellIndex();
cell2Visible = ( *m_cellVisibility )[cell2GridLocalIdx];
}
isVisible = cell1Visible || cell2Visible;
continue;
}
if ( isVisible )
{
cvf::Vec3f vx1 = conn.polygon()[0] - offset;
cvf::Vec3f vx2;
cvf::Vec3f vx3 = conn.polygon()[1] - offset;
const RigConnection& conn = m_nncData->allConnections()[conIdx];
for ( size_t vxIdx = 2; vxIdx < conn.polygon().size(); ++vxIdx )
if ( !conn.polygon().empty() )
{
bool isVisible = true;
if ( isVisibilityCalcActive )
{
vx2 = vx3;
vx3 = conn.polygon()[vxIdx] - offset;
#pragma omp critical( critical_section_RivNNCGeometryGenerator_computeArrays )
bool cell1Visible = false;
bool cell2Visible = false;
if ( mainGrid->cell( conn.c1GlobIdx() ).hostGrid() == m_grid.p() )
{
vertices.push_back( vx1 );
vertices.push_back( vx2 );
vertices.push_back( vx3 );
triangleToNNC.push_back( conIdx );
size_t cell1GridLocalIdx = mainGrid->cell( conn.c1GlobIdx() ).gridLocalCellIndex();
cell1Visible = ( *m_cellVisibility )[cell1GridLocalIdx];
}
if ( mainGrid->cell( conn.c2GlobIdx() ).hostGrid() == m_grid.p() )
{
size_t cell2GridLocalIdx = mainGrid->cell( conn.c2GlobIdx() ).gridLocalCellIndex();
cell2Visible = ( *m_cellVisibility )[cell2GridLocalIdx];
}
isVisible = cell1Visible || cell2Visible;
}
if ( isVisible )
{
cvf::Vec3f vx1 = conn.polygon()[0] - offset;
cvf::Vec3f vx2;
cvf::Vec3f vx3 = conn.polygon()[1] - offset;
for ( size_t vxIdx = 2; vxIdx < conn.polygon().size(); ++vxIdx )
{
vx2 = vx3;
vx3 = conn.polygon()[vxIdx] - offset;
threadVertices[myThread].push_back( vx1 );
threadVertices[myThread].push_back( vx2 );
threadVertices[myThread].push_back( vx3 );
threadTriangleToNNC[myThread].push_back( conIdx );
}
}
}
}
}
// Merge in thread order. The default static schedule assigns contiguous chunks to the threads, so the
// resulting geometry is identical from run to run.
for ( int i = 0; i < numberOfThreads; i++ )
{
vertices.insert( vertices.end(), threadVertices[i].begin(), threadVertices[i].end() );
triangleToNNC.insert( triangleToNNC.end(), threadTriangleToNNC[i].begin(), threadTriangleToNNC[i].end() );
}
m_vertices = new cvf::Vec3fArray;
m_vertices->assign( vertices );
m_triangleIndexToNNCIndex = new cvf::Array<size_t>;