Renamed to RigResultAccessObjectFactory

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp

@@ -23,7 +23,7 @@
 #include "RigCaseData.h"
 #include "RigGridBase.h"
 #include "RigCaseCellResultsData.h"
-#include "RigGridScalarDataAccess.h"
+#include "RigResultAccessObjectFactory.h"
 #include "RimCase.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimWellCollection.h"

ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake

@@ -10,7 +10,7 @@ ${CEE_CURRENT_LIST_DIR}RigCell.h
 ${CEE_CURRENT_LIST_DIR}RigCaseData.h
 ${CEE_CURRENT_LIST_DIR}RigGridBase.h
 ${CEE_CURRENT_LIST_DIR}RigGridManager.h
-${CEE_CURRENT_LIST_DIR}RigGridScalarDataAccess.h
+${CEE_CURRENT_LIST_DIR}RigResultAccessObjectFactory.h
 ${CEE_CURRENT_LIST_DIR}RigLocalGrid.h
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.h
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h
@@ -30,7 +30,7 @@ ${CEE_CURRENT_LIST_DIR}RigCell.cpp
 ${CEE_CURRENT_LIST_DIR}RigCaseData.cpp
 ${CEE_CURRENT_LIST_DIR}RigGridBase.cpp
 ${CEE_CURRENT_LIST_DIR}RigGridManager.cpp
-${CEE_CURRENT_LIST_DIR}RigGridScalarDataAccess.cpp
+${CEE_CURRENT_LIST_DIR}RigResultAccessObjectFactory.cpp
 ${CEE_CURRENT_LIST_DIR}RigLocalGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp

ApplicationCode/ReservoirDataModel/RigCaseData.cpp

@@ -19,7 +19,7 @@
 #include "RigCaseData.h"
 #include "RigMainGrid.h"
 #include "RigCaseCellResultsData.h"
-#include "RigGridScalarDataAccess.h"
+#include "RigResultAccessObjectFactory.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -496,7 +496,7 @@ cvf::ref<cvf::StructGridScalarDataAccess> RigCaseData::dataAccessObject(const Ri
     if (timeStepIndex != cvf::UNDEFINED_SIZE_T && 
         scalarSetIndex != cvf::UNDEFINED_SIZE_T)
     {
-        cvf::ref<cvf::StructGridScalarDataAccess> dataAccess = RigGridScalarDataAccessFactory::createPerGridDataAccessObject( this, grid->gridIndex(), porosityModel, timeStepIndex, scalarSetIndex);
+        cvf::ref<cvf::StructGridScalarDataAccess> dataAccess = RigResultAccessObjectFactory::createNativeDataAccessObject(this, grid->gridIndex(), porosityModel, timeStepIndex, scalarSetIndex);
         return dataAccess;
     }
 

ApplicationCode/ReservoirDataModel/RigGridBase.cpp

@@ -20,7 +20,7 @@
 #include "RigMainGrid.h"
 #include "RigCell.h"
 #include "RigCaseCellResultsData.h"
-#include "RigGridScalarDataAccess.h"
+#include "RigResultAccessObjectFactory.h"
 
 #include "cvfAssert.h"
 

ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RigGridScalarDataAccess.h"
+#include "RigResultAccessObjectFactory.h"
 
 #include "cvfLibCore.h"
 #include "cvfBase.h"
