From 70a7b3ae5c89b9ddbb14a962f6960bd672387b90 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 28 Sep 2018 13:42:02 +0200
Subject: [PATCH] Fracture Completion Report : Use areaOpenForFlow() and remove
 unused function

---
 .../RigEclipseToStimPlanCalculator.cpp        | 20 +++++++++----------
 ...StimPlanCellTransmissibilityCalculator.cpp |  8 --------
 ...ToStimPlanCellTransmissibilityCalculator.h |  1 -
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp
index 6c31b407d9..cb1b1bf1c6 100644
--- a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp
+++ b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp
@@ -55,7 +55,6 @@ RigEclipseToStimPlanCalculator::RigEclipseToStimPlanCalculator(const RimEclipseC
     , m_fractureGrid(fractureGrid)
     , m_fracture(fracture)
 {
-
     computeValues();
 }
 
@@ -71,8 +70,13 @@ void RigEclipseToStimPlanCalculator::computeValues()
         const RigFractureCell& fractureCell = m_fractureGrid.fractureCells()[i];
         if (!fractureCell.hasNonZeroConductivity()) continue;
 
-        RigEclipseToStimPlanCellTransmissibilityCalculator eclToFractureTransCalc(
-            m_case, m_fractureTransform, m_fractureSkinFactor, m_cDarcy, fractureCell, reservoirCellIndicesOpenForFlow, m_fracture);
+        RigEclipseToStimPlanCellTransmissibilityCalculator eclToFractureTransCalc(m_case,
+                                                                                  m_fractureTransform,
+                                                                                  m_fractureSkinFactor,
+                                                                                  m_cDarcy,
+                                                                                  fractureCell,
+                                                                                  reservoirCellIndicesOpenForFlow,
+                                                                                  m_fracture);
 
         const std::vector<size_t>& fractureCellContributingEclipseCells =
             eclToFractureTransCalc.globalIndiciesToContributingEclipseCells();
@@ -121,7 +125,7 @@ void RigEclipseToStimPlanCalculator::appendDataToTransmissibilityCondenser(bool
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 double RigEclipseToStimPlanCalculator::totalEclipseAreaOpenForFlow() const
 {
@@ -129,16 +133,12 @@ double RigEclipseToStimPlanCalculator::totalEclipseAreaOpenForFlow() const
 
     for (const auto& singleCellCalc : m_singleFractureCellCalculators)
     {
-        const auto& cellAreas = singleCellCalc.second.contributingEclipseCellAreas();
+        double cellArea = singleCellCalc.second.areaOpenForFlow();
 
-        for (const auto& cellArea : cellAreas)
-        {
-            area += cellArea;
-        }
+        area += cellArea;
     }
 
     return area;
-
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
index 914a9f0df5..61a47a4ff0 100644
--- a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
+++ b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
@@ -72,14 +72,6 @@ const std::vector<double>& RigEclipseToStimPlanCellTransmissibilityCalculator::c
     return m_contributingEclipseCellTransmissibilities;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-const std::vector<double>& RigEclipseToStimPlanCellTransmissibilityCalculator::contributingEclipseCellAreas() const
-{
-    return m_contributingEclipseCellAreas;
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.h b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.h
index a178041e35..c6e4ebce01 100644
--- a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.h
+++ b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.h
@@ -54,7 +54,6 @@ public:
     // These three vectors have the same size
     const std::vector<size_t>& globalIndiciesToContributingEclipseCells() const;
     const std::vector<double>& contributingEclipseCellTransmissibilities() const;
-    const std::vector<double>& contributingEclipseCellAreas() const;
 
     double areaOpenForFlow() const;
     double aggregatedMatrixTransmissibility() const;