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: Remove more direct use of scalarResultIndex related to CellEdge

Browse Source
This commit is contained in:
Jacob Støren 2019-01-23 16:42:03 +01:00
parent d8eded7d49
commit 98f2b50180
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@ -371,7 +371,7 @@ void RimCellEdgeColors::cellEdgeMetaData(std::vector<RimCellEdgeMetaData>* metaD
for (size_t i = 0; i < 6; i++) for (size_t i = 0; i < 6; i++)
{ {
RimCellEdgeMetaData metaData; RimCellEdgeMetaData metaData;
metaData.m_resultIndex = resultIndices[i]; metaData.m_eclipseResultAddress = resultIndices[i];
metaData.m_resultVariable = resultNames[i]; metaData.m_resultVariable = resultNames[i];
metaData.m_isStatic = isStatic; metaData.m_isStatic = isStatic;

2
ApplicationCode/ProjectDataModel/RimCellEdgeColors.h
View File

@ -38,7 +38,7 @@ class RimRegularLegendConfig;
class RimCellEdgeMetaData class RimCellEdgeMetaData
{ {
public: public:
RigEclipseResultAddress m_resultIndex; RigEclipseResultAddress m_eclipseResultAddress;
QString m_resultVariable; QString m_resultVariable;
bool m_isStatic; bool m_isStatic;
}; };

2
ApplicationCode/ReservoirDataModel/RigEclipseResultAddress.h
View File

@ -62,7 +62,7 @@ public:
return (m_resultName < other.m_resultName); return (m_resultName < other.m_resultName);
} }
size_t scalarResultIndex; size_t scalarResultIndex; // Temporary. Must be removed
RiaDefines::ResultCatType m_resultCatType; RiaDefines::ResultCatType m_resultCatType;
QString m_resultName; QString m_resultName;

16
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@ -612,14 +612,14 @@ QString RiuResultTextBuilder::cellEdgeResultDetails()
std::vector<RimCellEdgeMetaData> metaData; std::vector<RimCellEdgeMetaData> metaData;
m_reservoirView->cellEdgeResult()->cellEdgeMetaData(&metaData); m_reservoirView->cellEdgeResult()->cellEdgeMetaData(&metaData);
std::set<size_t> uniqueResultIndices; std::set<RigEclipseResultAddress> uniqueResultIndices;
for (int idx = 0; idx < 6; idx++) for (int idx = 0; idx < 6; idx++)
{ {
size_t resultIndex = metaData[idx].m_resultIndex.scalarResultIndex; RigEclipseResultAddress resultAddr = metaData[idx].m_eclipseResultAddress;
if (resultIndex == cvf::UNDEFINED_SIZE_T) continue; if ( !resultAddr.isValid()) continue;
if (uniqueResultIndices.find(resultIndex) != uniqueResultIndices.end()) continue; if (uniqueResultIndices.find(resultAddr) != uniqueResultIndices.end()) continue;
size_t adjustedTimeStep = m_timeStepIndex; size_t adjustedTimeStep = m_timeStepIndex;
if (metaData[idx].m_isStatic) if (metaData[idx].m_isStatic)
@ -628,13 +628,17 @@ QString RiuResultTextBuilder::cellEdgeResultDetails()
} }
RiaDefines::PorosityModelType porosityModel = m_reservoirView->cellResult()->porosityModel(); RiaDefines::PorosityModelType porosityModel = m_reservoirView->cellResult()->porosityModel();
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultIdx(m_reservoirView->eclipseCase()->eclipseCaseData(), m_gridIndex, porosityModel, adjustedTimeStep, RigEclipseResultAddress(resultIndex)); cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultIdx(m_reservoirView->eclipseCase()->eclipseCaseData(),
m_gridIndex,
porosityModel,
adjustedTimeStep,
resultAddr);
if (resultAccessor.notNull()) if (resultAccessor.notNull())
{ {
double scalarValue = resultAccessor->cellScalar(m_cellIndex); double scalarValue = resultAccessor->cellScalar(m_cellIndex);
text.append(QString("%1 : %2\n").arg(metaData[idx].m_resultVariable).arg(scalarValue)); text.append(QString("%1 : %2\n").arg(metaData[idx].m_resultVariable).arg(scalarValue));
uniqueResultIndices.insert(resultIndex); uniqueResultIndices.insert(resultAddr);
} }
} }
} }