OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename method

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-09-27 09:55:28 +02:00
parent d4dde531a8
commit ade352a259
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp
View File

@ -110,8 +110,8 @@ void Riv3dWellLogCurveGeometryGenerator::createCurveDrawables(const caf::Display
// Iterate from bottom of well path and up to be able to stop at given Z max clipping height
for (auto md = resultMds.rbegin(); md != resultMds.rend(); md++)
{
cvf::Vec3d point = wellPathGeometry()->interpolatedVectorAlongWellPath(wellPathPoints, *md);
cvf::Vec3d normal = wellPathGeometry()->interpolatedVectorAlongWellPath(wellPathCurveNormals, *md);
cvf::Vec3d point = wellPathGeometry()->interpolatedVectorValuesAlongWellPath(wellPathPoints, *md);
cvf::Vec3d normal = wellPathGeometry()->interpolatedVectorValuesAlongWellPath(wellPathCurveNormals, *md);
if (point.z() > clipLocation.z()) break;
interpolatedWellPathPoints.push_back(point);

2
ApplicationCode/ModelVisualization/Riv3dWellLogDrawSurfaceGenerator.cpp
View File

@ -193,7 +193,7 @@ void Riv3dWellLogDrawSurfaceGenerator::createCurveNormalVectors(const caf::Displ
{
cvf::Vec3d point = wellPathGeometry()->interpolatedPointAlongWellPath(md);
point = displayCoordTransform->transformToDisplayCoord(point);
cvf::Vec3d curveNormal = wellPathGeometry()->interpolatedVectorAlongWellPath(segmentNormals, md);
cvf::Vec3d curveNormal = wellPathGeometry()->interpolatedVectorValuesAlongWellPath(segmentNormals, md);
interpolatedWellPathPoints.push_back(point);
interpolatedWellPathNormals.push_back(curveNormal.getNormalized());
md -= samplingIntervalSize;

12
ApplicationCode/ReservoirDataModel/RigWellPath.cpp
View File

@ -85,11 +85,11 @@ double RigWellPath::rkbDiff() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::Vec3d RigWellPath::interpolatedVectorAlongWellPath(const std::vector<cvf::Vec3d>& vectors,
cvf::Vec3d RigWellPath::interpolatedVectorValuesAlongWellPath(const std::vector<cvf::Vec3d>& vectorValuesAlongWellPath,
double measuredDepth,
double * horizontalLengthAlongWellToStartClipPoint /*= nullptr*/) const
{
CVF_ASSERT(vectors.size() == m_wellPathPoints.size());
CVF_ASSERT(vectorValuesAlongWellPath.size() == m_wellPathPoints.size());
cvf::Vec3d interpolatedVector = cvf::Vec3d::ZERO;
if (horizontalLengthAlongWellToStartClipPoint) *horizontalLengthAlongWellToStartClipPoint = 0.0;
@ -111,7 +111,7 @@ cvf::Vec3d RigWellPath::interpolatedVectorAlongWellPath(const std::vector<cvf::V
if ( vxIdx == 0 )
{
//For measuredDepth same or lower than first point, use this first point
interpolatedVector = vectors.at(0);
interpolatedVector = vectorValuesAlongWellPath.at(0);
}
else
{
@ -119,7 +119,7 @@ cvf::Vec3d RigWellPath::interpolatedVectorAlongWellPath(const std::vector<cvf::V
double segmentFraction = (measuredDepth - m_measuredDepths.at(vxIdx-1)) /
(m_measuredDepths.at(vxIdx) - m_measuredDepths.at(vxIdx - 1));
cvf::Vec3d segment = m_wellPathPoints[vxIdx] - m_wellPathPoints[vxIdx - 1];
interpolatedVector = (1.0 - segmentFraction) * vectors[vxIdx - 1] + segmentFraction * vectors[vxIdx];
interpolatedVector = (1.0 - segmentFraction) * vectorValuesAlongWellPath[vxIdx - 1] + segmentFraction * vectorValuesAlongWellPath[vxIdx];
if ( horizontalLengthAlongWellToStartClipPoint )
{
@ -131,7 +131,7 @@ cvf::Vec3d RigWellPath::interpolatedVectorAlongWellPath(const std::vector<cvf::V
else
{
// Use endpoint if measuredDepth same or higher than last point
interpolatedVector = vectors.at(vxIdx-1);
interpolatedVector = vectorValuesAlongWellPath.at(vxIdx-1);
}
@ -140,7 +140,7 @@ cvf::Vec3d RigWellPath::interpolatedVectorAlongWellPath(const std::vector<cvf::V
cvf::Vec3d RigWellPath::interpolatedPointAlongWellPath(double measuredDepth, double * horizontalLengthAlongWellToStartClipPoint /*= nullptr*/) const
{
return interpolatedVectorAlongWellPath(m_wellPathPoints, measuredDepth, horizontalLengthAlongWellToStartClipPoint);
return interpolatedVectorValuesAlongWellPath(m_wellPathPoints, measuredDepth, horizontalLengthAlongWellToStartClipPoint);
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ReservoirDataModel/RigWellPath.h
View File

@ -48,7 +48,7 @@ public:
bool hasDatumElevation() const;
double datumElevation() const;
double rkbDiff() const;
cvf::Vec3d interpolatedVectorAlongWellPath(const std::vector<cvf::Vec3d>& vectors,
cvf::Vec3d interpolatedVectorValuesAlongWellPath(const std::vector<cvf::Vec3d>& vectors,
double measuredDepth,
double * horizontalLengthAlongWellToStartClipPoint = nullptr) const;
cvf::Vec3d interpolatedPointAlongWellPath(double measuredDepth,