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

#3958 Refactoring : RigResultAccessorFactory simplification

Browse Source 
To make the result address including basetimestep info reach the CellResultsData class.
This commit is contained in:
Jacob Støren
2019-01-30 14:49:05 +01:00
parent d61a18ee6e
commit 58ac488929
15 changed files with 195 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@@ -450,17 +450,17 @@ void RimCellEdgeColors::minMaxCellEdgeValues(double& min, double& max)
}
else
{
RigEclipseResultAddress resultIndices[6];
this->gridScalarIndices(resultIndices);
RigEclipseResultAddress resultAddresses[6];
this->gridScalarIndices(resultAddresses);
size_t idx;
for (idx = 0; idx < 6; idx++)
size_t faceIdx;
for (faceIdx = 0; faceIdx < 6; faceIdx++)
{
if (!resultIndices[idx].isValid()) continue;
if (!resultAddresses[faceIdx].isValid()) continue;
{
double cMin, cMax;
m_reservoirView->currentGridCellResults()->minMaxCellScalarValues(resultIndices[idx], cMin, cMax);
m_reservoirView->currentGridCellResults()->minMaxCellScalarValues(resultAddresses[faceIdx], cMin, cMax);
globalMin = CVF_MIN(globalMin, cMin);
globalMax = CVF_MAX(globalMax, cMax);

6
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp
View File

@@ -166,7 +166,11 @@ void RimEclipseStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>&
sourceCase->results(poroModel)->ensureKnownResultLoadedForTimeStep(RigEclipseResultAddress(resultType, resultName),
dataAccessTimeStepIndex);
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromNameAndType(sourceCase->eclipseCaseData(), gridIdx, poroModel, dataAccessTimeStepIndex, resultName, resultType);
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultAddress(sourceCase->eclipseCaseData(),
gridIdx,
poroModel,
dataAccessTimeStepIndex,
RigEclipseResultAddress( resultType, resultName));
if (resultAccessor.notNull())
{
sourceDataAccessList.push_back(resultAccessor.p());

12
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@@ -1733,12 +1733,12 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
if (eclWellLogExtractor)
{
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>(m_formationCase());
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromNameAndType(eclipseCase->eclipseCaseData(),
0,
RiaDefines::PorosityModelType::MATRIX_MODEL,
0,
RiaDefines::activeFormationNamesResultName(),
RiaDefines::FORMATION_NAMES);
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultAddress(eclipseCase->eclipseCaseData(),
0,
RiaDefines::PorosityModelType::MATRIX_MODEL,
0,
RigEclipseResultAddress(RiaDefines::FORMATION_NAMES,
RiaDefines::activeFormationNamesResultName()));
curveData = RimWellLogTrack::curveSamplingPointData(eclWellLogExtractor, resultAccessor.p());
}