OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-05 02:53:15 -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
2020-02-12 13:35:31 +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
ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp
+9 -11
View File
@@ -90,9 +90,7 @@ double RigTransmissibilityCondenser::transmissibilityThreshold() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigTransmissibilityCondenser::addNeighborTransmissibility( CellAddress cell1,
CellAddress cell2,
double transmissibility )
void RigTransmissibilityCondenser::addNeighborTransmissibility( CellAddress cell1, CellAddress cell2, double transmissibility )
{
if ( transmissibility < m_transmissibilityThreshold ) return;
@@ -171,11 +169,11 @@ std::map<size_t, double>
size_t globalMatrixCellIdx = jt->first.m_globalCellIdx;
size_t eclipseResultIndex = actCellInfo->cellResultIndex( globalMatrixCellIdx );
CVF_ASSERT( eclipseResultIndex < currentMatrixPressures.size() );
double unsignedDeltaPressure = std::abs( currentMatrixPressures[eclipseResultIndex] -
currentWellPressure );
double nonZeroDeltaPressure = std::max( epsilonDeltaPressure, unsignedDeltaPressure );
maxNonZeroDeltaPressure = std::max( maxNonZeroDeltaPressure, nonZeroDeltaPressure );
minNonZeroDeltaPressure = std::min( minNonZeroDeltaPressure, nonZeroDeltaPressure );
double unsignedDeltaPressure =
std::abs( currentMatrixPressures[eclipseResultIndex] - currentWellPressure );
double nonZeroDeltaPressure = std::max( epsilonDeltaPressure, unsignedDeltaPressure );
maxNonZeroDeltaPressure = std::max( maxNonZeroDeltaPressure, nonZeroDeltaPressure );
minNonZeroDeltaPressure = std::min( minNonZeroDeltaPressure, nonZeroDeltaPressure );
}
}
}
@@ -195,9 +193,9 @@ std::map<size_t, double>
originalLumpedMatrixToFractureTrans[globalMatrixCellIdx] += jt->second;
double unsignedDeltaPressure = std::abs( currentMatrixPressures[eclipseResultIndex] -
currentWellPressure );
double nonZeroDeltaPressure = std::max( epsilonDeltaPressure, unsignedDeltaPressure );
double unsignedDeltaPressure =
std::abs( currentMatrixPressures[eclipseResultIndex] - currentWellPressure );
double nonZeroDeltaPressure = std::max( epsilonDeltaPressure, unsignedDeltaPressure );
jt->second *= nonZeroDeltaPressure / maxNonZeroDeltaPressure;
}