From f98a909e51c879077241292100fa4b4279eb7646 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 19 Aug 2014 14:02:21 +0200
Subject: [PATCH] Removed obsolete code and renamed functions

---
 .../ProjectDataModel/RimReservoirCellResultsStorage.cpp  | 9 ---------
 .../ProjectDataModel/RimReservoirCellResultsStorage.h    | 1 -
 ApplicationCode/ProjectDataModel/RimReservoirView.cpp    | 4 ++--
 .../ReservoirDataModel/RigCaseCellResultsData.cpp        | 2 +-
 .../ReservoirDataModel/RigCaseCellResultsData.h          | 2 +-
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
index c46fe8b347..e34bcba704 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
@@ -720,15 +720,6 @@ size_t RimReservoirCellResultsStorage::storedResultsCount()
     return m_resultCacheMetaData.size();
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimReservoirCellResultsStorage::createCombinedTransmissibilityResults()
-{
-    if (!m_cellResults) return;
-
-    m_cellResults->createCombinedTransmissibilityResult();
-}
 
 
 CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorageEntryInfo, "ResultStorageEntryInfo");
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.h b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.h
index 7208bcd83e..aa90e062e8 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.h
+++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.h
@@ -53,7 +53,6 @@ public:
     RifReaderInterface*             readerInterface();
 
     void                            loadOrComputeSOIL();
-    void                            createCombinedTransmissibilityResults();
     void                            computeDepthRelatedResults();
 
     size_t                          findOrLoadScalarResultForTimeStep(RimDefines::ResultCatType type, const QString& resultName, size_t timeStepIndex);
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
index b1280f90b4..0c503c5a9e 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
@@ -920,12 +920,12 @@ void RimReservoirView::loadDataAndUpdate()
                 {
                     RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::MATRIX_RESULTS);
                     results->loadOrComputeSOIL();
-                    results->createCombinedTransmissibilityResults();
+                    if (results->cellResults()) results->cellResults()->createPerFaceCombinedResults();
                 }
                 {
                     RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::FRACTURE_RESULTS);
                     results->loadOrComputeSOIL();
-                    results->createCombinedTransmissibilityResults();
+                    if (results->cellResults()) results->cellResults()->createPerFaceCombinedResults();
                 }
             }
         }
diff --git a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
index 40643ed329..a726f5b0bb 100644
--- a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
@@ -506,7 +506,7 @@ void RigCaseCellResultsData::setMustBeCalculated(size_t scalarResultIndex)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigCaseCellResultsData::createCombinedTransmissibilityResult()
+void RigCaseCellResultsData::createPerFaceCombinedResults()
 {
     {
         size_t combinedTransmissibilityIndex = findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedTransmissibilityResultName());
diff --git a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
index 603fb41b4f..b2116f1713 100644
--- a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
+++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
@@ -70,7 +70,7 @@ public:
     size_t                                             addEmptyScalarResult(RimDefines::ResultCatType type, const QString& resultName, bool needsToBeStored);
     QString                                            makeResultNameUnique(const QString& resultNameProposal) const;
 
-    void                                               createCombinedTransmissibilityResult();
+    void                                               createPerFaceCombinedResults();
 
     void                                               removeResult(const QString& resultName);
     void                                               clearAllResults();