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

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

View File

@@ -3091,6 +3091,13 @@ void RigCaseCellResultsData::computeAllanResults( RigCaseCellResultsData* cellRe
if ( cellResultsData && cellResultsData->activeFormationNames() &&
!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,
RiaDefines::activeFormationNamesResultName() );
auto fnAllanResultResAddr =