Remove deprecated size_t overloads from RigActiveCellInfo

Migrate all callers to use type-safe ReservoirCellIndex and
ActiveCellIndex wrappers, then remove the deprecated isActive(size_t),
cellResultIndex(size_t), and setCellResultIndex(size_t, size_t) methods.

Author: kriben

ApplicationLibCode/Commands/CompletionExportCommands/MswExport/RicMswBranchBuilder.cpp

@@ -179,7 +179,7 @@ RigMswBranch buildMainBoreBranchFromGeometry( const RimWellPath*
             if ( overlapEnd > overlapStart )
             {
                 if ( activeCellInfo && cellInfo.globCellIndex < mainGrid->totalCellCount() &&
-                     !activeCellInfo->isActive( cellInfo.globCellIndex ) )
+                     !activeCellInfo->isActive( ReservoirCellIndex( cellInfo.globCellIndex ) ) )
                     continue;
                 if ( auto ci = toMswCellIntersection( cellInfo, mainGrid, overlapStart, overlapEnd ) ) cellCompsegs.push_back( *ci );
             }

ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp

@@ -62,7 +62,7 @@ std::vector<RigCompletionData> RicFishbonesTransmissibilityCalculationFeatureImp
         size_t                                       globalCellIndex = cellAndWellBoreParts.first;
         const std::vector<WellBorePartForTransCalc>& wellBoreParts   = cellAndWellBoreParts.second;
 
-        bool cellIsActive = activeCellInfo->isActive( globalCellIndex );
+        bool cellIsActive = activeCellInfo->isActive( ReservoirCellIndex( globalCellIndex ) );
         if ( !cellIsActive ) continue;
 
         // Find main bore and number of laterals

ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp

