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

33
ApplicationCode/ReservoirDataModel/RigTofAccumulatedPhaseFractionsCalculator.cpp
View File

@@ -44,22 +44,14 @@ RigTofAccumulatedPhaseFractionsCalculator::RigTofAccumulatedPhaseFractionsCalcul
RigEclipseCaseData* eclipseCaseData = caseToApply->eclipseCaseData();
if ( !eclipseCaseData ) return;
const std::vector<double>* swatResults = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
RiaDefines::DYNAMIC_NATIVE,
"SWAT",
timestep );
const std::vector<double>* soilResults = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
RiaDefines::DYNAMIC_NATIVE,
"SOIL",
timestep );
const std::vector<double>* sgasResults = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
RiaDefines::DYNAMIC_NATIVE,
"SGAS",
timestep );
const std::vector<double>* porvResults = eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL,
RiaDefines::STATIC_NATIVE,
"PORV",
0 );
const std::vector<double>* swatResults =
eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL, RiaDefines::DYNAMIC_NATIVE, "SWAT", timestep );
const std::vector<double>* soilResults =
eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL, RiaDefines::DYNAMIC_NATIVE, "SOIL", timestep );
const std::vector<double>* sgasResults =
eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL, RiaDefines::DYNAMIC_NATIVE, "SGAS", timestep );
const std::vector<double>* porvResults =
eclipseCaseData->resultValues( RiaDefines::MATRIX_MODEL, RiaDefines::STATIC_NATIVE, "PORV", 0 );
RimFlowDiagSolution* flowDiagSolution = caseToApply->defaultFlowDiagSolution();
@@ -141,18 +133,15 @@ void RigTofAccumulatedPhaseFractionsCalculator::sortTofAndCalculateAccPhaseFract
fractionPorvSum += fractionData->at( index ) * porvResults->at( index );
if ( swatResults != nullptr )
{
fractionPorvPhaseSumSwat += fractionData->at( index ) * porvResults->at( index ) *
swatResults->at( index );
fractionPorvPhaseSumSwat += fractionData->at( index ) * porvResults->at( index ) * swatResults->at( index );
}
if ( soilResults != nullptr )
{
fractionPorvPhaseSumSoil += fractionData->at( index ) * porvResults->at( index ) *
soilResults->at( index );
fractionPorvPhaseSumSoil += fractionData->at( index ) * porvResults->at( index ) * soilResults->at( index );
}
if ( sgasResults != nullptr )
{
fractionPorvPhaseSumSgas += fractionData->at( index ) * porvResults->at( index ) *
sgasResults->at( index );
fractionPorvPhaseSumSgas += fractionData->at( index ) * porvResults->at( index ) * sgasResults->at( index );
}
}