OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5913 Import NNC : Do not compute NNCs if importNNCs is disabled in preferences

Browse Source
This commit is contained in:
Magne Sjaastad
2020-05-13 12:35:03 +02:00
parent 87f1535888
commit 2bc9cb37c0
5 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -608,8 +608,12 @@ void RimEclipseCase::computeCachedData()
{ {
auto task = pInf.task( "Calculating faults", 17 ); auto task = pInf.task( "Calculating faults", 17 );
rigEclipseCase->mainGrid()->calculateFaults(
rigEclipseCase->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL ) ); bool computeNncs = RiaApplication::instance()->preferences()->readerSettings()->importNNCs();
rigEclipseCase->mainGrid()->calculateFaults( rigEclipseCase->activeCellInfo(
RiaDefines::PorosityModelType::MATRIX_MODEL ),
computeNncs );
} }
{ {

12
ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp
View File

@@ -20,6 +20,11 @@
#include "RimEclipseCaseCollection.h" #include "RimEclipseCaseCollection.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RifReaderSettings.h"
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigGridManager.h" #include "RigGridManager.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
@@ -127,8 +132,11 @@ RigMainGrid* RimEclipseCaseCollection::registerCaseInGridCollection( RigEclipseC
// This is the first insertion of this grid, compute cached data // This is the first insertion of this grid, compute cached data
rigEclipseCase->mainGrid()->computeCachedData(); rigEclipseCase->mainGrid()->computeCachedData();
rigEclipseCase->mainGrid()->calculateFaults( bool computeNncs = RiaApplication::instance()->preferences()->readerSettings()->importNNCs();
rigEclipseCase->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL ) );
rigEclipseCase->mainGrid()->calculateFaults( rigEclipseCase->activeCellInfo(
RiaDefines::PorosityModelType::MATRIX_MODEL ),
computeNncs );
equalGrid = rigEclipseCase->mainGrid(); equalGrid = rigEclipseCase->mainGrid();
} }

7
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@@ -3091,6 +3091,13 @@ void RigCaseCellResultsData::computeAllanResults( RigCaseCellResultsData* cellRe
if ( cellResultsData && cellResultsData->activeFormationNames() && if ( cellResultsData && cellResultsData->activeFormationNames() &&
!cellResultsData->activeFormationNames()->formationNames().empty() ) !cellResultsData->activeFormationNames()->formationNames().empty() )
{ {
// If import of NNC is disabled in preferences, we must make ensure that computed NNC connections are in place
if ( mainGrid->nncData()->nativeConnectionCount() == mainGrid->nncData()->connections().size() )
{
mainGrid->nncData()->computeCompleteSetOfNncs( mainGrid, cellResultsData->activeCellInfo() );
mainGrid->distributeNNCsToFaults();
}
auto fnNamesResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES, auto fnNamesResAddr = RigEclipseResultAddress( RiaDefines::ResultCatType::FORMATION_NAMES,
RiaDefines::activeFormationNamesResultName() ); RiaDefines::activeFormationNamesResultName() );
auto fnAllanResultResAddr = auto fnAllanResultResAddr =

7
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -413,7 +413,7 @@ bool RigMainGrid::hasFaultWithName( const QString& name ) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigMainGrid::calculateFaults( const RigActiveCellInfo* activeCellInfo ) void RigMainGrid::calculateFaults( const RigActiveCellInfo* activeCellInfo, bool computeNncs )
{ {
if ( hasFaultWithName( RiaDefines::undefinedGridFaultName() ) && if ( hasFaultWithName( RiaDefines::undefinedGridFaultName() ) &&
hasFaultWithName( RiaDefines::undefinedGridFaultWithInactiveName() ) ) hasFaultWithName( RiaDefines::undefinedGridFaultWithInactiveName() ) )
@@ -556,7 +556,10 @@ void RigMainGrid::calculateFaults( const RigActiveCellInfo* activeCellInfo )
} }
} }
this->nncData()->computeCompleteSetOfNncs( this, activeCellInfo ); if ( computeNncs )
{
this->nncData()->computeCompleteSetOfNncs( this, activeCellInfo );
}
distributeNNCsToFaults(); distributeNNCsToFaults();
} }

2
ApplicationCode/ReservoirDataModel/RigMainGrid.h
View File

@@ -70,7 +70,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 ); void calculateFaults( const RigActiveCellInfo* activeCellInfo, bool computeNncs );
void distributeNNCsToFaults(); void distributeNNCsToFaults();