Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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 ) )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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 );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] )
{
Expand Down
6 changes: 3 additions & 3 deletions ApplicationLibCode/Commands/RicCreateTemporaryLgrFeature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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 )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}

Expand Down
6 changes: 4 additions & 2 deletions ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions ApplicationLibCode/FileInterface/RifRoffFileTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ bool RifRoffFileTools::openGridFile( const QString& fileName, RigEclipseCaseData
int matrixActiveIndex = activeCells[gridLocalCellIndex];
if ( matrixActiveIndex != -1 )
{
activeCellInfo->setCellResultIndex( cellStartIndex + gridLocalCellIndex, matrixActiveIndex );
activeCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + gridLocalCellIndex ),
ActiveCellIndex( matrixActiveIndex ) );
}

cell.setParentCellIndex( cvf::UNDEFINED_SIZE_T );
Expand Down Expand Up @@ -710,7 +711,7 @@ bool RifRoffFileTools::appendNewInputPropertyResult( RigEclipseCaseData* caseDat
size_t cellCount = mainGrid->cellCount();
for ( size_t i = 0; i < cellCount; i++ )
{
if ( !activeCellInfo->isActive( mainGrid->reservoirCellIndex( i ) ) )
if ( !activeCellInfo->isActive( ReservoirCellIndex( mainGrid->reservoirCellIndex( i ) ) ) )
{
values[i] = HUGE_VAL;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ bool RivEclipseIntersectionGrid::useCell( size_t cellIndex ) const
if ( m_showInactiveCells )
return !cell.isInvalid() && ( cell.subGrid() == nullptr );
else
return m_activeCellInfo->isActive( cellIndex ) && ( cell.subGrid() == nullptr );
return m_activeCellInfo->isActive( ReservoirCellIndex( cellIndex ) ) && ( cell.subGrid() == nullptr );
}
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ void RivElementVectorResultPartMgr::appendDynamicGeometryPartsToModel( cvf::Mode
for ( int gcIdx = 0; gcIdx < static_cast<int>( mainGrid->totalCellCount() ); ++gcIdx )
{
auto& cell = mainGrid->cell( gcIdx );
if ( !cell.isInvalid() && activeCellInfo->isActive( gcIdx ) )
if ( !cell.isInvalid() && activeCellInfo->isActive( ReservoirCellIndex( gcIdx ) ) )
{
size_t resultIdx = activeCellInfo->cellResultIndex( gcIdx );
size_t resultIdx = activeCellInfo->cellResultIndex( ReservoirCellIndex( gcIdx ) ).value();
if ( result->vectorView() == RimElementVectorResult::VectorView::PER_FACE )
{
for ( int dir = 0; dir < static_cast<int>( directions.size() ); dir++ )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ void RivReservoirViewPartMgr::computeNativeVisibility( cvf::UByteArray*
{
const RigCell& cell = grid->cell( cellIndex );
size_t reservoirCellIndex = grid->reservoirCellIndex( cellIndex );
bool isCellActive = activeCellInfo->isActive( reservoirCellIndex );
bool isCellActive = activeCellInfo->isActive( ReservoirCellIndex( reservoirCellIndex ) );

if ( ( !invalidCellsIsVisible && cell.isInvalid() ) || ( !inactiveCellsIsVisible && !isCellActive ) ||
( !activeCellsIsVisible && isCellActive ) || ( *cellIsInWellStatuses )[cellIndex] )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ void RimFlowCharacteristicsPlot::onLoadDataAndUpdate()

for ( size_t i = 0; i < visibleCells.size(); ++i )
{
size_t cellIndex = activeCellInfo->cellResultIndex( i );
size_t cellIndex = activeCellInfo->cellResultIndex( ReservoirCellIndex( i ) ).value();
if ( cellIndex != cvf::UNDEFINED_SIZE_T )
{
visibleActiveCells[cellIndex] = visibleCells[i];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ std::map<std::string, std::vector<int>> RimFlowDiagSolution::allTracerActiveCell
RigGridBase* grid = mainGrid->gridByIndex( wrp.gridIndex() );
size_t reservoirCellIndex = grid->reservoirCellIndex( wrp.cellIndex() );

int cellActiveIndex = static_cast<int>( activeCellInfo->cellResultIndex( reservoirCellIndex ) );
int cellActiveIndex =
static_cast<int>( activeCellInfo->cellResultIndex( ReservoirCellIndex( reservoirCellIndex ) ).value() );

if ( useInjectors == isInjectorWell )
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,12 @@ void RimPlotCellPropertyFilter::updateCellVisibilityFromFilter( size_t timeStepI

for ( size_t reservoirCellIndex = 0; reservoirCellIndex < totalReservoirCellCount; ++reservoirCellIndex )
{
if ( !actCellInfo->isActive( reservoirCellIndex ) ) continue;
if ( !actCellInfo->isActive( ReservoirCellIndex( reservoirCellIndex ) ) ) continue;

cellResultIndex = reservoirCellIndex;
if ( isUsingGlobalActiveIndex )
{
cellResultIndex = actCellInfo->cellResultIndex( reservoirCellIndex );
cellResultIndex = actCellInfo->cellResultIndex( ReservoirCellIndex( reservoirCellIndex ) ).value();
}

if ( cellResultIndex != cvf::UNDEFINED_SIZE_T && cellResultIndex < cellResultValues.size() )
Expand Down
3 changes: 2 additions & 1 deletion ApplicationLibCode/ProjectDataModel/RimCornerPointCase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,8 @@ void RimCornerPointCase::buildGrid( RigEclipseCaseData& eclipseCaseData,
int matrixActiveIndex = activeCells[gridLocalCellIndex];
if ( matrixActiveIndex != -1 )
{
activeCellInfo->setCellResultIndex( cellStartIndex + gridLocalCellIndex, matrixActiveIndex );
activeCellInfo->setCellResultIndex( ReservoirCellIndex( cellStartIndex + gridLocalCellIndex ),
ActiveCellIndex( matrixActiveIndex ) );
}

cell.setParentCellIndex( cvf::UNDEFINED_SIZE_T );
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ bool RimEclipseCase::openReservoirCase()
std::vector<size_t> reservoirCellIndices;
for ( size_t i = 0; i < mainGrid->cellCount(); i++ )
{
if ( activeCellInfo->isActive( i ) )
if ( activeCellInfo->isActive( ReservoirCellIndex( i ) ) )
{
reservoirCellIndices.push_back( i );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ void RimEclipseStatisticsCaseEvaluator::evaluateForResults( const QList<ResSpec>

if ( visibility.notNull() && !visibility->val( reservoirCellIndex ) ) continue;

if ( destinationActiveCellInfo->isActive( reservoirCellIndex ) )
if ( destinationActiveCellInfo->isActive( ReservoirCellIndex( reservoirCellIndex ) ) )
{
// Extract the cell values from each of the cases and assemble them into one vector

Expand All @@ -232,7 +232,8 @@ void RimEclipseStatisticsCaseEvaluator::evaluateForResults( const QList<ResSpec>
// Replace huge_val with zero in the statistical computation for the following case
if ( m_useZeroAsInactiveCellValue || resultName.toUpper() == "ACTNUM" )
{
if ( unionActiveCells && unionActiveCells->isActive( reservoirCellIndex ) && val == HUGE_VAL )
if ( unionActiveCells && unionActiveCells->isActive( ReservoirCellIndex( reservoirCellIndex ) ) &&
val == HUGE_VAL )
{
val = 0.0;
}
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1866,7 +1866,7 @@ void RimEclipseView::calculateVisibleWellCellsIncFence( cvf::UByteArray* visible
size_t fenceCellIndex = grid->cellIndexFromIJK( *pI, *pJ, *pK );
size_t reservoirCellIndex = grid->reservoirCellIndex( fenceCellIndex );

if ( activeCellInfo && activeCellInfo->isActive( reservoirCellIndex ) )
if ( activeCellInfo && activeCellInfo->isActive( ReservoirCellIndex( reservoirCellIndex ) ) )
{
( *visibleCells )[fenceCellIndex] = true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells()
if ( caseCollection->reservoirs[caseIdx]
->eclipseCaseData()
->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL )
->isActive( reservoirCellIndex ) )
->isActive( ReservoirCellIndex( reservoirCellIndex ) ) )
{
activeM[gridLocalCellIndex] = 1;
}
Expand All @@ -321,7 +321,7 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells()
if ( caseCollection->reservoirs[caseIdx]
->eclipseCaseData()
->activeCellInfo( RiaDefines::PorosityModelType::FRACTURE_MODEL )
->isActive( reservoirCellIndex ) )
->isActive( ReservoirCellIndex( reservoirCellIndex ) ) )
{
activeF[gridLocalCellIndex] = 1;
}
Expand All @@ -338,13 +338,15 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells()

if ( activeM[gridLocalCellIndex] != 0 )
{
m_unionOfMatrixActiveCells->setCellResultIndex( reservoirCellIndex, globalActiveMatrixIndex++ );
m_unionOfMatrixActiveCells->setCellResultIndex( ReservoirCellIndex( reservoirCellIndex ),
ActiveCellIndex( globalActiveMatrixIndex++ ) );
activeMatrixIndex++;
}

if ( activeF[gridLocalCellIndex] != 0 )
{
m_unionOfFractureActiveCells->setCellResultIndex( reservoirCellIndex, globalActiveFractureIndex++ );
m_unionOfFractureActiveCells->setCellResultIndex( ReservoirCellIndex( reservoirCellIndex ),
ActiveCellIndex( globalActiveFractureIndex++ ) );
activeFractureIndex++;
}
}
Expand Down
Loading
Loading