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

#8375 NNC : Create NNC generators when NNC data is available

Browse Source 
This approach fixes an NNC visibility issue related to use of m_rimFault->faultGeometry()->connectionIndices() before any was assigned in RigMainGrid::distributeNNCsToFaults()
This commit is contained in:
Magne Sjaastad
2021-12-20 08:52:22 +01:00
parent 891a2e7c29
commit 21f0988493
9 changed files with 63 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ReservoirDataModel/RigActiveCellInfo.cpp
View File

@@ -79,12 +79,6 @@ void RigActiveCellInfo::setCellResultIndex( size_t reservoirCellIndex, size_t re
CVF_TIGHT_ASSERT( reservoirCellResultIndex < m_cellIndexToResultIndex.size() );
m_cellIndexToResultIndex[reservoirCellIndex] = reservoirCellResultIndex;
// if ( reservoirCellResultIndex >= m_reservoirActiveCellCount )
// {
//#pragma omp critical
// m_reservoirActiveCellCount = reservoirCellResultIndex + 1;
// }
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ReservoirDataModel/RigNNCData.cpp
View File

@@ -265,7 +265,7 @@ size_t RigNNCData::eclipseConnectionCount() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RigConnectionContainer& RigNNCData::eclipseConnections() const
const RigConnectionContainer& RigNNCData::availableConnections() const
{
// Return connections without calling ensureConnectionDataIsProcessed() to avoid potential heavy computations
// Relevant if only native connection data is required

2
ApplicationLibCode/ReservoirDataModel/RigNNCData.h
View File

@@ -57,7 +57,7 @@ public:
void setEclipseConnections( RigConnectionContainer& eclipseConnections );
void buildPolygonsForEclipseConnections();
size_t eclipseConnectionCount() const;
const RigConnectionContainer& eclipseConnections() const;
const RigConnectionContainer& availableConnections() const;
bool ensureAllConnectionDataIsProcessed();
RigConnectionContainer& allConnections();