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

#4683 clang-format on all files in ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
ApplicationCode/ReservoirDataModel/RigWeightedMeanCalc.cpp
View File

@@ -1,17 +1,17 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017- Statoil ASA
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -26,52 +26,52 @@
#include <cmath> // Needed for HUGE_VAL on Linux
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RigWeightedMeanCalc::weightedMeanOverCells(const std::vector<double>* weights,
const std::vector<double>* values,
const cvf::UByteArray* cellVisibilities,
bool isUsingVisibleCells,
const RigActiveCellInfo* actCellInfo,
bool isUsingActiveIndex,
double *result)
void RigWeightedMeanCalc::weightedMeanOverCells( const std::vector<double>* weights,
const std::vector<double>* values,
const cvf::UByteArray* cellVisibilities,
bool isUsingVisibleCells,
const RigActiveCellInfo* actCellInfo,
bool isUsingActiveIndex,
double* result )
{
if (!(weights && values && result)) return;
if (!cellVisibilities && isUsingVisibleCells) return;
if (!actCellInfo && isUsingActiveIndex) return;
if ( !( weights && values && result ) ) return;
if ( !cellVisibilities && isUsingVisibleCells ) return;
if ( !actCellInfo && isUsingActiveIndex ) return;
if (weights->empty() || values->empty()) return;
if ( weights->empty() || values->empty() ) return;
double weightedSum = 0.0;
double weightSum = 0.0;
double weightSum = 0.0;
for (size_t cIdx = 0; cIdx < actCellInfo->reservoirCellCount(); ++cIdx)
for ( size_t cIdx = 0; cIdx < actCellInfo->reservoirCellCount(); ++cIdx )
{
if (isUsingVisibleCells)
if ( isUsingVisibleCells )
{
if (!(*cellVisibilities)[cIdx]) continue;
if ( !( *cellVisibilities )[cIdx] ) continue;
}
size_t cellResultIndex = actCellInfo->cellResultIndex(cIdx);
if (cellResultIndex == cvf::UNDEFINED_SIZE_T || cellResultIndex > weights->size())
size_t cellResultIndex = actCellInfo->cellResultIndex( cIdx );
if ( cellResultIndex == cvf::UNDEFINED_SIZE_T || cellResultIndex > weights->size() )
{
continue;
}
double value;
if (isUsingActiveIndex)
if ( isUsingActiveIndex )
{
value = (*values)[cellResultIndex];
value = ( *values )[cellResultIndex];
}
else
{
value = (*values)[cIdx];
value = ( *values )[cIdx];
}
double weight = (*weights)[cellResultIndex];
double weight = ( *weights )[cellResultIndex];
if (weight == HUGE_VAL || value == HUGE_VAL)
if ( weight == HUGE_VAL || value == HUGE_VAL )
{
continue;
}
@@ -80,7 +80,7 @@ void RigWeightedMeanCalc::weightedMeanOverCells(const std::vector<double>* weigh
weightSum += weight;
}
if (weightSum != 0)
if ( weightSum != 0 )
{
*result = weightedSum / weightSum;
}