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

Reorganise ijk calculation based on suggestion from bska

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-05-15 14:44:41 +02:00
parent 91eb956092
commit e966184d99
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ReservoirDataModel/RigGridBase.cpp
View File

@@ -26,6 +26,8 @@
#include "cvfAssert.h"
#include <cstdlib>
RigGridBase::RigGridBase( RigMainGrid* mainGrid )
: m_gridPointDimensions( 0, 0, 0 )
, m_indexToStartOfCells( 0 )
@@ -202,16 +204,18 @@ bool RigGridBase::ijkFromCellIndex( size_t cellIndex, size_t* i, size_t* j, size
size_t index = cellIndex;
if ( cellCountI() <= 0 || cellCountJ() <= 0 )
if ( m_gridPointDimensions[0] <= 1u || m_gridPointDimensions[1] <= 1u )
{
return false;
}
*k = index / ( cellCountI() * cellCountJ() );
index -= ( *k ) * ( cellCountI() * cellCountJ() );
*j = index / cellCountI();
index -= ( *j ) * cellCountI();
*i = index;
const size_t cellCountI = m_gridPointDimensions[0] - 1u;
const size_t cellCountJ = m_gridPointDimensions[1] - 1u;
*i = index % cellCountI;
index /= cellCountI;
*j = index % cellCountJ;
*k = index / cellCountJ;
return true;
}
@@ -224,14 +228,13 @@ void RigGridBase::ijkFromCellIndexUnguarded( size_t cellIndex, size_t* i, size_t
{
size_t index = cellIndex;
size_t cellCountI = m_gridPointDimensions[0] - 1;
size_t cellCountJ = m_gridPointDimensions[1] - 1;
const size_t cellCountI = m_gridPointDimensions[0] - 1u;
const size_t cellCountJ = m_gridPointDimensions[1] - 1u;
*k = index / ( cellCountI * cellCountJ );
index -= ( *k ) * ( cellCountI * cellCountJ );
*j = index / cellCountI;
index -= ( *j ) * cellCountI;
*i = index;
*i = index % cellCountI;
index /= cellCountI;
*j = index % cellCountJ;
*k = index / cellCountJ;
}
//--------------------------------------------------------------------------------------------------