@@ -146,7 +146,7 @@ public:
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::StructGridScalarDataAccess> RigGridScalarDataAccessFactory::createPerGridDataAccessObject(RigCaseData* eclipseCase,
+cvf::ref<cvf::StructGridScalarDataAccess> RigResultAccessObjectFactory::createNativeDataAccessObject(RigCaseData* eclipseCase,
                                                                                                         size_t gridIndex,
                                                                                                         RifReaderInterface::PorosityModelResultType porosityModel,
                                                                                                         size_t timeStepIndex,

ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp

@@ -0,0 +1,198 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RigResultAccessObjectFactory.h"
+
+#include "cvfLibCore.h"
+#include "cvfBase.h"
+#include "cvfObject.h"
+#include "cvfAssert.h"
+
+#include "RigMainGrid.h"
+#include "RigCaseCellResultsData.h"
+#include "RigActiveCellInfo.h"
+#include "RigGridBase.h"
+#include "RigCaseData.h"
+#include <math.h>
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+class RigGridAllCellsScalarDataAccess : public cvf::StructGridScalarDataAccess
+{
+public:
+    RigGridAllCellsScalarDataAccess(const RigGridBase* grid, std::vector<double>* reservoirResultValues);
+
+    virtual double          cellScalar(size_t gridLocalCellIndex) const;
+    virtual void            setCellScalar(size_t cellIndex, double value);
+
+private:
+    const RigGridBase*      m_grid;
+    std::vector<double>*    m_reservoirResultValues;
+};
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RigGridAllCellsScalarDataAccess::RigGridAllCellsScalarDataAccess(const RigGridBase* grid, std::vector<double>* reservoirResultValues) 
+    : m_grid(grid),
+    m_reservoirResultValues(reservoirResultValues)
+{
+    CVF_ASSERT(reservoirResultValues != NULL);
+    CVF_ASSERT(grid != NULL);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+double RigGridAllCellsScalarDataAccess::cellScalar(size_t gridLocalCellIndex) const
+{
+    if (m_reservoirResultValues->size() == 0 ) return HUGE_VAL;
+
+    size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
+    CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size());
+
+    return m_reservoirResultValues->at(globalGridCellIndex);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RigGridAllCellsScalarDataAccess::setCellScalar(size_t gridLocalCellIndex, double scalarValue)
+{
+    size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
+    CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size());
+
+    (*m_reservoirResultValues)[globalGridCellIndex] = scalarValue;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+class RigGridActiveCellsScalarDataAccess : public cvf::StructGridScalarDataAccess
+{
+public:
+    RigGridActiveCellsScalarDataAccess(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo)
+      : m_grid(grid),
+        m_reservoirResultValues(reservoirResultValues),
+        m_activeCellInfo(activeCellInfo)
+      {
+
+          CVF_ASSERT(grid != NULL);
+      }
+
+      virtual double  cellScalar(size_t gridLocalCellIndex) const
+      {
+          if (m_reservoirResultValues == NULL || m_reservoirResultValues->size() == 0 ) return HUGE_VAL;
+
+          size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
+          size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex);
+          if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL;
+
+          CVF_TIGHT_ASSERT(resultValueIndex < m_reservoirResultValues->size());
+
+          return m_reservoirResultValues->at(resultValueIndex);
+      }
+
+      //--------------------------------------------------------------------------------------------------
+      /// 
+      //--------------------------------------------------------------------------------------------------
+      virtual void setCellScalar(size_t gridLocalCellIndex, double scalarValue)
+      {
+          size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
+          size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex);
+
+          CVF_TIGHT_ASSERT(m_reservoirResultValues != NULL && resultValueIndex < m_reservoirResultValues->size());
+
+          (*m_reservoirResultValues)[resultValueIndex] = scalarValue;
+      }
+
+private:
+    const RigActiveCellInfo*    m_activeCellInfo;
+    const RigGridBase*          m_grid;
+    std::vector<double>*        m_reservoirResultValues;
+};
+
+
+
+class StructGridScalarDataAccessHugeVal : public cvf::StructGridScalarDataAccess
+{
+public:
+    virtual double cellScalar(size_t cellIndex) const
+    {
+        return HUGE_VAL;
+    }
+    virtual void   setCellScalar(size_t cellIndex, double value)
+    {
+    }
+};
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+cvf::ref<cvf::StructGridScalarDataAccess> RigResultAccessObjectFactory::createNativeDataAccessObject(RigCaseData* eclipseCase,
+                                                                                                        size_t gridIndex,
+                                                                                                        RifReaderInterface::PorosityModelResultType porosityModel,
+                                                                                                        size_t timeStepIndex,
+                                                                                                        size_t scalarSetIndex)
+{
+    CVF_ASSERT(gridIndex < eclipseCase->gridCount());
+    CVF_ASSERT(eclipseCase);
+    CVF_ASSERT(eclipseCase->results(porosityModel));
+    CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel));
+
+    RigGridBase *grid = eclipseCase->grid(gridIndex);
+
+    if (!eclipseCase || !eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
+    {
+        return NULL;
+    }
+
+    std::vector< std::vector<double> >& scalarSetResults = eclipseCase->results(porosityModel)->cellScalarResults(scalarSetIndex);
+
+    // A generated result with a generated results for a subset of time steps, will end up with a result container with less entries than time steps
+    // See RiaSetGridProperty command in RiaPropertyDataCommands
+    //
+    // Some functions requires a valid data access object to be present, these might be rewritten to avoid this dummy object always returning HUGE_VAL
+    if (timeStepIndex >= scalarSetResults.size())
+    {
+         cvf::ref<cvf::StructGridScalarDataAccess> object = new StructGridScalarDataAccessHugeVal;
+
+         return object;
+    }
+
+    std::vector<double>* resultValues = NULL;
+    if (timeStepIndex < scalarSetResults.size())
+    {
+        resultValues = &(scalarSetResults[timeStepIndex]);
+    }
+
+    bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarSetIndex);
+    if (useGlobalActiveIndex)
+    {
+        cvf::ref<cvf::StructGridScalarDataAccess> object = new RigGridActiveCellsScalarDataAccess(grid, resultValues, eclipseCase->activeCellInfo(porosityModel));
+        return object;
+    }
+    else
+    {
+        cvf::ref<cvf::StructGridScalarDataAccess> object = new RigGridAllCellsScalarDataAccess(grid, resultValues);
+        return object;
+    }
+}
+

ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.h

@@ -25,11 +25,11 @@
 class RigActiveCellInfo;
 class RigGridBase;
 
-class RigGridScalarDataAccessFactory
+class RigResultAccessObjectFactory
 {
 public:
     static cvf::ref<cvf::StructGridScalarDataAccess> 
-        createPerGridDataAccessObject(RigCaseData* eclipseCase,
+        createNativeDataAccessObject(RigCaseData* eclipseCase,
                                       size_t gridIndex,
                                       RifReaderInterface::PorosityModelResultType porosityModel,
                                       size_t timeStepIndex,