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

Return pair of vectors and rename

Browse Source
This commit is contained in:
Magne Sjaastad
2024-01-20 13:47:12 +01:00
parent 210f03752f
commit 80fdd1da74
9 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationLibCode/ReservoirDataModel/RigActiveCellInfo.cpp
View File

@@ -139,7 +139,7 @@ size_t RigActiveCellInfo::reservoirActiveCellCount() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigActiveCellInfo::setIJKBoundingBox( const cvf::Vec3st& min, const cvf::Vec3st& max )
void RigActiveCellInfo::setIjkBoundingBox( const cvf::Vec3st& min, const cvf::Vec3st& max )
{
m_activeCellPositionMin = min;
m_activeCellPositionMax = max;
@@ -148,10 +148,9 @@ void RigActiveCellInfo::setIJKBoundingBox( const cvf::Vec3st& min, const cvf::Ve
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigActiveCellInfo::IJKBoundingBox( cvf::Vec3st& min, cvf::Vec3st& max ) const
std::pair<cvf::Vec3st, cvf::Vec3st> RigActiveCellInfo::ijkBoundingBox() const
{
min = m_activeCellPositionMin;
max = m_activeCellPositionMax;
return std::make_pair( m_activeCellPositionMin, m_activeCellPositionMax );
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ReservoirDataModel/RigActiveCellInfo.h
View File

@@ -45,8 +45,8 @@ public:
size_t gridActiveCellCounts( size_t gridIndex ) const;
void computeDerivedData();
void setIJKBoundingBox( const cvf::Vec3st& min, const cvf::Vec3st& max );
void IJKBoundingBox( cvf::Vec3st& min, cvf::Vec3st& max ) const;
void setIjkBoundingBox( const cvf::Vec3st& min, const cvf::Vec3st& max );
std::pair<cvf::Vec3st, cvf::Vec3st> ijkBoundingBox() const;
cvf::BoundingBox geometryBoundingBox() const;
void setGeometryBoundingBox( cvf::BoundingBox bb );

4
ApplicationLibCode/ReservoirDataModel/RigEclipseCaseData.cpp
View File

@@ -445,8 +445,8 @@ void RigEclipseCaseData::computeActiveCellIJKBBox()
fractureModelActiveBB.add( i, j, k );
}
}
m_activeCellInfo->setIJKBoundingBox( matrixModelActiveBB.m_min, matrixModelActiveBB.m_max );
m_fractureActiveCellInfo->setIJKBoundingBox( fractureModelActiveBB.m_min, fractureModelActiveBB.m_max );
m_activeCellInfo->setIjkBoundingBox( matrixModelActiveBB.m_min, matrixModelActiveBB.m_max );
m_fractureActiveCellInfo->setIjkBoundingBox( fractureModelActiveBB.m_min, fractureModelActiveBB.m_max );
}
}