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

clang-format: Set column width to 140

Browse Source 
* Set column width to 140
* Use c++20
* Remove redundant virtual
This commit is contained in:
Magne Sjaastad
2023-02-26 10:48:40 +01:00
parent 2bf3a511fe
commit 42b901ec28
1535 changed files with 10456 additions and 19398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationLibCode/ReservoirDataModel/RigWellPathGeometryTools.cpp
View File

@@ -85,8 +85,7 @@ double RigWellPathGeometryTools::value( double x, const QPolygonF& values )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<cvf::Vec3d> RigWellPathGeometryTools::calculateLineSegmentNormals( const std::vector<cvf::Vec3d>& vertices,
double planeAngle )
std::vector<cvf::Vec3d> RigWellPathGeometryTools::calculateLineSegmentNormals( const std::vector<cvf::Vec3d>& vertices, double planeAngle )
{
std::vector<cvf::Vec3d> pointNormals;
@@ -95,8 +94,7 @@ std::vector<cvf::Vec3d> RigWellPathGeometryTools::calculateLineSegmentNormals( c
pointNormals.reserve( vertices.size() );
const cvf::Vec3d up( 0, 0, 1 );
const cvf::Vec3d rotatedUp =
up.getTransformedVector( cvf::Mat3d::fromRotation( cvf::Vec3d( 0.0, 1.0, 0.0 ), planeAngle ) );
const cvf::Vec3d rotatedUp = up.getTransformedVector( cvf::Mat3d::fromRotation( cvf::Vec3d( 0.0, 1.0, 0.0 ), planeAngle ) );
const cvf::Vec3d dominantDirection = estimateDominantDirectionInXYPlane( vertices );
@@ -113,10 +111,9 @@ std::vector<cvf::Vec3d> RigWellPathGeometryTools::calculateLineSegmentNormals( c
cvf::Vec3d normal( 0, 0, 0 );
if ( cvf::Math::abs( tangent * projectionPlaneNormal ) < 0.7071 )
{
cvf::Vec3d projectedTangent =
( tangent - ( tangent * projectionPlaneNormal ) * projectionPlaneNormal ).getNormalized();
normal = ( projectedTangent ^ projectionPlaneNormal ).getNormalized();
normal = normal.getTransformedVector( cvf::Mat3d::fromRotation( tangent, planeAngle ) );
cvf::Vec3d projectedTangent = ( tangent - ( tangent * projectionPlaneNormal ) * projectionPlaneNormal ).getNormalized();
normal = ( projectedTangent ^ projectionPlaneNormal ).getNormalized();
normal = normal.getTransformedVector( cvf::Mat3d::fromRotation( tangent, planeAngle ) );
}
pointNormals.push_back( normal );
sumDotWithRotatedUp += normal * rotatedUp;
@@ -192,9 +189,8 @@ std::vector<double> RigWellPathGeometryTools::interpolateMdFromTvd( const std::v
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<double, double>
RigWellPathGeometryTools::calculateAzimuthAndInclinationAtMd( double measuredDepth,
gsl::not_null<const RigWellPath*> wellPathGeometry )
std::pair<double, double> RigWellPathGeometryTools::calculateAzimuthAndInclinationAtMd( double measuredDepth,
gsl::not_null<const RigWellPath*> wellPathGeometry )
{
int mdIndex = -1;
auto mdList = wellPathGeometry->measuredDepths();
@@ -247,9 +243,8 @@ std::pair<double, double>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<int>
RigWellPathGeometryTools::findSplineSegmentsContainingRoots( const QPolygonF& points,
const std::vector<double>& tvdValuesToInterpolateFrom )
std::vector<int> RigWellPathGeometryTools::findSplineSegmentsContainingRoots( const QPolygonF& points,
const std::vector<double>& tvdValuesToInterpolateFrom )
{
std::vector<int> segmentStartIndices;
segmentStartIndices.reserve( tvdValuesToInterpolateFrom.size() );
@@ -294,7 +289,7 @@ std::vector<int>
return segmentStartIndices;
}
std::vector<cvf::Vec3d> RigWellPathGeometryTools::interpolateUndefinedNormals( const cvf::Vec3d& planeNormal,
std::vector<cvf::Vec3d> RigWellPathGeometryTools::interpolateUndefinedNormals( const cvf::Vec3d& planeNormal,
const std::vector<cvf::Vec3d>& normals,
const std::vector<cvf::Vec3d>& vertices )
{
@@ -328,8 +323,7 @@ std::vector<cvf::Vec3d> RigWellPathGeometryTools::interpolateUndefinedNormals( c
if ( lastNormalNonInterpolated.length() > 0.0 && nextNormal.length() > 0.0 )
{
// Both last and next are acceptable, interpolate!
currentNormal =
( distanceToNext * lastNormalNonInterpolated + distanceFromLast * nextNormal ).getNormalized();
currentNormal = ( distanceToNext * lastNormalNonInterpolated + distanceFromLast * nextNormal ).getNormalized();
}
else if ( lastNormalNonInterpolated.length() > 0.0 )
{