Skip to content

Commit c0bc40c

Browse files
kribenkriben
committed
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.
1 parent 4798a87 commit c0bc40c

File tree

63 files changed

+158
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+158
-140
lines changed

‎ApplicationLibCode/Commands/CompletionExportCommands/MswExport/RicMswBranchBuilder.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "RicMswTableDataTools.h"
2323

2424
#include "RigActiveCellInfo.h"
25+
#include "RigTypeSafeIndex.h"
2526
#include "RigEclipseCaseData.h"
2627
#include "RigGridBase.h"
2728
#include "RigMainGrid.h"
@@ -179,7 +180,7 @@ RigMswBranch buildMainBoreBranchFromGeometry( const RimWellPath*
179180
if ( overlapEnd > overlapStart )
180181
{
181182
if ( activeCellInfo && cellInfo.globCellIndex < mainGrid->totalCellCount() &&
182-
!activeCellInfo->isActive( cellInfo.globCellIndex ) )
183+
!activeCellInfo->isActive( ReservoirCellIndex( cellInfo.globCellIndex ) ) )
183184
continue;
184185
if ( auto ci = toMswCellIntersection( cellInfo, mainGrid, overlapStart, overlapEnd ) ) cellCompsegs.push_back( *ci );
185186
}

‎ApplicationLibCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "RicWellPathExportCompletionDataFeatureImpl.h"
2424

2525
#include "RigActiveCellInfo.h"
26+
#include "RigTypeSafeIndex.h"
2627
#include "RigCompletionData.h"
2728
#include "RigEclipseCaseData.h"
2829
#include "RigMainGrid.h"
@@ -62,7 +63,7 @@ std::vector<RigCompletionData> RicFishbonesTransmissibilityCalculationFeatureImp
6263
size_t globalCellIndex = cellAndWellBoreParts.first;
6364
const std::vector<WellBorePartForTransCalc>& wellBoreParts = cellAndWellBoreParts.second;
6465

65-
bool cellIsActive = activeCellInfo->isActive( globalCellIndex );
66+
bool cellIsActive = activeCellInfo->isActive( ReservoirCellIndex( globalCellIndex ) );
6667
if ( !cellIsActive ) continue;
6768

6869
// Find main bore and number of laterals

‎ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "RifThermalToStimPlanFractureXmlOutput.h"
3838

3939
#include "RigActiveCellInfo.h"
40+
#include "RigTypeSafeIndex.h"
4041
#include "RigEclipseCaseData.h"
4142
#include "RigMainGrid.h"
4243
#include "Well/RigWellLogExtractor.h"
@@ -1170,7 +1171,7 @@ std::vector<RigCompletionData>
11701171

