#1056 Simplified TimeHistoryResultAccessor

#1056 Simplified TimeHistoryResultAccessor

ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp

@@ -24,65 +24,48 @@
 #include "RigGridBase.h"
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
+#include "RimEclipseCellColors.h"
 
 #include <cmath> // Needed for HUGE_VAL on Linux
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RigTimeHistoryResultAccessor::RigTimeHistoryResultAccessor(RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel)
+std::vector<double> RigTimeHistoryResultAccessor::timeHistoryValues(RimEclipseCellColors* cellColors, size_t gridIndex, size_t cellIndex, size_t timeStepCount)
-    : m_eclipseCaseData(eclipseCaseData),
-      m_gridIndex(gridIndex),
-      m_cellIndex(cellIndex),
-      m_scalarResultIndex(scalarResultIndex),
-      m_porosityModel(porosityModel)
 {
-    m_face = cvf::StructGridInterface::NO_FACE;
+    std::vector<double> values;
 
-    computeTimeHistoryData();
+    for (size_t i = 0; i < timeStepCount; i++)
+    {
+        cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultDefinition(gridIndex, i, cellColors);
+
+        values.push_back(resultAccessor->cellScalar(cellIndex));
+    }
+
+    return values;
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigTimeHistoryResultAccessor::setFace(cvf::StructGridInterface::FaceType face)
+QString RigTimeHistoryResultAccessor::topologyText(RigEclipseCaseData* eclipseCaseData,  size_t gridIndex, size_t cellIndex)
-{
-    m_face = face;
-
-    computeTimeHistoryData();
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-std::vector<double> RigTimeHistoryResultAccessor::timeHistoryValues() const
-{
-    return m_timeHistoryValues;
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-QString RigTimeHistoryResultAccessor::topologyText() const
 {
     QString text;
 
-    if (m_eclipseCaseData)
+    if (eclipseCaseData)
     {
-        if (m_cellIndex != cvf::UNDEFINED_SIZE_T)
+        if (cellIndex != cvf::UNDEFINED_SIZE_T)
         {
             size_t i = 0;
             size_t j = 0;
             size_t k = 0;
-            if (m_eclipseCaseData->grid(m_gridIndex)->ijkFromCellIndex(m_cellIndex, &i, &j, &k))
+            if (eclipseCaseData->grid(gridIndex)->ijkFromCellIndex(cellIndex, &i, &j, &k))
             {
                 // Adjust to 1-based Eclipse indexing
                 i++;
                 j++;
                 k++;
 
-                cvf::StructGridInterface::FaceEnum faceEnum(m_face);
-
                 text += QString("Cell : [%1, %2, %3]").arg(i).arg(j).arg(k);
             }
         }
@@ -91,23 +74,3 @@ QString RigTimeHistoryResultAccessor::topologyText() const
     return text;
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RigTimeHistoryResultAccessor::computeTimeHistoryData()
-{
-    m_timeHistoryValues.clear();
-
-    if (m_eclipseCaseData)
-    {
-        size_t timeStepCount = m_eclipseCaseData->results(m_porosityModel)->timeStepCount(m_scalarResultIndex);
-
-        for (size_t i = 0; i < timeStepCount; i++)
-        {
-            cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultIdx(m_eclipseCaseData, m_gridIndex, m_porosityModel, i, m_scalarResultIndex);
-
-            m_timeHistoryValues.push_back(resultAccessor->cellScalar(m_cellIndex));
-        }
-    }
-}
-

ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h

@@ -19,34 +19,15 @@
 
 #pragma once
 
-#include "cvfStructGrid.h"
-#include "RifReaderInterface.h"
 
 class RigEclipseCaseData;
+class RimEclipseCellColors;
 
 
 class RigTimeHistoryResultAccessor
 {
 public:
-    RigTimeHistoryResultAccessor(RigEclipseCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel);
+    static QString             topologyText(RigEclipseCaseData* m_eclipseCaseData,  size_t m_gridIndex, size_t m_cellIndex);
-    void setFace(cvf::StructGridInterface::FaceType face);
+    static std::vector<double> timeHistoryValues(RimEclipseCellColors* cellColors, size_t gridIndex, size_t cellIndex, size_t timeStepCount);
-
-    QString             topologyText() const;
-    std::vector<double> timeHistoryValues() const;
-
-private:
-    void                computeTimeHistoryData();
-
-private:
-    RigEclipseCaseData*    m_eclipseCaseData;
-
-    size_t          m_gridIndex;
-    size_t          m_cellIndex;
-    size_t          m_scalarResultIndex;
-
-    cvf::StructGridInterface::FaceType m_face;
-    RifReaderInterface::PorosityModelResultType m_porosityModel;
-
-    std::vector<double> m_timeHistoryValues;
 };
 

ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp

@@ -23,9 +23,11 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
-#include "RiuFemTimeHistoryResultAccessor.h"
+#include "RigFemPartCollection.h"
+#include "RigFemPartResultsCollection.h"
 #include "RigGeoMechCaseData.h"
 #include "RigTimeHistoryResultAccessor.h"
+#include "RiuFemTimeHistoryResultAccessor.h"
 
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
@@ -37,15 +39,13 @@
 
 #include "RiuFemResultTextBuilder.h"
 #include "RiuMainWindow.h"
+#include "RiuResultQwtPlot.h"
 #include "RiuResultTextBuilder.h"
 #include "RiuSelectionManager.h"
-#include "RiuResultQwtPlot.h"
 
 #include <QStatusBar>
 
 #include <assert.h>
-#include "RigFemPartResultsCollection.h"
-#include "RigFemPartCollection.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -103,11 +103,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuEclipseSelec
 {
     RimEclipseView* eclipseView = eclipseSelectionItem->m_view.p();
 
-    if (eclipseView->cellResult()->resultType() == RimDefines::FLOW_DIAGNOSTICS)
+    if (eclipseView->cellResult()->hasDynamicResult() &&
-    {
-        // Todo
-    }
-    else if (eclipseView->cellResult()->hasDynamicResult() &&
         eclipseView->eclipseCase() &&
         eclipseView->eclipseCase()->reservoirData())
     {
@@ -117,19 +113,15 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuEclipseSelec
         eclipseView->eclipseCase()->reservoirData()->results(porosityModel)->maxTimeStepCount(&scalarIndexWithMaxTimeStepCount);
         std::vector<QDateTime> timeStepDates = eclipseView->eclipseCase()->reservoirData()->results(porosityModel)->timeStepDates(scalarIndexWithMaxTimeStepCount);
 
-        RigTimeHistoryResultAccessor timeHistResultAccessor(eclipseView->eclipseCase()->reservoirData(),
-            eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex,
-            eclipseView->cellResult()->scalarResultIndex(), porosityModel);
-
         QString curveName = eclipseView->eclipseCase()->caseUserDescription();
         curveName += ", ";
         curveName += eclipseView->cellResult()->resultVariableUiName();
         curveName += ", ";
         curveName += QString("Grid index %1").arg(eclipseSelectionItem->m_gridIndex);
         curveName += ", ";
-        curveName += timeHistResultAccessor.topologyText();
+        curveName += RigTimeHistoryResultAccessor::topologyText(eclipseView->eclipseCase()->reservoirData(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex);
 
-        std::vector<double> timeHistoryValues = timeHistResultAccessor.timeHistoryValues();
+        std::vector<double> timeHistoryValues = RigTimeHistoryResultAccessor::timeHistoryValues(eclipseView->cellResult(), eclipseSelectionItem->m_gridIndex, eclipseSelectionItem->m_cellIndex, timeStepDates.size());
         CVF_ASSERT(timeStepDates.size() == timeHistoryValues.size());
 
         RiuMainWindow::instance()->resultPlot()->addCurve(curveName, eclipseSelectionItem->m_color, timeStepDates, timeHistoryValues);