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

#1094 Improved constness and use of range based for

Browse Source
This commit is contained in:
Magne Sjaastad
2017-01-27 15:19:18 +01:00
parent 1e20a61d4c
commit 23eeacde37
4 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
View File

@@ -140,7 +140,7 @@ void RimEclipseWell::calculateWellPipeDynamicCenterLine(size_t timeStepIdx,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseWell::visibleCellsInstersectsWell(size_t frameIndex)
bool RimEclipseWell::intersectsVisibleCells(size_t frameIndex) const
{
if (this->wellResults() == nullptr) return false;
@@ -152,10 +152,10 @@ bool RimEclipseWell::visibleCellsInstersectsWell(size_t frameIndex)
const std::vector<RivCellSetEnum>& visGridParts = m_reservoirView->visibleGridParts();
cvf::cref<RivReservoirViewPartMgr> rvMan = m_reservoirView->reservoirGridPartManager();
for (size_t gpIdx = 0; gpIdx < visGridParts.size(); ++gpIdx)
{
const RigWellResultFrame& wrsf = this->wellResults()->wellResultFrame(frameIndex);
const RigWellResultFrame& wrsf = this->wellResults()->wellResultFrame(frameIndex);
for (const RivCellSetEnum& visGridPart : visGridParts)
{
// First check the wellhead:
size_t gridIndex = wrsf.m_wellHead.m_gridIndex;
@@ -163,7 +163,7 @@ bool RimEclipseWell::visibleCellsInstersectsWell(size_t frameIndex)
if (gridIndex != cvf::UNDEFINED_SIZE_T && gridCellIndex != cvf::UNDEFINED_SIZE_T)
{
cvf::cref<cvf::UByteArray> cellVisibility = rvMan->cellVisibility(visGridParts[gpIdx], gridIndex, frameIndex);
cvf::cref<cvf::UByteArray> cellVisibility = rvMan->cellVisibility(visGridPart, gridIndex, frameIndex);
if ((*cellVisibility)[gridCellIndex])
{
return true;
@@ -173,17 +173,17 @@ bool RimEclipseWell::visibleCellsInstersectsWell(size_t frameIndex)
// Then check the rest of the well, with all the branches
const std::vector<RigWellResultBranch>& wellResSegments = wrsf.m_wellResultBranches;
for (size_t wsIdx = 0; wsIdx < wellResSegments.size(); ++wsIdx)
for (const RigWellResultBranch& branchSegment : wellResSegments)
{
const std::vector<RigWellResultPoint>& wsResCells = wellResSegments[wsIdx].m_branchResultPoints;
for (size_t cIdx = 0; cIdx < wsResCells.size(); ++cIdx)
const std::vector<RigWellResultPoint>& wsResCells = branchSegment.m_branchResultPoints;
for (const RigWellResultPoint& wellResultPoint : wsResCells)
{
if (wsResCells[cIdx].isCell())
if (wellResultPoint.isCell())
{
gridIndex = wsResCells[cIdx].m_gridIndex;
gridCellIndex = wsResCells[cIdx].m_gridCellIndex;
gridIndex = wellResultPoint.m_gridIndex;
gridCellIndex = wellResultPoint.m_gridCellIndex;
cvf::cref<cvf::UByteArray> cellVisibility = rvMan->cellVisibility(visGridParts[gpIdx], gridIndex, frameIndex);
cvf::cref<cvf::UByteArray> cellVisibility = rvMan->cellVisibility(visGridPart, gridIndex, frameIndex);
if ((*cellVisibility)[gridCellIndex])
{
return true;
@@ -234,9 +234,9 @@ void RimEclipseWell::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseWell::isWellPipeVisible(size_t frameIndex)
bool RimEclipseWell::isWellPipeVisible(size_t frameIndex) const
{
RimEclipseView* reservoirView = nullptr;
const RimEclipseView* reservoirView = nullptr;
this->firstAncestorOrThisOfType(reservoirView);
if (reservoirView == nullptr) return false;
@@ -270,7 +270,7 @@ bool RimEclipseWell::isWellPipeVisible(size_t frameIndex)
if (reservoirView->wellCollection()->showWellsIntersectingVisibleCells())
{
return visibleCellsInstersectsWell(frameIndex);
return intersectsVisibleCells(frameIndex);
}
else
{
@@ -281,9 +281,9 @@ bool RimEclipseWell::isWellPipeVisible(size_t frameIndex)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex)
bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex) const
{
RimEclipseView* m_reservoirView = nullptr;
const RimEclipseView* m_reservoirView = nullptr;
this->firstAncestorOrThisOfType(m_reservoirView);
if (m_reservoirView == nullptr) return false;
@@ -317,7 +317,7 @@ bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex)
if (m_reservoirView->wellCollection()->showWellsIntersectingVisibleCells())
{
return visibleCellsInstersectsWell(frameIndex);
return intersectsVisibleCells(frameIndex);
}
else
{
@@ -332,9 +332,9 @@ bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseWell::isUsingCellCenterForPipe()
bool RimEclipseWell::isUsingCellCenterForPipe() const
{
RimEclipseWellCollection* wellColl = nullptr;
const RimEclipseWellCollection* wellColl = nullptr;
this->firstAncestorOrThisOfType(wellColl);
return (wellColl && wellColl->wellPipeCoordType() == RimEclipseWellCollection::WELLPIPE_CELLCENTER);
@@ -360,7 +360,15 @@ RigSingleWellResultsData* RimEclipseWell::wellResults()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimEclipseWell::resultWellIndex()
const RigSingleWellResultsData* RimEclipseWell::wellResults() const
{
return m_wellResults.p();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimEclipseWell::resultWellIndex() const
{
return m_resultWellIndex;
}

21
ApplicationCode/ProjectDataModel/RimEclipseWell.h
View File

@@ -46,16 +46,16 @@ public:
void setWellResults(RigSingleWellResultsData* wellResults, size_t resultWellIndex);
RigSingleWellResultsData* wellResults();
size_t resultWellIndex();
const RigSingleWellResultsData* wellResults() const;
size_t resultWellIndex() const;
bool isWellPipeVisible(size_t frameIndex);
bool isWellSpheresVisible(size_t frameIndex);
bool isUsingCellCenterForPipe();
bool isWellPipeVisible(size_t frameIndex) const;
bool isWellSpheresVisible(size_t frameIndex) const;
bool isUsingCellCenterForPipe() const;
bool visibleCellsInstersectsWell(size_t frameIndex);
virtual caf::PdmFieldHandle* userDescriptionField();
virtual caf::PdmFieldHandle* objectToggleField();
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual caf::PdmFieldHandle* objectToggleField() override;
void calculateWellPipeStaticCenterLine( std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords,
std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds);
@@ -81,8 +81,11 @@ public:
caf::PdmField<bool> showWellCellFence;
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
bool intersectsVisibleCells(size_t frameIndex) const;
private:
cvf::ref<RigSingleWellResultsData> m_wellResults;

2
ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

@@ -191,7 +191,7 @@ void RimIntersectionCollection::fieldChangedByUi(const caf::PdmFieldHandle* chan
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell(RimEclipseWell* eclipseWell) const
bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell(const RimEclipseWell* eclipseWell) const
{
if (!isActive) return false;

2
ApplicationCode/ProjectDataModel/RimIntersectionCollection.h
View File

@@ -51,7 +51,7 @@ public:
void appendIntersection(RimIntersection* intersection);
void appendIntersectionBox(RimIntersectionBox* intersectionBox);
bool hasActiveIntersectionForSimulationWell(RimEclipseWell* eclipseWell) const;
bool hasActiveIntersectionForSimulationWell(const RimEclipseWell* eclipseWell) const;
void updateIntersectionBoxGeometry();