OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added RigResultModifier and use this object for result modifications

Browse Source
This commit is contained in:
Magne Sjaastad
2014-08-08 08:37:56 +02:00
parent 7a3d90daa4
commit d9e9a173e4
8 changed files with 174 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
View File

@@ -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);

1
ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.h
View File

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