From cbb25cb5144acfecfa5543ba30ba53c619fd9fea Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 6 Mar 2018 08:16:39 +0100
Subject: [PATCH] #2561 Fracture Template : Set Default Conductivity Result in
 loadDataAndUpdate()

---
 ApplicationCode/Application/RiaApplication.cpp    |  1 -
 .../Completions/RimFractureTemplateCollection.cpp | 15 ---------------
 .../Completions/RimFractureTemplateCollection.h   |  1 -
 .../Completions/RimStimPlanFractureTemplate.cpp   |  2 ++
 .../Completions/RimStimPlanFractureTemplate.h     |  2 +-
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index d96637c2bc..8d3a613e2e 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -512,7 +512,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
         
         oilField->fractureDefinitionCollection()->loadAndUpdateData();
         oilField->fractureDefinitionCollection()->createAndAssignTemplateCopyForNonMatchingUnit();
-        oilField->fractureDefinitionCollection()->setDefaultConductivityResultIfEmpty();
 
         {
             std::vector<RimWellPathFracture*> wellPathFractures;
diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
index b1e7b15796..02ea9fc31d 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp
@@ -253,21 +253,6 @@ void RimFractureTemplateCollection::loadAndUpdateData()
     }
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimFractureTemplateCollection::setDefaultConductivityResultIfEmpty()
-{
-    for (RimFractureTemplate* f : m_fractureDefinitions())
-    {
-        RimStimPlanFractureTemplate* stimPlanFracture = dynamic_cast<RimStimPlanFractureTemplate*>(f);
-        if (stimPlanFracture)
-        {
-            stimPlanFracture->setDefaultConductivityResultIfEmpty();
-        }
-    }
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
index 11e919556d..f00d598106 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
@@ -50,7 +50,6 @@ public:
 
     void                                        createAndAssignTemplateCopyForNonMatchingUnit();
     void                                        loadAndUpdateData();
-    void                                        setDefaultConductivityResultIfEmpty();
 
     void                                        updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
 protected:
diff --git a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
index 8e5adec3d2..e9599fa1e2 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
@@ -250,6 +250,8 @@ void RimStimPlanFractureTemplate::loadDataAndUpdate()
 
     if (m_stimPlanFractureDefinitionData.notNull())
     {
+        setDefaultConductivityResultIfEmpty();
+
         if (fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_UNKNOWN)
         {
             setFractureTemplateUnit(m_stimPlanFractureDefinitionData->unitSet());
diff --git a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
index 9d5001778e..30cb44b477 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
@@ -86,7 +86,6 @@ public:
                                                                          PosNegAccumulator& posNegAccumulator) const override;
 
     QString                                 mapUiResultNameToFileResultName(const QString& uiResultName) const;
-    void                                    setDefaultConductivityResultIfEmpty();
 
     bool                                    showStimPlanMesh() const;
 
@@ -103,6 +102,7 @@ protected:
     virtual bool                            supportsConductivityScaling() const override { return true; }
 
 private:
+    void                                    setDefaultConductivityResultIfEmpty();
     bool                                    setBorderPolygonResultNameToDefault();
     void                                    setDepthOfWellPathAtFracture();
     void                                    setPerforationLength();