From cf5cd360620f1847bd446abae5eba6b0cfad137c Mon Sep 17 00:00:00 2001
From: Kristian Bendiksen <kristian.bendiksen@gmail.com>
Date: Thu, 24 Sep 2020 11:50:37 +0200
Subject: [PATCH] Move default por/perm to fracture model template.

---
 .../ProjectDataModel/Completions/RimFractureModel.cpp      | 7 ++-----
 .../ProjectDataModel/Completions/RimFractureModel.h        | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp
index 9306ae6c79..7777bcb2ec 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp
@@ -134,9 +134,6 @@ RimFractureModel::RimFractureModel()
     CAF_PDM_InitScriptableField( &m_boundingBoxHorizontal, "BoundingBoxHorizontal", 50.0, "Bounding Box Horizontal", "", "", "" );
     CAF_PDM_InitScriptableField( &m_boundingBoxVertical, "BoundingBoxVertical", 100.0, "Bounding Box Vertical", "", "", "" );
 
-    CAF_PDM_InitScriptableField( &m_defaultPorosity, "DefaultPorosity", 0.0, "Default Porosity", "", "", "" );
-    CAF_PDM_InitScriptableField( &m_defaultPermeability, "DefaultPermeability", 10.0e-6, "Default Permeability", "", "", "" );
-
     // Stress unit: bar
     // Stress gradient unit: bar/m
     // Depth is meter
@@ -899,7 +896,7 @@ void RimFractureModel::loadDataAndUpdate()
 //--------------------------------------------------------------------------------------------------
 double RimFractureModel::defaultPorosity() const
 {
-    return m_defaultPorosity();
+    return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultPorosity() : 0.0;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -907,7 +904,7 @@ double RimFractureModel::defaultPorosity() const
 //--------------------------------------------------------------------------------------------------
 double RimFractureModel::defaultPermeability() const
 {
-    return m_defaultPermeability();
+    return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultPermeability() : 0.0;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h
index d548032a0d..5a472c9345 100644
--- a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h
+++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h
@@ -187,8 +187,6 @@ protected:
     caf::PdmField<double>                       m_boundingBoxVertical;
     caf::PdmField<double>                       m_boundingBoxHorizontal;
     caf::PdmPtrField<RimModeledWellPath*>       m_thicknessDirectionWellPath;
-    caf::PdmField<double>                       m_defaultPorosity;
-    caf::PdmField<double>                       m_defaultPermeability;
     caf::PdmField<double>                       m_verticalStress;
     caf::PdmField<double>                       m_verticalStressGradient;
     caf::PdmField<double>                       m_stressDepth;