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

12
ApplicationCode/ReservoirDataModel/RigCombMultResultAccessor.cpp
View File

@@ -64,8 +64,7 @@ double RigCombMultResultAccessor::cellScalar( size_t gridLocalCellIndex ) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCombMultResultAccessor::cellFaceScalar( size_t gridLocalCellIndex,
cvf::StructGridInterface::FaceType faceId ) const
double RigCombMultResultAccessor::cellFaceScalar( size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId ) const
{
size_t i, j, k, neighborGridCellIdx;
m_grid->ijkFromCellIndex( gridLocalCellIndex, &i, &j, &k );
@@ -84,8 +83,7 @@ double RigCombMultResultAccessor::cellFaceScalar( size_t
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCombMultResultAccessor::nativeMultScalar( size_t gridLocalCellIndex,
cvf::StructGridInterface::FaceType faceId ) const
double RigCombMultResultAccessor::nativeMultScalar( size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId ) const
{
double faceScalar = 1.0;
@@ -145,7 +143,8 @@ double RigCombMultResultAccessor::nativeMultScalar( size_t
break;
}
// FaceScalar with value HUGE_VAL means value outside valid IJK-range. Clamp to 1.0 as this means no change in MULT factor.
// FaceScalar with value HUGE_VAL means value outside valid IJK-range. Clamp to 1.0 as this means no change in MULT
// factor.
if ( faceScalar == HUGE_VAL )
{
faceScalar = 1.0;
@@ -167,8 +166,7 @@ double RigCombMultResultAccessor::cellScalarGlobIdx( size_t globCellIndex ) cons
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCombMultResultAccessor::cellFaceScalarGlobIdx( size_t globCellIndex,
cvf::StructGridInterface::FaceType faceId ) const
double RigCombMultResultAccessor::cellFaceScalarGlobIdx( size_t globCellIndex, cvf::StructGridInterface::FaceType faceId ) const
{
size_t gridLocalCellIndex = m_grid->mainGrid()->cell( globCellIndex ).gridLocalCellIndex();
return this->cellFaceScalar( gridLocalCellIndex, faceId );