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

Renaming arguments in functions used by fishbone trans calculations

Browse Source
This commit is contained in:
astridkbjorke 2017-06-14 10:32:24 +02:00
parent 4577ef973c
commit 815c213140
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@ -409,11 +409,11 @@ bool RicWellPathExportCompletionDataFeature::wellSegmentLocationOrdering(const W
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicWellPathExportCompletionDataFeature::isPointBetween(const cvf::Vec3d& pointA, const cvf::Vec3d& pointB, const cvf::Vec3d& needle) bool RicWellPathExportCompletionDataFeature::isPointBetween(const cvf::Vec3d& startPoint, const cvf::Vec3d& endPoint, const cvf::Vec3d& pointToCheck)
{ {
cvf::Plane plane; cvf::Plane plane;
plane.setFromPointAndNormal(needle, pointB - pointA); plane.setFromPointAndNormal(pointToCheck, endPoint - startPoint);
return plane.side(pointA) != plane.side(pointB); return plane.side(startPoint) != plane.side(endPoint);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -464,18 +464,18 @@ void RicWellPathExportCompletionDataFeature::calculateLateralIntersections(const
for (WellSegmentLateral& lateral : location->laterals) for (WellSegmentLateral& lateral : location->laterals)
{ {
lateral.branchNumber = ++(*branchNum); lateral.branchNumber = ++(*branchNum);
std::vector<cvf::Vec3d> coords = location->fishbonesSubs->coordsForLateral(location->subIndex, lateral.lateralIndex); std::vector<cvf::Vec3d> lateralCoords = location->fishbonesSubs->coordsForLateral(location->subIndex, lateral.lateralIndex);
std::vector<WellPathCellIntersectionInfo> intersections = RigWellPathIntersectionTools::findCellsIntersectedByPath(caseToApply->eclipseCaseData(), coords); std::vector<WellPathCellIntersectionInfo> intersections = RigWellPathIntersectionTools::findCellsIntersectedByPath(caseToApply->eclipseCaseData(), lateralCoords);
auto intersection = intersections.cbegin(); auto intersection = intersections.cbegin();
double length = 0; double length = 0;
double depth = 0; double depth = 0;
cvf::Vec3d startPoint = coords[0]; cvf::Vec3d startPoint = lateralCoords[0];
int attachedSegmentNumber = location->icdSegmentNumber; int attachedSegmentNumber = location->icdSegmentNumber;
for (size_t i = 1; i < coords.size() && intersection != intersections.cend(); ++i) for (size_t i = 1; i < lateralCoords.size() && intersection != intersections.cend(); ++i)
{ {
if (isPointBetween(startPoint, coords[i], intersection->endPoint)) if (isPointBetween(startPoint, lateralCoords[i], intersection->endPoint))
{ {
length += (intersection->endPoint - startPoint).length(); length += (intersection->endPoint - startPoint).length();
depth += intersection->endPoint.z() - startPoint.z(); depth += intersection->endPoint.z() - startPoint.z();
@ -492,9 +492,9 @@ void RicWellPathExportCompletionDataFeature::calculateLateralIntersections(const
} }
else else
{ {
length += (coords[i] - startPoint).length(); length += (lateralCoords[i] - startPoint).length();
depth += coords[i].z() - startPoint.z(); depth += lateralCoords[i].z() - startPoint.z();
startPoint = coords[i]; startPoint = lateralCoords[i];
} }
} }
} }