Added RigResultModifier and use this object for result modifications

ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp

@@ -20,7 +20,10 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigResultModifier.h"
+#include "RigResultModifierFactory.h"
 #include "RigStatisticsMath.h"
+
 #include "RimReservoirCellResultsStorage.h"
 
 #include "cafProgressInfo.h"
@@ -204,7 +207,7 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>& result
                 // Build data access objects for destination scalar results
                 // Find the created result container, if any, and put its resultAccessor into the enum indexed destination collection
 
-                cvf::Collection<cvf::StructGridScalarDataAccess> destinationDataAccessList;
+                cvf::Collection<RigResultModifier> destinationDataAccessList;
                 std::vector<QString> statisticalResultNames(STAT_PARAM_COUNT);
 
                 statisticalResultNames[MIN] = createResultNameMin(resultName);
@@ -219,14 +222,9 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>& result
                 for (size_t stIdx = 0; stIdx < statisticalResultNames.size(); ++stIdx)
                 {
                     size_t scalarResultIndex = destCellResultsData->findScalarResultIndex(resultType, statisticalResultNames[stIdx]);
-                    if (scalarResultIndex != cvf::UNDEFINED_SIZE_T)
-                    {
-                        destinationDataAccessList.push_back(m_destinationCase->resultAccessor(grid, poroModel, dataAccessTimeStepIndex, scalarResultIndex).p());
-                    }
-                    else
-                    {
-                        destinationDataAccessList.push_back(NULL);
-                    }
+
+                    cvf::ref<RigResultModifier> resultModifier = RigResultModifierFactory::createResultModifier(m_destinationCase, grid->gridIndex(), poroModel, dataAccessTimeStepIndex, scalarResultIndex);
+                    destinationDataAccessList.push_back(resultModifier.p());
                 }
 
                  std::vector<double> statParams(STAT_PARAM_COUNT, HUGE_VAL);

ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.h

@@ -24,7 +24,6 @@
 #include <vector>
 #include <math.h>
 
-#include <QPair>
 
 class RimCase;
 class RigCaseData;

ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake

@@ -17,6 +17,7 @@ ${CEE_CURRENT_LIST_DIR}RigActiveCellsResultAccessor.h
 ${CEE_CURRENT_LIST_DIR}RigCellEdgeResultAccessor.h
 ${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessor.h
 ${CEE_CURRENT_LIST_DIR}RigResultModifier.h
+${CEE_CURRENT_LIST_DIR}RigResultModifierFactory.h
 ${CEE_CURRENT_LIST_DIR}RigLocalGrid.h
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.h
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h
@@ -42,6 +43,7 @@ ${CEE_CURRENT_LIST_DIR}RigAllGridCellsResultAccessor.cpp
 ${CEE_CURRENT_LIST_DIR}RigActiveCellsResultAccessor.cpp
 ${CEE_CURRENT_LIST_DIR}RigCellEdgeResultAccessor.cpp
 ${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessor.cpp
+${CEE_CURRENT_LIST_DIR}RigResultModifierFactory.cpp
 ${CEE_CURRENT_LIST_DIR}RigLocalGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp

ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp

@@ -37,7 +37,7 @@
 
 
 //--------------------------------------------------------------------------------------------------
-/// 
+/// This function must be harmonized with RigResultModifierFactory::createResultModifier()
 //--------------------------------------------------------------------------------------------------
 cvf::ref<RigResultAccessor> RigResultAccessorFactory::createNativeResultAccessor(RigCaseData* eclipseCase,
     size_t gridIndex,

ApplicationCode/ReservoirDataModel/RigResultModifier.h

@@ -18,6 +18,9 @@
 
 #pragma once
 
+#include "RigGridBase.h"
+#include "RigActiveCellInfo.h"
+
 
 //==================================================================================================
 /// 

ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp

@@ -0,0 +1,102 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) Statoil ASA, Ceetron Solutions 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 "RigResultModifierFactory.h"
+
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RigResultModifier.h"
+
+#include <math.h>
+
+
+//--------------------------------------------------------------------------------------------------
+/// This function must be harmonized with RigResultAccessorFactory::createNativeResultAccessor()
+//--------------------------------------------------------------------------------------------------
+cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier(RigCaseData* eclipseCase,
+    size_t gridIndex,
+    RifReaderInterface::PorosityModelResultType porosityModel,
+    size_t timeStepIndex,
+    QString& uiResultName)
+{
+    CVF_ASSERT(gridIndex < eclipseCase->gridCount());
+    CVF_ASSERT(eclipseCase);
+    CVF_ASSERT(eclipseCase->results(porosityModel));
+    CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel));
+
+    if (!eclipseCase || !eclipseCase->results(porosityModel) || !eclipseCase->activeCellInfo(porosityModel))
+    {
+        return NULL;
+    }
+
+    size_t scalarSetIndex = eclipseCase->results(porosityModel)->findScalarResultIndex(uiResultName);
+
+    return createResultModifier(eclipseCase, gridIndex, porosityModel, timeStepIndex, scalarSetIndex);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier(RigCaseData* eclipseCase,
+    size_t gridIndex,
+    RifReaderInterface::PorosityModelResultType porosityModel,
+    size_t timeStepIndex, size_t scalarResultIndex)
+{
+    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;
+    }
+
+    if (scalarResultIndex == cvf::UNDEFINED_SIZE_T)
+    {
+        return NULL;
+    }
+
+    std::vector< std::vector<double> >& scalarSetResults = eclipseCase->results(porosityModel)->cellScalarResults(scalarResultIndex);
+
+    if (timeStepIndex >= scalarSetResults.size())
+    {
+        return NULL;
+    }
+
+    std::vector<double>* resultValues = NULL;
+    if (timeStepIndex < scalarSetResults.size())
+    {
+        resultValues = &(scalarSetResults[timeStepIndex]);
+    }
+
+    bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarResultIndex);
+    if (useGlobalActiveIndex)
+    {
+        cvf::ref<RigResultModifier> object = new RigActiveCellsResultModifier(grid, resultValues, eclipseCase->activeCellInfo(porosityModel));
+        return object;
+    }
+    else
+    {
+        cvf::ref<RigResultModifier> object = new RigAllGridCellsResultModifier(grid, resultValues);
+        return object;
+    }
+}

