OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-14 17:32:13 -05: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 committed 2020-02-12 13:35:31 +01:00
1 parent 10f0abc9b5
commit c82df63e10
710 files changed
+3167 -4721
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.cpp
+7 -10
View File
@@ -151,9 +151,8 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilter( const RimCellRangeFilte
// Populate the dst range filter with new data
if ( dst.StartI != cvf::UNDEFINED_SIZE_T && dst.StartJ != cvf::UNDEFINED_SIZE_T &&
dst.StartK != cvf::UNDEFINED_SIZE_T && dst.EndI != cvf::UNDEFINED_SIZE_T &&
dst.EndJ != cvf::UNDEFINED_SIZE_T && dst.EndK != cvf::UNDEFINED_SIZE_T )
if ( dst.StartI != cvf::UNDEFINED_SIZE_T && dst.StartJ != cvf::UNDEFINED_SIZE_T && dst.StartK != cvf::UNDEFINED_SIZE_T &&
dst.EndI != cvf::UNDEFINED_SIZE_T && dst.EndJ != cvf::UNDEFINED_SIZE_T && dst.EndK != cvf::UNDEFINED_SIZE_T )
{
dstFilter->startIndexI = static_cast<int>( dst.StartI + 1 );
dstFilter->startIndexJ = static_cast<int>( dst.StartJ + 1 );
@@ -260,8 +259,7 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilterEndPoints( const RigRange
&( rangeFilterMatches[diagIdx].ijk[2] ) );
}
if ( rangeFilterMatches[cornerIdx].cellMatchType == EXACT &&
rangeFilterMatches[diagIdx].cellMatchType == EXACT )
if ( rangeFilterMatches[cornerIdx].cellMatchType == EXACT && rangeFilterMatches[diagIdx].cellMatchType == EXACT )
{
foundExactMatch = true;
break;
@@ -291,8 +289,7 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilterEndPoints( const RigRange
cvf::UNDEFINED_SIZE_T};
for ( int faceIdx = 0; faceIdx < 6; ++faceIdx )
{
auto gridAxis = cvf::StructGridInterface::gridAxisFromFace(
cvf::StructGridInterface::FaceType( faceIdx ) );
auto gridAxis = cvf::StructGridInterface::gridAxisFromFace( cvf::StructGridInterface::FaceType( faceIdx ) );
int ijOrk = 0;
if ( gridAxis == cvf::StructGridInterface::GridAxisType::AXIS_I ) ijOrk = 0;
@@ -300,8 +297,7 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilterEndPoints( const RigRange
if ( gridAxis == cvf::StructGridInterface::GridAxisType::AXIS_K ) ijOrk = 2;
cvf::ubyte surfCorners[4];
cvf::StructGridInterface::cellFaceVertexIndices( (cvf::StructGridInterface::FaceType)faceIdx,
surfCorners );
cvf::StructGridInterface::cellFaceVertexIndices( (cvf::StructGridInterface::FaceType)faceIdx, surfCorners );
bool foundAcceptedMatch = false;
for ( int cIdx = 0; cIdx < 4; ++cIdx )
{
@@ -480,7 +476,8 @@ RigCaseToCaseRangeFilterMapper::CellMatchType
std::vector<size_t> closeCells;
masterEclGrid->findIntersectingCells( elmBBox,
&closeCells ); // This might actually miss the exact one, but we have no other alternative yet.
&closeCells ); // This might actually miss the exact one, but we have no other
// alternative yet.
size_t globCellIdxToBestMatch = cvf::UNDEFINED_SIZE_T;
double sqDistToClosestCellCenter = HUGE_VAL;