OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 23:20:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated size_t overloads from RigActiveCellInfo

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/SocketInterface/RiaCaseInfoCommands.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ public:
for ( size_t cIdx = 0; cIdx < mainGrid->totalCellCount(); ++cIdx )
{
if ( actCellInfo->isActive( cIdx ) )
if ( actCellInfo->isActive( ReservoirCellIndex( cIdx ) ) )
{
auto& cell = mainGrid->cell( cIdx );
RigGridBase* grid = cell.hostGrid();
ApplicationLibCode/SocketInterface/RiaGeometryCommands.cpp
+2 -2
View File
@@ -207,7 +207,7 @@ public:
for ( size_t reservoirCellIndex = 0; reservoirCellIndex < mainGrid->totalCellCount(); reservoirCellIndex++ )
{
if ( !actCellInfo->isActive( reservoirCellIndex ) ) continue;
if ( !actCellInfo->isActive( ReservoirCellIndex( reservoirCellIndex ) ) ) continue;
cvf::Vec3d center = mainGrid->cell( reservoirCellIndex ).center();
@@ -379,7 +379,7 @@ public:
for ( size_t reservoirCellIndex = 0; reservoirCellIndex < mainGrid->totalCellCount(); reservoirCellIndex++ )
{
if ( !actCellInfo->isActive( reservoirCellIndex ) ) continue;
if ( !actCellInfo->isActive( ReservoirCellIndex( reservoirCellIndex ) ) ) continue;
std::array<cvf::Vec3d, 8> cornerVerts = mainGrid->cellCornerVertices( reservoirCellIndex );
doubleValues[valueIndex++] = getCellCornerWithPositiveDepth( cornerVerts, cornerIndexMapping, coordIdx );
ApplicationLibCode/SocketInterface/RiaPropertyDataCommands.cpp
+2 -1
View File
@@ -31,6 +31,7 @@
#include "RigResultAccessorFactory.h"
#include "RigResultModifier.h"
#include "RigResultModifierFactory.h"
#include "RigTypeSafeIndex.h"
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
@@ -158,7 +159,7 @@ public:
std::vector<double>& doubleValues = scalarResultFrames->at( requestedTimesteps[tIdx] );
for ( size_t gcIdx = 0; gcIdx < reservoirCellCount; ++gcIdx )
{
size_t resultIdx = activeInfo->cellResultIndex( gcIdx );
size_t resultIdx = activeInfo->cellResultIndex( ReservoirCellIndex( gcIdx ) ).value();
if ( resultIdx == cvf::UNDEFINED_SIZE_T ) continue;
if ( resultIdx < doubleValues.size() )