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

#5101 clang-format: Adjusted penalties

Browse Source 
Use lower absolute values to improve control of behavior
This commit is contained in:
Magne Sjaastad
2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp
View File

@@ -77,9 +77,8 @@ std::vector<WellPathCellIntersectionInfo> RigWellLogExtractor::cellIntersectionI
cellInfo.intersectedCellFaceIn = m_intersectedCellFaces[i];
cellInfo.intersectedCellFaceOut = m_intersectedCellFaces[i + 1];
cellInfo.intersectionLengthsInCellCS = this->calculateLengthInCell( cellInfo.globCellIndex,
cellInfo.startPoint,
cellInfo.endPoint );
cellInfo.intersectionLengthsInCellCS =
this->calculateLengthInCell( cellInfo.globCellIndex, cellInfo.startPoint, cellInfo.endPoint );
infoVector.push_back( cellInfo );
}
@@ -106,13 +105,12 @@ const RigWellPath* RigWellLogExtractor::wellPathData() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigWellLogExtractor::insertIntersectionsInMap(
const std::vector<HexIntersectionInfo>& intersections,
cvf::Vec3d p1,
double md1,
cvf::Vec3d p2,
double md2,
std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo>* uniqueIntersections )
void RigWellLogExtractor::insertIntersectionsInMap( const std::vector<HexIntersectionInfo>& intersections,
cvf::Vec3d p1,
double md1,
cvf::Vec3d p2,
double md2,
std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo>* uniqueIntersections )
{
for ( size_t intIdx = 0; intIdx < intersections.size(); ++intIdx )
{
@@ -197,8 +195,9 @@ void RigWellLogExtractor::populateReturnArrays( std::map<RigMDCellIdxEnterLeaveK
{
// Add an intersection for the well startpoint that is inside the first cell
std::map<RigMDEnterLeaveCellIdxKey, HexIntersectionInfo>::iterator it = sortedUniqueIntersections.begin();
if ( it != sortedUniqueIntersections.end() &&
!it->first.isEnteringCell ) // Leaving a cell as first intersection. Well starts inside a cell.
if ( it != sortedUniqueIntersections.end() && !it->first.isEnteringCell ) // Leaving a cell as first
// intersection. Well starts inside a
// cell.
{
// Needs wellpath start point in front
HexIntersectionInfo firstLeavingPoint = it->second;
@@ -213,9 +212,11 @@ void RigWellLogExtractor::populateReturnArrays( std::map<RigMDCellIdxEnterLeaveK
}
// Add an intersection for the well endpoint possibly inside the last cell.
std::map<RigMDEnterLeaveCellIdxKey, HexIntersectionInfo>::reverse_iterator rit = sortedUniqueIntersections.rbegin();
if ( rit != sortedUniqueIntersections.rend() &&
rit->first.isEnteringCell ) // Entering a cell as last intersection. Well ends inside a cell.
std::map<RigMDEnterLeaveCellIdxKey, HexIntersectionInfo>::reverse_iterator rit =
sortedUniqueIntersections.rbegin();
if ( rit != sortedUniqueIntersections.rend() && rit->first.isEnteringCell ) // Entering a cell as last
// intersection. Well ends inside a
// cell.
{
// Needs wellpath end point at end
HexIntersectionInfo lastEnterPoint = rit->second;
@@ -224,9 +225,7 @@ void RigWellLogExtractor::populateReturnArrays( std::map<RigMDCellIdxEnterLeaveK
lastEnterPoint.m_face = cvf::StructGridInterface::NO_FACE;
sortedUniqueIntersections.insert(
std::make_pair( RigMDEnterLeaveCellIdxKey( m_wellPath->m_measuredDepths.back(),
false,
lastEnterPoint.m_hexIndex ),
std::make_pair( RigMDEnterLeaveCellIdxKey( m_wellPath->m_measuredDepths.back(), false, lastEnterPoint.m_hexIndex ),
lastEnterPoint ) );
}
}