From 7763a74752a5ee99ea546c61e0dcd17e344742fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com>
Date: Fri, 19 May 2017 10:19:18 +0200
Subject: [PATCH] #1487 Use new trans Equation class Step 1.

---
 ...StimPlanCellTransmissibilityCalculator.cpp | 27 ++++---------------
 ...ToStimPlanCellTransmissibilityCalculator.h |  7 -----
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
index b729cbcd71..807e750fca 100644
--- a/ApplicationCode/ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
@@ -18,6 +18,8 @@
 
 #include "RigEclipseToStimPlanCellTransmissibilityCalculator.h"
 
+#include "RigFractureTransmissibilityEquations.h"
+
 #include "RigStimPlanFracTemplateCell.h"
 #include "RigResultAccessorFactory.h"
 #include "RigEclipseCaseData.h"
@@ -203,9 +205,9 @@ void RigEclipseToStimPlanCellTransmissibilityCalculator::calculateStimPlanCellsM
 
         double fractureAreaWeightedlength = totalAreaXLength / fractureArea;
 
-        double transmissibility_X = calculateMatrixTransmissibility(permY, NTG, Ay, dx, m_fractureSkinFactor, fractureAreaWeightedlength, m_cDarcy);
-        double transmissibility_Y = calculateMatrixTransmissibility(permX, NTG, Ax, dy, m_fractureSkinFactor, fractureAreaWeightedlength, m_cDarcy);
-        double transmissibility_Z = calculateMatrixTransmissibility(permZ, 1.0, Az, dz, m_fractureSkinFactor, fractureAreaWeightedlength, m_cDarcy);
+        double transmissibility_X = RigFractureTransmissibilityEquations::calculateMatrixTransmissibility(permY, NTG, Ay, dx, m_fractureSkinFactor, fractureAreaWeightedlength, m_cDarcy);
+        double transmissibility_Y = RigFractureTransmissibilityEquations::calculateMatrixTransmissibility(permX, NTG, Ax, dy, m_fractureSkinFactor, fractureAreaWeightedlength, m_cDarcy);
+        double transmissibility_Z = RigFractureTransmissibilityEquations::calculateMatrixTransmissibility(permZ, 1.0, Az, dz, m_fractureSkinFactor, fractureAreaWeightedlength, m_cDarcy);
 
         double transmissibility = sqrt(transmissibility_X * transmissibility_X
                                        + transmissibility_Y * transmissibility_Y
@@ -281,22 +283,3 @@ bool RigEclipseToStimPlanCellTransmissibilityCalculator::planeCellIntersectionPo
 
     return isCellIntersected;
 }
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-double RigEclipseToStimPlanCellTransmissibilityCalculator::calculateMatrixTransmissibility(double perm, 
-                                                                                           double NTG, 
-                                                                                           double A, 
-                                                                                           double cellSizeLength, 
-                                                                                           double skinfactor, 
-                                                                                           double fractureAreaWeightedlength, 
-                                                                                           double cDarcy)
-{
-    double transmissibility;
-
-    double slDivPi = (skinfactor * fractureAreaWeightedlength) / cvf::PI_D;
-    transmissibility = 8 * cDarcy * (perm * NTG) * A / (cellSizeLength + slDivPi);
-
-    return transmissibility;
-}
diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.h b/ApplicationCode/ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.h
index f0c987bc99..b06e744f96 100644
--- a/ApplicationCode/ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.h
+++ b/ApplicationCode/ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.h
@@ -50,13 +50,6 @@ private:
                                                               cvf::Vec3d & localX, 
                                                               cvf::Vec3d & localY, 
                                                               cvf::Vec3d & localZ);
-    static double               calculateMatrixTransmissibility(double permX, 
-                                                                double NTG, 
-                                                                double Ay, 
-                                                                double dx, 
-                                                                double skinfactor, 
-                                                                double fractureAreaWeightedlength, 
-                                                                double cDarcy);
 
     const RimEclipseCase*               m_case;
     double                              m_cDarcy;