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

#2195 First step in making higher LGR level connections not beeing hidden

Browse Source
This commit is contained in:
Jacob Støren
2017-12-04 11:42:10 +01:00
parent a460124055
commit fcd9d0f3e6
3 changed files with 120 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -47,6 +47,22 @@ RigMainGrid::~RigMainGrid(void)
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RigCell& RigMainGrid::cellByGridAndGridLocalCellIdx(size_t gridIdx, size_t gridLocalCellIdx) const
{
return gridByIndex(gridIdx)->cell(gridLocalCellIdx);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RigMainGrid::reservoirCellIndexByGridAndGridLocalCellIndex(size_t gridIdx, size_t gridLocalCellIdx) const
{
return gridByIndex(gridIdx)->reservoirCellIndex(gridLocalCellIdx);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -72,11 +88,14 @@ void RigMainGrid::addLocalGrid(RigLocalGrid* localGrid)
//--------------------------------------------------------------------------------------------------
void RigMainGrid::initAllSubGridsParentGridPointer()
{
initSubGridParentPointer();
size_t i;
for (i = 0; i < m_localGrids.size(); ++i)
if ( m_localGrids.size() && m_localGrids[0]->parentGrid() == nullptr )
{
m_localGrids[i]->initSubGridParentPointer();
initSubGridParentPointer();
size_t i;
for ( i = 0; i < m_localGrids.size(); ++i )
{
m_localGrids[i]->initSubGridParentPointer();
}
}
}

5
ApplicationCode/ReservoirDataModel/RigMainGrid.h
View File

@@ -51,6 +51,9 @@ public:
std::vector<RigCell>& globalCellArray() {return m_cells;}
const std::vector<RigCell>& globalCellArray() const {return m_cells;}
const RigCell& cellByGridAndGridLocalCellIdx(size_t gridIdx, size_t gridLocalCellIdx) const;
size_t reservoirCellIndexByGridAndGridLocalCellIndex(size_t gridIdx, size_t gridLocalCellIdx) const;
void addLocalGrid(RigLocalGrid* localGrid);
size_t gridCount() const { return m_localGrids.size() + 1; }
RigGridBase* gridByIndex(size_t localGridIndex);
@@ -68,6 +71,7 @@ public:
bool isFaceNormalsOutwards() const;
void computeCachedData();
void initAllSubGridsParentGridPointer();
// Overrides
virtual cvf::Vec3d displayModelOffset() const;
@@ -78,7 +82,6 @@ public:
cvf::BoundingBox boundingBox() const;
private:
void initAllSubGridsParentGridPointer();
void initAllSubCellsMainGridCellIndex();
void buildCellSearchTree();
bool hasFaultWithName(const QString& name) const;