ApplicationCode/ReservoirDataModel/RigResultModifierFactory.h

@@ -0,0 +1,44 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) Statoil ASA, Ceetron Solutions 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.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "RifReaderInterface.h"
+
+class RigCaseData;
+class RigResultModifier;
+
+class RigResultModifierFactory
+{
+public:
+    static cvf::ref<RigResultModifier> 
+        createResultModifier(RigCaseData* eclipseCase,
+        size_t gridIndex,
+        RifReaderInterface::PorosityModelResultType porosityModel,
+        size_t timeStepIndex,
+        QString& uiResultName);
+
+    static cvf::ref<RigResultModifier> 
+        createResultModifier(RigCaseData* eclipseCase,
+        size_t gridIndex,
+        RifReaderInterface::PorosityModelResultType porosityModel,
+        size_t timeStepIndex,
+        size_t scalarResultIndex);
+};
+
+

ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp

@@ -16,34 +16,31 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaStdInclude.h"
+
 #include "RiaSocketCommand.h"
+#include "RiaSocketDataTransfer.h"
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"
 
-#include "RiuMainWindow.h"
-#include "RiuProcessMonitor.h"
+#include "RifReaderInterface.h"
 
-#include "RigCaseData.h"
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RigResultModifier.h"
+#include "RigResultModifierFactory.h"
 
-#include "RimReservoirCellResultsStorage.h"
 #include "RimCase.h"
 #include "RimInputCase.h"
+#include "RimInputProperty.h"
 #include "RimInputPropertyCollection.h"
-#include "RimUiTreeModelPdm.h"
+#include "RimReservoirCellResultsStorage.h"
 #include "RimReservoirView.h"
 #include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
+#include "RimUiTreeModelPdm.h"
 
-#include <QTcpSocket>
-#include "RiaApplication.h"
-#include "RiaPreferences.h"
-#include "RiaSocketDataTransfer.h"
-#include "RimInputProperty.h"
+#include "RiuMainWindow.h"
+#include "RiuProcessMonitor.h"
 
 
 //--------------------------------------------------------------------------------------------------
@@ -934,14 +931,12 @@ public:
                 return true;
             }
 
-            cvf::ref<cvf::StructGridScalarDataAccess> cellCenterDataAccessObject = 
-                m_currentReservoir->reservoirData()->resultAccessor(grid, m_porosityModelEnum, m_requestedTimesteps[m_currentTimeStepNumberToRead], m_currentScalarIndex);
-
-            if (!cellCenterDataAccessObject.isNull())
+            cvf::ref<RigResultModifier> resultModifier = RigResultModifierFactory::createResultModifier(m_currentReservoir->reservoirData(), grid->gridIndex(), m_porosityModelEnum, m_requestedTimesteps[m_currentTimeStepNumberToRead], m_currentScalarIndex);
+            if (!resultModifier.isNull())
             {
                 for (size_t cellIdx = 0; static_cast<size_t>(cellIdx) < cellCountFromOctave; cellIdx++)
                 {
-                    cellCenterDataAccessObject->setCellScalar(cellIdx, doubleValues[cellIdx]);
+                    resultModifier->setCellScalar(cellIdx, doubleValues[cellIdx]);
                 }
             }