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

36
ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp
View File

@@ -83,10 +83,9 @@ RigAccWellFlowCalculator::RigAccWellFlowCalculator(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigAccWellFlowCalculator::RigAccWellFlowCalculator(
const std::vector<std::vector<cvf::Vec3d>>& pipeBranchesCLCoords,
const std::vector<std::vector<RigWellResultPoint>>& pipeBranchesWellResultPoints,
double smallContribThreshold )
RigAccWellFlowCalculator::RigAccWellFlowCalculator( const std::vector<std::vector<cvf::Vec3d>>& pipeBranchesCLCoords,
const std::vector<std::vector<RigWellResultPoint>>& pipeBranchesWellResultPoints,
double smallContribThreshold )
: m_pipeBranchesCLCoords( pipeBranchesCLCoords )
, m_pipeBranchesWellResultPoints( pipeBranchesWellResultPoints )
, m_tracerCellFractionValues( nullptr )
@@ -196,8 +195,7 @@ const std::vector<double>& RigAccWellFlowCalculator::accumulatedTracerFlowPrConn
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigAccWellFlowCalculator::tracerFlowPrConnection( const QString& tracerName,
size_t branchIdx ) const
const std::vector<double>& RigAccWellFlowCalculator::tracerFlowPrConnection( const QString& tracerName, size_t branchIdx ) const
{
auto flowPrTracerIt = m_connectionFlowPrBranch[branchIdx].flowPrTracer.find( tracerName );
if ( flowPrTracerIt != m_connectionFlowPrBranch[branchIdx].flowPrTracer.end() )
@@ -378,8 +376,7 @@ bool RigAccWellFlowCalculator::isFlowRateConsistent( double flowRate ) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigAccWellFlowCalculator::calculateAccumulatedFlowPrConnection( size_t branchIdx,
size_t startConnectionNumberFromTop )
void RigAccWellFlowCalculator::calculateAccumulatedFlowPrConnection( size_t branchIdx, size_t startConnectionNumberFromTop )
{
const std::vector<RigWellResultPoint>& branchCells = m_pipeBranchesWellResultPoints[branchIdx];
@@ -427,8 +424,8 @@ void RigAccWellFlowCalculator::calculateAccumulatedFlowPrConnection( size_t bran
for ( size_t dsBidx : downStreamBranchIndices )
{
BranchFlow& downStreamBranchFlow = m_connectionFlowPrBranch[dsBidx];
if ( dsBidx != branchIdx &&
downStreamBranchFlow.depthValuesFromTop.size() == 0 ) // Not this branch or already calculated
if ( dsBidx != branchIdx && downStreamBranchFlow.depthValuesFromTop.size() == 0 ) // Not this branch or
// already calculated
{
calculateAccumulatedFlowPrConnection( dsBidx, connNumFromTop );
std::vector<double> accBranchFlowPrTracer = accumulatedDsBranchFlowPrTracer( downStreamBranchFlow );
@@ -527,8 +524,8 @@ void RigAccWellFlowCalculator::calculateFlowPrPseudoLength( size_t branchIdx, do
for ( size_t dsBidx : downStreamBranchIndices )
{
BranchFlow& downStreamBranchFlow = m_pseudoLengthFlowPrBranch[dsBidx];
if ( dsBidx != branchIdx &&
downStreamBranchFlow.depthValuesFromTop.size() == 0 ) // Not this branch or already calculated
if ( dsBidx != branchIdx && downStreamBranchFlow.depthValuesFromTop.size() == 0 ) // Not this branch or
// already calculated
{
calculateFlowPrPseudoLength( dsBidx, pseudoLengthFromTop_upper );
std::vector<double> accBranchFlowPrTracer = accumulatedDsBranchFlowPrTracer( downStreamBranchFlow );
@@ -566,8 +563,9 @@ void RigAccWellFlowCalculator::addDownStreamBranchFlow( std::vector<double>*
totalDsBranchFlow += tracerFlow;
}
bool isAccumulationConsistent = isFlowRateConsistent(
totalThisBranchFlow ); // If inconsistent, is it always only the Reservoir tracer that has the flow ?
bool isAccumulationConsistent = isFlowRateConsistent( totalThisBranchFlow ); // If inconsistent, is it always only
// the Reservoir tracer that has the
// flow ?
bool isBranchConsistent = isFlowRateConsistent( totalDsBranchFlow );
if ( isAccumulationConsistent == isBranchConsistent )
@@ -857,10 +855,12 @@ void RigAccWellFlowCalculator::groupSmallContributions()
for ( const auto& tracerPair : totalTracerFractions )
{
if ( fabs( tracerPair.second ) <= m_smallContributionsThreshold &&
( hasConsistentWellFlow ||
tracerPair.first !=
RIG_RESERVOIR_TRACER_NAME ) ) // Do not group the Reservoir tracer if the well flow is inconsistent,
// because cross flow is shown as the reservoir fraction
( hasConsistentWellFlow || tracerPair.first != RIG_RESERVOIR_TRACER_NAME ) ) // Do not group the
// Reservoir tracer if the
// well flow is
// inconsistent, because
// cross flow is shown as
// the reservoir fraction
{
tracersToGroup.push_back( tracerPair.first );
}