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

Refactor: improve names of result aggregation enum options.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-11-13 10:27:15 +01:00
parent c16bc11c03
commit 88ded4f7a0
12 changed files with 88 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ReservoirDataModel/RigContourMapProjection.cpp
View File

@@ -44,7 +44,7 @@ RigContourMapProjection::RigContourMapProjection( const RigContourMapGrid& conto
///
//--------------------------------------------------------------------------------------------------
std::vector<std::vector<std::pair<size_t, double>>>
RigContourMapProjection::generateGridMapping( RigContourMapCalculator::ResultAggregationEnum resultAggregation,
RigContourMapProjection::generateGridMapping( RigContourMapCalculator::ResultAggregationType resultAggregation,
const std::vector<double>& weights )
{
m_projected3dGridIndices = RigContourMapCalculator::generateGridMapping( *this, m_contourMapGrid, resultAggregation, weights );
@@ -201,7 +201,7 @@ size_t RigContourMapProjection::gridResultIndex( size_t globalCellIdx ) const
double RigContourMapProjection::calculateValueInMapCell( unsigned int i,
unsigned int j,
const std::vector<double>& gridCellValues,
RigContourMapCalculator::ResultAggregationEnum resultAggregation ) const
RigContourMapCalculator::ResultAggregationType resultAggregation ) const
{
const std::vector<std::pair<size_t, double>>& matchingCells = cellsAtIJ( i, j );
return RigContourMapCalculator::calculateValueInMapCell( *this, matchingCells, gridCellValues, resultAggregation );