#5925 NNC computations : Add flag in preferences to include inactive cells

This commit is contained in:
Magne Sjaastad
2020-05-13 14:20:46 +02:00
parent 0c32538e01
commit c932b40a56
14 changed files with 72 additions and 20 deletions

View File

@@ -613,10 +613,13 @@ void RimEclipseCase::computeCachedData()
if ( computeFaults )
{
bool computeNncs = RiaApplication::instance()->preferences()->readerSettings()->importNNCs();
bool includeInactiveCells =
RiaApplication::instance()->preferences()->readerSettings()->includeInactiveCellsInFaultGeometry();
rigEclipseCase->mainGrid()->calculateFaults( rigEclipseCase->activeCellInfo(
RiaDefines::PorosityModelType::MATRIX_MODEL ),
computeNncs );
computeNncs,
includeInactiveCells );
}
}

View File

@@ -136,9 +136,12 @@ RigMainGrid* RimEclipseCaseCollection::registerCaseInGridCollection( RigEclipseC
if ( computeFaults )
{
bool computeNncs = RiaApplication::instance()->preferences()->readerSettings()->importNNCs();
bool includeInactiveCells =
RiaApplication::instance()->preferences()->readerSettings()->includeInactiveCellsInFaultGeometry();
rigEclipseCase->mainGrid()->calculateFaults( rigEclipseCase->activeCellInfo(
RiaDefines::PorosityModelType::MATRIX_MODEL ),
computeNncs );
computeNncs,
includeInactiveCells );
}
equalGrid = rigEclipseCase->mainGrid();