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

#1462 Fix detection of starting cell of lateral

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-05-29 14:19:18 +02:00
parent 3dbc09b28d
commit e30242bf0b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ReservoirDataModel/RigWellLogExtractionTools.h
View File

@ -91,10 +91,12 @@ struct RigHexIntersector
return intersectionCount;
}
static bool isPointInCell(const cvf::Vec3d point, const cvf::Vec3d hexCorners[8], const size_t hexIndex)
static bool isPointInCell(const cvf::Vec3d point, const cvf::Vec3d hexCorners[8])
{
cvf::Ray ray;
ray.setOrigin(point);
size_t intersections = 0;
for (int face = 0; face < 6; ++face)
{
cvf::ubyte faceVertexIndices[4];
@ -106,11 +108,11 @@ struct RigHexIntersector
int next = i < 3 ? i + 1 : 0;
if (ray.triangleIntersect(hexCorners[faceVertexIndices[i]], hexCorners[faceVertexIndices[next]], faceCenter))
{
return true;
++intersections;
}
}
}
return false;
return intersections % 2 == 1;
}
static bool isEqualDepth(double d1, double d2)

6
ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp
View File

@ -115,7 +115,7 @@ std::vector<HexIntersectionInfo> RigWellPathIntersectionTools::getIntersectedCel
}
//--------------------------------------------------------------------------------------------------
/// Calculates direction vectors for each axis in the cell.
/// Calculates main axis vectors for each axis in the cell.
//--------------------------------------------------------------------------------------------------
void RigWellPathIntersectionTools::calculateCellMainAxisVectors(const std::array<cvf::Vec3d, 8>& hexCorners, cvf::Vec3d* iAxisDirection, cvf::Vec3d* jAxisDirection, cvf::Vec3d* kAxisDirection)
{
@ -125,7 +125,7 @@ void RigWellPathIntersectionTools::calculateCellMainAxisVectors(const std::array
}
//--------------------------------------------------------------------------------------------------
///
/// Calculate the main axis vector for one axis in the cell, fron `negativeFace` to `positiveFace`
//--------------------------------------------------------------------------------------------------
cvf::Vec3d RigWellPathIntersectionTools::calculateCellMainAxisVector(const std::array<cvf::Vec3d, 8>& hexCorners,
cvf::StructGridInterface::FaceType negativeFace,
@ -244,7 +244,7 @@ size_t RigWellPathIntersectionTools::findCellFromCoords(const RigMainGrid* grid,
setHexCorners(cell, nodeCoords, hexCorners);
if (RigHexIntersector::isPointInCell(coords, hexCorners, closeCell))
if (RigHexIntersector::isPointInCell(coords, hexCorners))
{
return closeCell;
}