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.
This commit is contained in:
Kristian Bendiksen authored and Magne Sjaastad committed 2026-03-31 12:32:05 +02:00
1 parent f9a081eb87
commit a0dbbf6cb1
63 files changed
+134 -141

No files matched your search

@@ -102,7 +102,7 @@ grpc::Status RiaGrpcActiveCellInfoStateHandler::assignNextActiveCellInfoData( ri
while ( m_currentCellIdx < reservoirCells.size() )
{
size_t cellIdxToTry = m_currentCellIdx++;
if ( m_activeCellInfo->isActive( cellIdxToTry ) )
if ( m_activeCellInfo->isActive( ReservoirCellIndex( cellIdxToTry ) ) )
{
assignCellInfoData( cellInfo, reservoirCells, cellIdxToTry );
return grpc::Status::OK;
@@ -231,7 +231,7 @@ grpc::Status RiaGrpcActiveCellInfoStateHandler::assignNextActiveCellCenter( rips
while ( m_currentCellIdx < reservoirCells.size() )
{
size_t cellIdxToTry = m_currentCellIdx++;
if ( m_activeCellInfo->isActive( cellIdxToTry ) )
if ( m_activeCellInfo->isActive( ReservoirCellIndex( cellIdxToTry ) ) )
{
assignCellCenter( cellCenter, reservoirCells, cellIdxToTry );
return grpc::Status::OK;
@@ -296,7 +296,7 @@ Status RiaGrpcActiveCellInfoStateHandler::assignNextActiveCellCorners( rips::Cel
while ( m_currentCellIdx < reservoirCells.size() )
{
size_t cellIdxToTry = m_currentCellIdx++;
if ( m_activeCellInfo->isActive( cellIdxToTry ) )
if ( m_activeCellInfo->isActive( ReservoirCellIndex( cellIdxToTry ) ) )
{
assignCellCorners( cellCorners, reservoirCells, cellIdxToTry );
return grpc::Status::OK;
+2 -1
View File
@@ -270,7 +270,8 @@ protected:
size_t reservoirCellCount = activeCellInfo->reservoirCellCount();
for ( size_t cellIdx = 0; cellIdx < reservoirCellCount; cellIdx++ )
{
size_t activeCellIdx = caseData->activeCellInfo( m_porosityModel )->cellResultIndex( cellIdx );
size_t activeCellIdx =
caseData->activeCellInfo( m_porosityModel )->cellResultIndex( ReservoirCellIndex( cellIdx ) ).value();
if ( activeCellIdx != cvf::UNDEFINED_SIZE_T )
activeCellResultValues[activeCellIdx] = ( *m_resultValues )[cellIdx];
}