OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve NNC calculation load balancing

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-05-13 10:57:30 +02:00
parent 150f0f09e3
commit fa9afc7762
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ReservoirDataModel/RigCellFaceGeometryTools.cpp
View File

@@ -176,23 +176,36 @@ RigConnectionContainer RigCellFaceGeometryTools::computeOtherNncs( const RigMain
const std::vector<RigFault::FaultFace>& faultFaces = fault->faultFaces(); const std::vector<RigFault::FaultFace>& faultFaces = fault->faultFaces();
// Build a vector of active face indices so we don't have to have this check inside the parallel loop.
// This makes the load balancing much better in the loop.
std::vector<size_t> activeFaceIndices;
activeFaceIndices.reserve( faultFaces.size() );
for ( size_t faceIdx = 0; faceIdx < faultFaces.size(); ++faceIdx )
{
const RigFault::FaultFace& f = faultFaces[faceIdx];
bool atLeastOneCellActive = true;
if ( activeCellInfo && activeCellInfo->reservoirActiveCellCount() > 0u )
{
atLeastOneCellActive = activeCellInfo->isActive( f.m_nativeReservoirCellIndex ) ||
activeCellInfo->isActive( f.m_oppositeReservoirCellIndex );
}
if ( atLeastOneCellActive ) activeFaceIndices.push_back( faceIdx );
}
#pragma omp parallel #pragma omp parallel
{ {
RigConnectionContainer threadConnections; RigConnectionContainer threadConnections;
#pragma omp for schedule( guided ) #pragma omp for schedule( guided )
for ( int faceIdx = 0; faceIdx < static_cast<int>( faultFaces.size() ); faceIdx++ ) for ( int activeFaceIdx = 0; activeFaceIdx < static_cast<int>( activeFaceIndices.size() ); activeFaceIdx++ )
{ {
size_t faceIdx = activeFaceIndices[activeFaceIdx];
const RigFault::FaultFace& f = faultFaces[faceIdx]; const RigFault::FaultFace& f = faultFaces[faceIdx];
bool atLeastOneCellActive = !activeCellInfo ||
( activeCellInfo->isActive( f.m_nativeReservoirCellIndex ) ||
activeCellInfo->isActive( f.m_oppositeReservoirCellIndex ) );
if ( atLeastOneCellActive )
{
RigConnectionContainer faceConnections = extractConnectionsForFace( f, mainGrid, nativeCellPairs ); RigConnectionContainer faceConnections = extractConnectionsForFace( f, mainGrid, nativeCellPairs );
threadConnections.insert( faceConnections ); threadConnections.insert( faceConnections );
} }
}
// Merge together connections per thread // Merge together connections per thread
assignThreadConnections( existingPairs, otherConnections, threadConnections ); assignThreadConnections( existingPairs, otherConnections, threadConnections );
} // end parallel region } // end parallel region