From 5734f68fe54c54ce3c12d0a4dcee3459da177051 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Wed, 29 Jan 2020 10:00:25 +0100
Subject: [PATCH] #5406 NNC results : Show NNC results on complete NNC geometry

---
 .../RivReservoirFaultsPartMgr.cpp             | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
index 4618f32454..6330605fab 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
@@ -154,8 +154,8 @@ void RivReservoirFaultsPartMgr::appendPartsToModel( cvf::ModelBasicList* model )
         {
             if ( faultCollection->showNNCs() )
             {
-                bool showNncs             = true;
-                bool showAllenNncGeometry = false;
+                bool showNncs           = true;
+                bool showCompleteNncGeo = false;
 
                 if ( faultCollection->hideNncsWhenNoResultIsAvailable() )
                 {
@@ -171,7 +171,23 @@ void RivReservoirFaultsPartMgr::appendPartsToModel( cvf::ModelBasicList* model )
 
                     if ( eclipseResultAddress.m_resultCatType == RiaDefines::ALLEN_DIAGRAMS )
                     {
-                        showAllenNncGeometry = true;
+                        showCompleteNncGeo = true;
+                    }
+
+                    {
+                        QStringList stringsToMatch{RiaDefines::combinedRiTranResultName(),
+                                                   RiaDefines::combinedRiMultResultName(),
+                                                   RiaDefines::combinedRiAreaNormTranResultName(),
+                                                   RiaDefines::combinedTransmissibilityResultName(),
+                                                   RiaDefines::combinedMultResultName()};
+
+                        for ( const auto& s : stringsToMatch )
+                        {
+                            if ( eclipseResultAddress.m_resultName.contains( s, Qt::CaseInsensitive ) )
+                            {
+                                showCompleteNncGeo = true;
+                            }
+                        }
                     }
 
                     RigMainGrid* mainGrid = m_reservoirView->mainGrid();
@@ -183,7 +199,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel( cvf::ModelBasicList* model )
 
                 if ( showNncs )
                 {
-                    if ( showAllenNncGeometry )
+                    if ( showCompleteNncGeo )
                     {
                         rivFaultPart->appendCompleteNNCFacesToModel( &parts );
                     }