OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-15 10:03:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete parameters

Browse Source
This commit is contained in:
Magne Sjaastad 2020-05-15 11:19:16 +02:00
parent 0c13f132fa
commit ebde4495fb
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -701,14 +701,8 @@ void RimEclipseCase::ensureFaultDataIsComputed()
bool computeFaults = RiaApplication::instance()->preferences()->readerSettings()->importFaults(); bool computeFaults = RiaApplication::instance()->preferences()->readerSettings()->importFaults();
if ( computeFaults ) if ( computeFaults )
{ {
bool computeNncs = RiaApplication::instance()->preferences()->readerSettings()->importNNCs(); RigActiveCellInfo* actCellInfo = rigEclipseCase->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
bool includeInactiveCells = rigEclipseCase->mainGrid()->calculateFaults( actCellInfo );
RiaApplication::instance()->preferences()->readerSettings()->includeInactiveCellsInFaultGeometry();
rigEclipseCase->mainGrid()->calculateFaults( rigEclipseCase->activeCellInfo(
RiaDefines::PorosityModelType::MATRIX_MODEL ),
computeNncs,
includeInactiveCells );
} }
} }
} }

2
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@ -413,7 +413,7 @@ bool RigMainGrid::hasFaultWithName( const QString& name ) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigMainGrid::calculateFaults( const RigActiveCellInfo* activeCellInfo, bool computeNncs, bool includeInactiveCells ) void RigMainGrid::calculateFaults( const RigActiveCellInfo* activeCellInfo )
{ {
if ( hasFaultWithName( RiaDefines::undefinedGridFaultName() ) && if ( hasFaultWithName( RiaDefines::undefinedGridFaultName() ) &&
hasFaultWithName( RiaDefines::undefinedGridFaultWithInactiveName() ) ) hasFaultWithName( RiaDefines::undefinedGridFaultWithInactiveName() ) )

2
ApplicationCode/ReservoirDataModel/RigMainGrid.h
View File

@ -71,7 +71,7 @@ public:
void setFaults( const cvf::Collection<RigFault>& faults ); void setFaults( const cvf::Collection<RigFault>& faults );
const cvf::Collection<RigFault>& faults() const; const cvf::Collection<RigFault>& faults() const;
cvf::Collection<RigFault>& faults(); cvf::Collection<RigFault>& faults();
void calculateFaults( const RigActiveCellInfo* activeCellInfo, bool computeNncs, bool includeInactiveCells ); void calculateFaults( const RigActiveCellInfo* activeCellInfo );
void distributeNNCsToFaults(); void distributeNNCsToFaults();