11711172
for ( auto& cell : intersectedCells )
11721173
{
1173-
bool cellIsActive = activeCellInfo->isActive( cell.globCellIndex );
1174+
bool cellIsActive = activeCellInfo->isActive( ReservoirCellIndex( cell.globCellIndex ) );
11741175
if ( !cellIsActive ) continue;
11751176

11761177
RigCompletionData completion( wellPath->completionSettings()->wellNameForExport(),
@@ -1313,7 +1314,7 @@ std::pair<double, cvf::Vec2i>
13131314
size_t gridLocalCellIndex = 0;
13141315
const RigGridBase* grid = mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( intersection.globCellIndex, &gridLocalCellIndex );
13151316

1316-
if ( grid->gridId() == gridId && activeCellInfo->isActive( intersection.globCellIndex ) )
1317+
if ( grid->gridId() == gridId && activeCellInfo->isActive( ReservoirCellIndex( intersection.globCellIndex ) ) )
13171318
{
13181319
size_t i, j, k;
13191320
if ( grid->ijkFromCellIndex( gridLocalCellIndex, &i, &j, &k ) )

‎ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswTableData.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include "CompletionsMsw/RigMswTableData.h"
3232
#include "RigActiveCellInfo.h"
33+
#include "RigTypeSafeIndex.h"
3334
#include "RigEclipseCaseData.h"
3435
#include "RigGridBase.h"
3536
#include "RigMainGrid.h"
@@ -737,7 +738,7 @@ double RicWellPathExportMswTableData::computeIntitialMeasuredDepth( const RimEcl
737738
{
738739
for ( const WellPathCellIntersectionInfo& intersection : allIntersections )
739740
{
740-
if ( activeCellInfo->isActive( intersection.globCellIndex ) )
741+
if ( activeCellInfo->isActive( ReservoirCellIndex( intersection.globCellIndex ) ) )
741742
{
742743
candidateMeasuredDepth = intersection.startMD;
743744
break;
@@ -1512,7 +1513,7 @@ std::vector<RigCompletionData>
15121513

15131514
for ( auto& cell : intersectedCells )
15141515
{
1515-
bool cellIsActive = activeCellInfo->isActive( cell.globCellIndex );
1516+
bool cellIsActive = activeCellInfo->isActive( ReservoirCellIndex( cell.globCellIndex ) );
15161517
if ( !cellIsActive ) continue;
15171518

15181519
RigCompletionData completion( wellPath->completionSettings()->wellNameForExport(),
@@ -1702,7 +1703,7 @@ std::pair<double, double>
17021703
{
17031704
for ( const WellPathCellIntersectionInfo& intersection : wellPathIntersections )
17041705
{
1705-
if ( intersection.globCellIndex < activeCellInfo->reservoirCellCount() && activeCellInfo->isActive( intersection.globCellIndex ) )
1706+
if ( intersection.globCellIndex < activeCellInfo->reservoirCellCount() && activeCellInfo->isActive( ReservoirCellIndex( intersection.globCellIndex ) ) )
17061707
{
17071708
double overlapStart = std::max( startMD, intersection.startMD );
17081709
double overlapEnd = std::min( endMD, intersection.endMD );

‎ApplicationLibCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsFeature.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "RiuViewer.h"
3333

3434
#include "RigActiveCellInfo.h"
35+
#include "RigTypeSafeIndex.h"
3536
#include "RigEclipseCaseData.h"
3637

3738
#include "Riu3DMainWindowTools.h"
@@ -77,7 +78,7 @@ void RicSaveEclipseInputVisibleCellsFeature::executeCommand( RimEclipseView*
7778
values.resize( visibleCells.size() );
7879
for ( size_t i = 0; i < visibleCells.size(); ++i )
7980
{
80-
if ( activeCellInfo->isActive( i ) )
81+
if ( activeCellInfo->isActive( ReservoirCellIndex( i ) ) )
8182
{
8283
if ( visibleCells[i] )
8384
{

‎ApplicationLibCode/Commands/RicCreateTemporaryLgrFeature.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "RicDeleteTemporaryLgrsFeature.h"
2828

2929
#include "RigActiveCellInfo.h"
30+
#include "RigTypeSafeIndex.h"
3031
#include "RigCaseCellResultsData.h"
3132
#include "RigCell.h"
3233
#include "RigEclipseCaseData.h"
@@ -254,10 +255,10 @@ RigGridBase* RicCreateTemporaryLgrFeature::createLgr( const LgrInfo& lgrInfo, Ri
254255
auto gridCell = localGrid->cell( cellIndex );
255256
if ( gridCell.parentCellIndex() != cvf::UNDEFINED_SIZE_T )
256257
{
257-
auto resultIndex = activeInfo->cellResultIndex( gridCell.parentCellIndex() );
258-
if ( resultIndex != cvf::UNDEFINED_SIZE_T )
258+
auto resultIndex = activeInfo->cellResultIndex( ReservoirCellIndex( gridCell.parentCellIndex() ) );
259+
if ( resultIndex.value() != cvf::UNDEFINED_SIZE_T )
259260
{
260-
activeInfo->setCellResultIndex( cellIndex + mainGridCellCount, resultIndex );
261+
activeInfo->setCellResultIndex( ReservoirCellIndex( cellIndex + mainGridCellCount ), resultIndex );
261262
activeCellCount++;
262263
}
263264
}

‎ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include "RigActiveCellInfo.h"
3939
#include "RigCaseCellResultsData.h"
4040
#include "RigEclipseCaseData.h"
41+
#include "RigTypeSafeIndex.h"
4142
#include "RigEclipseResultAddress.h"
4243
#include "RigFault.h"
4344
#include "RigMainGrid.h"
@@ -319,7 +320,7 @@ std::expected<std::vector<double>, std::string> RifEclipseInputFileTools::extrac
319320

320321
size_t reservoirCellIndex = mainGrid->cellIndexFromIJK( mainI, mainJ, mainK );
321322

322-
size_t resIndex = activeCells->cellResultIndex( reservoirCellIndex );
323+
size_t resIndex = activeCells->cellResultIndex( ReservoirCellIndex( reservoirCellIndex ) ).value();
323324
if ( resIndex != cvf::UNDEFINED_SIZE_T )
324325
{
325326
auto value = resultAcc->cellScalarGlobIdx( reservoirCellIndex );
@@ -404,7 +405,7 @@ std::expected<std::vector<double>, std::string> RifEclipseInputFileTools::extrac
404405
{
405406
size_t mainI = min.x() + origI;
406407
size_t reservoirCellIndex = mainGrid->cellIndexFromIJK( mainI, mainJ, mainK );
407-
size_t resIndex = activeCells->cellResultIndex( reservoirCellIndex );
408+
size_t resIndex = activeCells->cellResultIndex( ReservoirCellIndex( reservoirCellIndex ) ).value();
408409
size_t subCountI = refinement.subcellCount( RigRefinement::DimI, origI );
409410

410411
double value = ( resIndex != cvf::UNDEFINED_SIZE_T ) ? resultAcc->cellScalarGlobIdx( reservoirCellIndex )

‎ApplicationLibCode/FileInterface/RifEclipseOutputFileTools.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "RigActiveCellInfo.h"
3333
#include "RigCaseCellResultsData.h"
3434
#include "RigEclipseCaseData.h"
35+
#include "RigTypeSafeIndex.h"
3536
#include "RigEclipseResultAddress.h"
3637
#include "RigEclipseResultInfo.h"
3738
#include "RigMainGrid.h"
@@ -697,13 +698,13 @@ bool RifEclipseOutputFileTools::assignActiveCellData( std::vector<std::vector<in
697698
{
698699
if ( actnumValue == matrixActive || actnumValue == matrixAndFractureActive )
699700
{
700-
activeCellInfo->setCellResultIndex( cellIdx, globalActiveMatrixIndex++ );
701+
activeCellInfo->setCellResultIndex( ReservoirCellIndex( cellIdx ), ActiveCellIndex( globalActiveMatrixIndex++ ) );
701702
activeMatrixIndex++;
702703
}
703704

704705
if ( actnumValue == fractureActive || actnumValue == matrixAndFractureActive )
705706
{
706-
fractureActiveCellInfo->setCellResultIndex( cellIdx, globalActiveFractureIndex++ );
707+
fractureActiveCellInfo->setCellResultIndex( ReservoirCellIndex( cellIdx ), ActiveCellIndex( globalActiveFractureIndex++ ) );
707708
activeFractureIndex++;
708709
}
709710

‎ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include "RigActiveCellInfo.h"
4242
#include "RigCaseCellResultsData.h"
4343
#include "RigEclipseCaseData.h"
44+
#include "RigTypeSafeIndex.h"
4445
#include "RigEclipseResultInfo.h"
4546
#include "RigEquil.h"
4647
#include "RigMainGrid.h"
@@ -184,13 +185,13 @@ bool RifReaderEclipseOutput::transferGridCellData( RigMainGrid* mainGrid
184185
int matrixActiveIndex = ecl_grid_get_active_index1( localEclGrid, gridLocalCellIndex );
185186
if ( matrixActiveIndex != -1 )
186187
{
187-
activeCellInfo->setCellResultIndex( cellStartIndex + gridLocalCellIndex, matrixActiveStartIndex + matrixActiveIndex );
188+
activeCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + gridLocalCellIndex ), ActiveCellIndex( matrixActiveStartIndex + matrixActiveIndex ) );
188189
}
189190

190191
int fractureActiveIndex = ecl_grid_get_active_fracture_index1( localEclGrid, gridLocalCellIndex );
191192
if ( fractureActiveIndex != -1 )
192193
{
193-
fractureActiveCellInfo->setCellResultIndex( cellStartIndex + gridLocalCellIndex, fractureActiveStartIndex + fractureActiveIndex );
194+
fractureActiveCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + gridLocalCellIndex ), ActiveCellIndex( fractureActiveStartIndex + fractureActiveIndex ) );
194195
}
195196

196197
// Parent cell index

‎ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "RigActiveCellInfo.h"
3838
#include "RigCaseCellResultsData.h"
3939
#include "RigEclipseCaseData.h"
40+
#include "RigTypeSafeIndex.h"
4041
#include "RigEclipseResultInfo.h"
4142
#include "RigMainGrid.h"
4243
#include "RigNNCData.h"
@@ -464,13 +465,13 @@ void RifReaderOpmCommon::transferActiveCells( Opm::EclIO::EGrid& opmGrid,
464465
int matrixActiveIndex = active_indexes[opmCellIndex];
465466
if ( matrixActiveIndex != -1 )
466467
{
467-
activeCellInfo->setCellResultIndex( cellStartIndex + opmCellIndex, matrixActiveStartIndex + matrixActiveIndex );
468+
activeCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + opmCellIndex ), ActiveCellIndex( matrixActiveStartIndex + matrixActiveIndex ) );
468469
}
469470

470471
int fractureActiveIndex = active_frac_indexes[opmCellIndex];
471472
if ( fractureActiveIndex != -1 )
472473
{
473-
fractureActiveCellInfo->setCellResultIndex( cellStartIndex + opmCellIndex, fractureActiveStartIndex + fractureActiveIndex );
474+
fractureActiveCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + opmCellIndex ), ActiveCellIndex( fractureActiveStartIndex + fractureActiveIndex ) );
474475
}
475476
}
476477
}

0 commit comments

Comments
 (0)