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

#117 Convert to cell positions to positive depth when sending to Octave

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-04-07 13:14:22 +02:00
parent 947845e7fd
commit f22bcd1c8d
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
View File

@@ -42,7 +42,30 @@
#include <QTcpSocket> #include <QTcpSocket>
//--------------------------------------------------------------------------------------------------
/// Convert internal ResInsight representation of cells with negative depth to positive depth.
//--------------------------------------------------------------------------------------------------
static inline void convertVec3dToPositiveDepth(cvf::Vec3d* vec)
{
double& z = vec->z();
z *= -1;
}
//--------------------------------------------------------------------------------------------------
/// Retrieve a cell corner where the depth is represented as negative converted to positive depth.
//--------------------------------------------------------------------------------------------------
static inline double getCellCornerWithPositiveDepth(const cvf::Vec3d *cornerVerts, size_t cornerIndexMapping, int coordIdx)
{
if (coordIdx == 2)
{
// Z-value aka depth
return -1 * cornerVerts[cornerIndexMapping][coordIdx];
}
else
{
return cornerVerts[cornerIndexMapping][coordIdx];
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -108,6 +131,8 @@ public:
size_t gridLocalCellIndex = rigGrid->cellIndexFromIJK(i, j, k); size_t gridLocalCellIndex = rigGrid->cellIndexFromIJK(i, j, k);
cvf::Vec3d center = rigGrid->cell(gridLocalCellIndex).center(); cvf::Vec3d center = rigGrid->cell(gridLocalCellIndex).center();
convertVec3dToPositiveDepth(&center);
doubleValues[valueIndex++] = center[coordIdx]; doubleValues[valueIndex++] = center[coordIdx];
} }
} }
@@ -187,6 +212,8 @@ public:
cvf::Vec3d center = mainGrid->globalCellArray()[reservoirCellIndex].center(); cvf::Vec3d center = mainGrid->globalCellArray()[reservoirCellIndex].center();
convertVec3dToPositiveDepth(&center);
doubleValues[valueIndex++] = center[coordIdx]; doubleValues[valueIndex++] = center[coordIdx];
} }
@@ -275,7 +302,7 @@ public:
size_t gridLocalCellIndex = rigGrid->cellIndexFromIJK(i, j, k); size_t gridLocalCellIndex = rigGrid->cellIndexFromIJK(i, j, k);
rigGrid->cellCornerVertices(gridLocalCellIndex, cornerVerts); rigGrid->cellCornerVertices(gridLocalCellIndex, cornerVerts);
doubleValues[valueIndex++] = cornerVerts[cornerIndexMapping][coordIdx]; doubleValues[valueIndex++] = getCellCornerWithPositiveDepth(cornerVerts, cornerIndexMapping, coordIdx);
} }
} }
} }
@@ -361,7 +388,7 @@ public:
mainGrid->cellCornerVertices(reservoirCellIndex, cornerVerts); mainGrid->cellCornerVertices(reservoirCellIndex, cornerVerts);
doubleValues[valueIndex++] = cornerVerts[cornerIndexMapping][coordIdx]; doubleValues[valueIndex++] = getCellCornerWithPositiveDepth(cornerVerts, cornerIndexMapping, coordIdx);
} }
CVF_ASSERT(valueIndex == activeCellCount); CVF_ASSERT(valueIndex == activeCellCount);