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

Use hasWellResult instead of firstResultTimeStep

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-02 12:52:32 +01:00
parent 8ee7229f60
commit 9493a1dfc0
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
View File

@ -205,7 +205,7 @@ void RivSimWellPipesPartMgr::updatePipeResultColor(size_t frameIndex)
RigSingleWellResultsData* wRes = m_rimWell->wellResults();
if (wRes == NULL) return;
if (frameIndex < wRes->firstResultTimeStep()) return; // Or reset colors or something
if (!wRes->hasWellResult(frameIndex)) return; // Or reset colors or something
const double closed = -0.1, producing = 1.5, water = 2.5, hcInjection = 3.5; // Closed set to -0.1 instead of 0.5 to workaround bug in the scalar mapper.

14
ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
View File

@ -95,20 +95,6 @@ bool RigSingleWellResultsData::hasWellResult(size_t resultTimeStepIndex) const
return wellTimeStepIndex != cvf::UNDEFINED_SIZE_T;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RigSingleWellResultsData::firstResultTimeStep() const
{
size_t i = 0;
for(i = 0; i < m_resultTimeStepIndexToWellTimeStepIndex.size(); ++i)
{
if (m_resultTimeStepIndexToWellTimeStepIndex[i] != cvf::UNDEFINED_SIZE_T) return i;
}
return cvf::UNDEFINED_SIZE_T;
}
bool operator== (const RigWellResultPoint& p1, const RigWellResultPoint& p2)
{
return

1
ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.h
View File

@ -135,7 +135,6 @@ public:
bool isMultiSegmentWell() const;
bool hasWellResult(size_t resultTimeStepIndex) const;
size_t firstResultTimeStep() const;
const RigWellResultFrame& wellResultFrame(size_t resultTimeStepIndex) const;

2
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@ -729,7 +729,7 @@ QString RiuResultTextBuilder::wellResultText()
{
RigSingleWellResultsData* singleWellResultData = wellResults.at(i);
if (m_timeStepIndex < singleWellResultData->firstResultTimeStep())
if (!singleWellResultData->hasWellResult(m_timeStepIndex))
{
continue;
}