@@ -1170,7 +1170,7 @@ std::vector<RigCompletionData>
 
             for ( auto& cell : intersectedCells )
             {
-                bool cellIsActive = activeCellInfo->isActive( cell.globCellIndex );
+                bool cellIsActive = activeCellInfo->isActive( ReservoirCellIndex( cell.globCellIndex ) );
                 if ( !cellIsActive ) continue;
 
                 RigCompletionData completion( wellPath->completionSettings()->wellNameForExport(),
@@ -1313,7 +1313,7 @@ std::pair<double, cvf::Vec2i>
         size_t             gridLocalCellIndex = 0;
         const RigGridBase* grid = mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( intersection.globCellIndex, &gridLocalCellIndex );
 
-        if ( grid->gridId() == gridId && activeCellInfo->isActive( intersection.globCellIndex ) )
+        if ( grid->gridId() == gridId && activeCellInfo->isActive( ReservoirCellIndex( intersection.globCellIndex ) ) )
         {
             size_t i, j, k;
             if ( grid->ijkFromCellIndex( gridLocalCellIndex, &i, &j, &k ) )

ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswTableData.cpp

@@ -737,7 +737,7 @@ double RicWellPathExportMswTableData::computeIntitialMeasuredDepth( const RimEcl
     {
         for ( const WellPathCellIntersectionInfo& intersection : allIntersections )
         {
-            if ( activeCellInfo->isActive( intersection.globCellIndex ) )
+            if ( activeCellInfo->isActive( ReservoirCellIndex( intersection.globCellIndex ) ) )
             {
                 candidateMeasuredDepth = intersection.startMD;
                 break;
@@ -1512,7 +1512,7 @@ std::vector<RigCompletionData>
 
         for ( auto& cell : intersectedCells )
         {
-            bool cellIsActive = activeCellInfo->isActive( cell.globCellIndex );
+            bool cellIsActive = activeCellInfo->isActive( ReservoirCellIndex( cell.globCellIndex ) );
             if ( !cellIsActive ) continue;
 
             RigCompletionData completion( wellPath->completionSettings()->wellNameForExport(),
@@ -1702,7 +1702,8 @@ std::pair<double, double>
 {
     for ( const WellPathCellIntersectionInfo& intersection : wellPathIntersections )
     {
-        if ( intersection.globCellIndex < activeCellInfo->reservoirCellCount() && activeCellInfo->isActive( intersection.globCellIndex ) )
+        if ( intersection.globCellIndex < activeCellInfo->reservoirCellCount() &&
+             activeCellInfo->isActive( ReservoirCellIndex( intersection.globCellIndex ) ) )
         {
             double overlapStart = std::max( startMD, intersection.startMD );
             double overlapEnd   = std::min( endMD, intersection.endMD );

ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsFeature.cpp

@@ -77,7 +77,7 @@ void RicSaveEclipseInputVisibleCellsFeature::executeCommand( RimEclipseView*
     values.resize( visibleCells.size() );
     for ( size_t i = 0; i < visibleCells.size(); ++i )
     {
-        if ( activeCellInfo->isActive( i ) )
+        if ( activeCellInfo->isActive( ReservoirCellIndex( i ) ) )
         {
             if ( visibleCells[i] )
             {

ApplicationLibCode/Commands/RicCreateTemporaryLgrFeature.cpp

@@ -254,10 +254,10 @@ RigGridBase* RicCreateTemporaryLgrFeature::createLgr( const LgrInfo& lgrInfo, Ri
                     auto   gridCell  = localGrid->cell( cellIndex );
                     if ( gridCell.parentCellIndex() != cvf::UNDEFINED_SIZE_T )
                     {
-                        auto resultIndex = activeInfo->cellResultIndex( gridCell.parentCellIndex() );
-                        if ( resultIndex != cvf::UNDEFINED_SIZE_T )
+                        auto resultIndex = activeInfo->cellResultIndex( ReservoirCellIndex( gridCell.parentCellIndex() ) );
+                        if ( resultIndex.value() != cvf::UNDEFINED_SIZE_T )
                         {
-                            activeInfo->setCellResultIndex( cellIndex + mainGridCellCount, resultIndex );
+                            activeInfo->setCellResultIndex( ReservoirCellIndex( cellIndex + mainGridCellCount ), resultIndex );
                             activeCellCount++;
                         }
                     }

ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp

@@ -319,7 +319,7 @@ std::expected<std::vector<double>, std::string> RifEclipseInputFileTools::extrac
 
                 size_t reservoirCellIndex = mainGrid->cellIndexFromIJK( mainI, mainJ, mainK );
 
-                size_t resIndex = activeCells->cellResultIndex( reservoirCellIndex );
+                size_t resIndex = activeCells->cellResultIndex( ReservoirCellIndex( reservoirCellIndex ) ).value();
                 if ( resIndex != cvf::UNDEFINED_SIZE_T )
                 {
                     auto value = resultAcc->cellScalarGlobIdx( reservoirCellIndex );
@@ -404,7 +404,7 @@ std::expected<std::vector<double>, std::string> RifEclipseInputFileTools::extrac
                     {
                         size_t mainI              = min.x() + origI;
                         size_t reservoirCellIndex = mainGrid->cellIndexFromIJK( mainI, mainJ, mainK );
-                        size_t resIndex           = activeCells->cellResultIndex( reservoirCellIndex );
+                        size_t resIndex           = activeCells->cellResultIndex( ReservoirCellIndex( reservoirCellIndex ) ).value();
                         size_t subCountI          = refinement.subcellCount( RigRefinement::DimI, origI );
 
                         double value = ( resIndex != cvf::UNDEFINED_SIZE_T ) ? resultAcc->cellScalarGlobIdx( reservoirCellIndex )

ApplicationLibCode/FileInterface/RifEclipseOutputFileTools.cpp

@@ -697,13 +697,13 @@ bool RifEclipseOutputFileTools::assignActiveCellData( std::vector<std::vector<in
         {
             if ( actnumValue == matrixActive || actnumValue == matrixAndFractureActive )
             {
-                activeCellInfo->setCellResultIndex( cellIdx, globalActiveMatrixIndex++ );
+                activeCellInfo->setCellResultIndex( ReservoirCellIndex( cellIdx ), ActiveCellIndex( globalActiveMatrixIndex++ ) );
                 activeMatrixIndex++;
             }
 
             if ( actnumValue == fractureActive || actnumValue == matrixAndFractureActive )
             {
-                fractureActiveCellInfo->setCellResultIndex( cellIdx, globalActiveFractureIndex++ );
+                fractureActiveCellInfo->setCellResultIndex( ReservoirCellIndex( cellIdx ), ActiveCellIndex( globalActiveFractureIndex++ ) );
                 activeFractureIndex++;
             }
 

ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp

@@ -184,13 +184,15 @@ bool RifReaderEclipseOutput::transferGridCellData( RigMainGrid*         mainGrid
         int matrixActiveIndex = ecl_grid_get_active_index1( localEclGrid, gridLocalCellIndex );
         if ( matrixActiveIndex != -1 )
         {
-            activeCellInfo->setCellResultIndex( cellStartIndex + gridLocalCellIndex, matrixActiveStartIndex + matrixActiveIndex );
+            activeCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + gridLocalCellIndex ),
+                                                ActiveCellIndex( matrixActiveStartIndex + matrixActiveIndex ) );
         }
 
         int fractureActiveIndex = ecl_grid_get_active_fracture_index1( localEclGrid, gridLocalCellIndex );
         if ( fractureActiveIndex != -1 )
         {
-            fractureActiveCellInfo->setCellResultIndex( cellStartIndex + gridLocalCellIndex, fractureActiveStartIndex + fractureActiveIndex );
+            fractureActiveCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + gridLocalCellIndex ),
+                                                        ActiveCellIndex( fractureActiveStartIndex + fractureActiveIndex ) );
         }
 
         // Parent cell index

ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp

@@ -464,13 +464,15 @@ void RifReaderOpmCommon::transferActiveCells( Opm::EclIO::EGrid&  opmGrid,
         int matrixActiveIndex = active_indexes[opmCellIndex];
         if ( matrixActiveIndex != -1 )
         {
-            activeCellInfo->setCellResultIndex( cellStartIndex + opmCellIndex, matrixActiveStartIndex + matrixActiveIndex );
+            activeCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + opmCellIndex ),
+                                                ActiveCellIndex( matrixActiveStartIndex + matrixActiveIndex ) );
         }
 
         int fractureActiveIndex = active_frac_indexes[opmCellIndex];
         if ( fractureActiveIndex != -1 )
         {
-            fractureActiveCellInfo->setCellResultIndex( cellStartIndex + opmCellIndex, fractureActiveStartIndex + fractureActiveIndex );
+            fractureActiveCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + opmCellIndex ),
+                                                        ActiveCellIndex( fractureActiveStartIndex + fractureActiveIndex ) );
         }
     }
 }