#1322 Use RimEclipseResultDefinition instead of RimEclipseCellColors

This commit is contained in:
Magne Sjaastad 2017-03-17 10:03:58 +01:00
parent 2fb35af7a6
commit 17e6b6d826
2 changed files with 4 additions and 4 deletions

View File

@ -31,13 +31,13 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<double> RigTimeHistoryResultAccessor::timeHistoryValues(RigEclipseCaseData* eclipseCaseData, RimEclipseCellColors* cellColors, size_t gridIndex, size_t cellIndex, size_t timeStepCount) std::vector<double> RigTimeHistoryResultAccessor::timeHistoryValues(RigEclipseCaseData* eclipseCaseData, RimEclipseResultDefinition* resultDefinition, size_t gridIndex, size_t cellIndex, size_t timeStepCount)
{ {
std::vector<double> values; std::vector<double> values;
for (size_t i = 0; i < timeStepCount; i++) for (size_t i = 0; i < timeStepCount; i++)
{ {
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultDefinition(eclipseCaseData, gridIndex, i, cellColors); cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createFromResultDefinition(eclipseCaseData, gridIndex, i, resultDefinition);
values.push_back(resultAccessor->cellScalar(cellIndex)); values.push_back(resultAccessor->cellScalar(cellIndex));
} }

View File

@ -24,13 +24,13 @@
class RigEclipseCaseData; class RigEclipseCaseData;
class RimEclipseCellColors; class RimEclipseResultDefinition;
class RigTimeHistoryResultAccessor class RigTimeHistoryResultAccessor
{ {
public: public:
static QString topologyText(RigEclipseCaseData* eclipseCaseData, size_t m_gridIndex, size_t m_cellIndex); static QString topologyText(RigEclipseCaseData* eclipseCaseData, size_t m_gridIndex, size_t m_cellIndex);
static std::vector<double> timeHistoryValues(RigEclipseCaseData* eclipseCaseData, RimEclipseCellColors* cellColors, size_t gridIndex, size_t cellIndex, size_t timeStepCount); static std::vector<double> timeHistoryValues(RigEclipseCaseData* eclipseCaseData, RimEclipseResultDefinition* resultDefinition, size_t gridIndex, size_t cellIndex, size_t timeStepCount);
}; };