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

Removed more functions from MainGrid

Browse Source 
p4#: 20468
This commit is contained in:
Magne Sjaastad
2013-02-12 14:00:39 +01:00
parent 6c7dc10791
commit d45aded7f7
6 changed files with 34 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@@ -24,11 +24,7 @@
#include "cvfAssert.h"
RigMainGrid::RigMainGrid(void)
: RigGridBase(this),
m_activeCellPositionMin(cvf::Vec3st::UNDEFINED),
m_activeCellPositionMax(cvf::Vec3st::UNDEFINED),
m_validCellPositionMin(cvf::Vec3st::UNDEFINED),
m_validCellPositionMax(cvf::Vec3st::UNDEFINED)
: RigGridBase(this)
{
m_matrixModelResults = new RigReservoirCellResults(this);
m_fractureModelResults = new RigReservoirCellResults(this);
@@ -79,15 +75,6 @@ void RigMainGrid::initAllSubCellsMainGridCellIndex()
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::matrixModelActiveCellsBoundingBox(cvf::Vec3st& min, cvf::Vec3st& max) const
{
min = m_activeCellPositionMin;
max = m_activeCellPositionMax;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -96,15 +83,6 @@ cvf::BoundingBox RigMainGrid::matrixModelActiveCellsBoundingBox() const
return m_activeCellsBoundingBox;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::validCellsBoundingBox(cvf::Vec3st& min, cvf::Vec3st& max) const
{
min = m_validCellPositionMin;
max = m_validCellPositionMax;
}
//--------------------------------------------------------------------------------------------------
@@ -137,41 +115,6 @@ public:
};
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigMainGrid::computeActiveAndValidCellRanges()
{
CellRangeBB validBB;
CellRangeBB activeBB;
size_t idx;
for (idx = 0; idx < cellCount(); idx++)
{
const RigCell& c = cell(idx);
size_t i, j, k;
ijkFromCellIndex(idx, &i, &j, &k);
if (!c.isInvalid())
{
validBB.add(i, j, k);
}
if (c.isActiveInMatrixModel())
{
activeBB.add(i, j, k);
}
}
m_validCellPositionMin = validBB.m_min;
m_validCellPositionMax = validBB.m_max;
m_activeCellPositionMin = activeBB.m_min;
m_activeCellPositionMax = activeBB.m_max;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -221,7 +164,6 @@ void RigMainGrid::computeCachedData()
{
initAllSubGridsParentGridPointer();
initAllSubCellsMainGridCellIndex();
computeActiveAndValidCellRanges();
computeBoundingBox();
}