Make sure we only loop over active grids local cells when calculating…

… visibility
OPM · Nov 22, 2024 · 036ed8b · 036ed8b
1 parent db20065
commit 036ed8b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/ApplicationLibCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationLibCode/ModelVisualization/RivReservoirViewPartMgr.cpp
@@ -604,11 +604,11 @@ void RivReservoirViewPartMgr::computeNativeVisibility( cvf::UByteArray*
 
     if ( auto activeGrid = dynamic_cast<const RigActiveCellGrid*>( grid ) )
     {
-        auto reservoirIndices = activeGrid->activeReservoirCellIndices();
+        auto cellIndices = activeGrid->activeLocalCellIndices();
 #pragma omp parallel for
-        for ( int i = 0; i < static_cast<int>( reservoirIndices.size() ); i++ )
+        for ( int i = 0; i < static_cast<int>( cellIndices.size() ); i++ )
         {
-            size_t cellIndex = reservoirIndices[i];
+            size_t cellIndex = cellIndices[i];
 
             if ( ( !activeCellsIsVisible ) || ( *cellIsInWellStatuses )[cellIndex] )
             {

diff --git a/ApplicationLibCode/ReservoirDataModel/RigActiveCellGrid.cpp b/ApplicationLibCode/ReservoirDataModel/RigActiveCellGrid.cpp
@@ -112,14 +112,16 @@ size_t RigActiveCellGrid::totalActiveCellCount() const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<size_t> RigActiveCellGrid::activeReservoirCellIndices() const
+std::vector<size_t> RigActiveCellGrid::activeLocalCellIndices() const
 {
     std::vector<size_t> indices;
     indices.reserve( m_nativeCells.size() );
+    const auto maxCellIdx = cellCount();
 
     for ( const auto& [index, cell] : m_nativeCells )
     {
-        indices.emplace_back( index );
+        // only add cells indexes that belongs to our grid, not subgrids
+        if ( index < maxCellIdx ) indices.emplace_back( index );
     }
 
     return indices;

diff --git a/ApplicationLibCode/ReservoirDataModel/RigActiveCellGrid.h b/ApplicationLibCode/ReservoirDataModel/RigActiveCellGrid.h
@@ -34,7 +34,7 @@ class RigActiveCellGrid : public RigMainGrid
     size_t totalCellCount() const override;
     size_t totalActiveCellCount() const;
 
-    std::vector<size_t> activeReservoirCellIndices() const;
+    std::vector<size_t> activeLocalCellIndices() const;
 
 protected: // only for use by file readers!
     friend class RifReaderOpmCommonActive;