mirror of
https://github.com/OPM/ResInsight.git
synced 2026-08-27 13:47:12 -05:00
Magne Sjaastad
56e98ba1c4
Migrate all assert macros in ApplicationLibCode to CAF_ASSERT and remove every use of cvfAssert.h. CVF_ASSERT is replaced one to one. CVF_TIGHT_ASSERT is also replaced by CAF_ASSERT, which is semantically exact: CVF_ENABLE_TIGHT_ASSERTS is 1 only under _DEBUG, and that is what CAF_ASSERT now does. The two CVF_FAIL_MSG sites become CAF_ASSERT( false && "message" ), preserving the message with the idiom already used elsewhere in the code base. Counts before and after: CVF_ASSERT 1044 to 0, CVF_TIGHT_ASSERT 66 to 0, CVF_FAIL_MSG 2 to 0, cvfAssert.h references 154 to 0. Include handling: files that included cvfAssert.h directly now include cafAssert.h instead, includes left dead by the migration are removed, and files that were relying on cvfAssert.h transitively get an explicit cafAssert.h. Files that reach cafAssert.h through another caf header are left unchanged; a missing include here is a compile error, not a silently disabled assert. ResultStatisticsCache links only LibCore and therefore had no path to cafAssert.h. Add the cafPdmCore directory as a private include path rather than linking the library, since cafAssert.h is header only. Note that this stops these asserts from firing in Release and RelWithDebInfo, where CVF_ASSERT was previously active.
525 lines
23 KiB
C++
525 lines
23 KiB
C++
/////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2018- Equinor 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>
|
|
// for more details.
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "RigContourMapCalculator.h"
|
|
|
|
#include "RiaWeightedGeometricMeanCalculator.h"
|
|
#include "RiaWeightedHarmonicMeanCalculator.h"
|
|
#include "RiaWeightedMeanCalculator.h"
|
|
|
|
#include "RigContourMapGrid.h"
|
|
|
|
#include "RigCellGeometryTools.h"
|
|
#include "RigContourMapProjection.h"
|
|
#include "RigPolyLinesData.h"
|
|
|
|
#include "cafAssert.h"
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
#include <map>
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
double RigContourMapCalculator::calculateValueInMapCell( const RigContourMapProjection& contourMapProjection,
|
|
const std::vector<std::pair<size_t, double>>& matchingCells,
|
|
const std::vector<double>& gridCellValues,
|
|
ResultAggregationType resultAggregation )
|
|
{
|
|
if ( matchingCells.empty() ) return std::numeric_limits<double>::infinity();
|
|
|
|
switch ( resultAggregation )
|
|
{
|
|
case TOP_VALUE:
|
|
return calculateTopValue( contourMapProjection, matchingCells, gridCellValues );
|
|
case MEAN:
|
|
return calculateMeanValue( contourMapProjection, matchingCells, gridCellValues );
|
|
case GEOMETRIC_MEAN:
|
|
return calculateGeometricMeanValue( contourMapProjection, matchingCells, gridCellValues );
|
|
case HARMONIC_MEAN:
|
|
return calculateHarmonicMeanValue( contourMapProjection, matchingCells, gridCellValues );
|
|
case MAX_VALUE:
|
|
return calculateMaxValue( contourMapProjection, matchingCells, gridCellValues );
|
|
case MIN_VALUE:
|
|
return calculateMinValue( contourMapProjection, matchingCells, gridCellValues );
|
|
case SUM:
|
|
case OIL_COLUMN:
|
|
case GAS_COLUMN:
|
|
case HYDROCARBON_COLUMN:
|
|
case MOBILE_OIL_COLUMN:
|
|
case MOBILE_GAS_COLUMN:
|
|
case MOBILE_HYDROCARBON_COLUMN:
|
|
return calculateSum( contourMapProjection, matchingCells, gridCellValues );
|
|
default:
|
|
{
|
|
CAF_ASSERT( false );
|
|
return std::numeric_limits<double>::infinity();
|
|
}
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
double RigContourMapCalculator::calculateTopValue( const RigContourMapProjection& contourMapProjection,
|
|
const std::vector<std::pair<size_t, double>>& matchingCells,
|
|
const std::vector<double>& gridCellValues )
|
|
{
|
|
std::vector<size_t> cellIndices;
|
|
cellIndices.reserve( matchingCells.size() );
|
|
for ( auto [cellIdx, weight] : matchingCells )
|
|
{
|
|
cellIndices.push_back( cellIdx );
|
|
}
|
|
|
|
// Sort the cells based on k layer as first criteria, then on cell index
|
|
std::sort( cellIndices.begin(),
|
|
cellIndices.end(),
|
|
[&]( size_t a, size_t b )
|
|
{
|
|
if ( contourMapProjection.kLayer( a ) == contourMapProjection.kLayer( b ) )
|
|
{
|
|
return a < b;
|
|
}
|
|
return contourMapProjection.kLayer( a ) < contourMapProjection.kLayer( b );
|
|
} );
|
|
|
|
// Find the first cell with a valid value
|
|
for ( auto cellIdx : cellIndices )
|
|
{
|
|
auto gridResultIndex = contourMapProjection.gridResultIndex( cellIdx );
|
|
if ( gridResultIndex >= gridCellValues.size() ) continue;
|
|
|
|
double cellValue = gridCellValues[gridResultIndex];
|
|
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
|
|
{
|
|
return cellValue;
|
|
}
|
|
}
|
|
|
|
return std::numeric_limits<double>::infinity();
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
double RigContourMapCalculator::calculateMeanValue( const RigContourMapProjection& contourMapProjection,
|
|
const std::vector<std::pair<size_t, double>>& matchingCells,
|
|
const std::vector<double>& gridCellValues )
|
|
{
|
|
RiaWeightedMeanCalculator<double> calculator;
|
|
for ( auto [cellIdx, weight] : matchingCells )
|
|
{
|
|
const auto valueIndex = contourMapProjection.gridResultIndex( cellIdx );
|
|
|
|
// Safety check, should not happen
|
|
if ( valueIndex >= gridCellValues.size() ) continue;
|
|
|
|
double cellValue = gridCellValues[valueIndex];
|
|
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
|
|
{
|
|
calculator.addValueAndWeight( cellValue, weight );
|
|
}
|
|
}
|
|
if ( calculator.validAggregatedWeight() )
|
|
{
|
|
return calculator.weightedMean();
|
|
}
|
|
return std::numeric_limits<double>::infinity();
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
double RigContourMapCalculator::calculateGeometricMeanValue( const RigContourMapProjection& contourMapProjection,
|
|
const std::vector<std::pair<size_t, double>>& matchingCells,
|
|
const std::vector<double>& gridCellValues )
|
|
{
|
|
RiaWeightedGeometricMeanCalculator calculator;
|
|
for ( auto [cellIdx, weight] : matchingCells )
|
|
{
|
|
const auto valueIndex = contourMapProjection.gridResultIndex( cellIdx );
|
|
|
|
// Safety check, should not happen
|
|
if ( valueIndex >= gridCellValues.size() ) continue;
|
|
|
|
double cellValue = gridCellValues[valueIndex];
|
|
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
|
|
{
|
|
if ( cellValue < 1.0e-8 )
|
|
{
|
|
return 0.0;
|
|
}
|
|
calculator.addValueAndWeight( cellValue, weight );
|
|
}
|
|
}
|
|
if ( calculator.validAggregatedWeight() )
|
|
{
|
|
return calculator.weightedMean();
|
|
}
|
|
return std::numeric_limits<double>::infinity();
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
double RigContourMapCalculator::calculateHarmonicMeanValue( const RigContourMapProjection& contourMapProjection,
|
|
const std::vector<std::pair<size_t, double>>& matchingCells,
|
|
const std::vector<double>& gridCellValues )
|
|
{
|
|
RiaWeightedHarmonicMeanCalculator calculator;
|
|
for ( auto [cellIdx, weight] : matchingCells )
|
|
{
|
|
const auto valueIndex = contourMapProjection.gridResultIndex( cellIdx );
|
|
|
|
// Safety check, should not happen
|
|
if ( valueIndex >= gridCellValues.size() ) continue;
|
|
|
|
double cellValue = gridCellValues[valueIndex];
|
|
if ( std::fabs( cellValue ) < 1.0e-8 )
|
|
{
|
|
return 0.0;
|
|
}
|
|
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
|
|
{
|
|
calculator.addValueAndWeight( cellValue, weight );
|
|
}
|
|
}
|
|
if ( calculator.validAggregatedWeight() )
|
|
{
|
|
return calculator.weightedMean();
|
|
}
|
|
return std::numeric_limits<double>::infinity();
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
double RigContourMapCalculator::calculateMaxValue( const RigContourMapProjection& contourMapProjection,
|
|
const std::vector<std::pair<size_t, double>>& matchingCells,
|
|
const std::vector<double>& gridCellValues )
|
|
{
|
|
double maxValue = -std::numeric_limits<double>::infinity();
|
|
for ( auto [cellIdx, weight] : matchingCells )
|
|
{
|
|
const auto valueIndex = contourMapProjection.gridResultIndex( cellIdx );
|
|
|
|
// Safety check, should not happen
|
|
if ( valueIndex >= gridCellValues.size() ) continue;
|
|
|
|
double cellValue = gridCellValues[valueIndex];
|
|
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
|
|
{
|
|
maxValue = std::max( maxValue, cellValue );
|
|
}
|
|
}
|
|
if ( maxValue == -std::numeric_limits<double>::infinity() )
|
|
{
|
|
maxValue = std::numeric_limits<double>::infinity();
|
|
}
|
|
return maxValue;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
double RigContourMapCalculator::calculateMinValue( const RigContourMapProjection& contourMapProjection,
|
|
const std::vector<std::pair<size_t, double>>& matchingCells,
|
|
const std::vector<double>& gridCellValues )
|
|
{
|
|
double minValue = std::numeric_limits<double>::infinity();
|
|
for ( auto [cellIdx, weight] : matchingCells )
|
|
{
|
|
const auto valueIndex = contourMapProjection.gridResultIndex( cellIdx );
|
|
|
|
// Safety check, should not happen
|
|
if ( valueIndex >= gridCellValues.size() ) continue;
|
|
|
|
double cellValue = gridCellValues[valueIndex];
|
|
minValue = std::min( minValue, cellValue );
|
|
}
|
|
return minValue;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
double RigContourMapCalculator::calculateSum( const RigContourMapProjection& contourMapProjection,
|
|
const std::vector<std::pair<size_t, double>>& matchingCells,
|
|
const std::vector<double>& gridCellValues )
|
|
{
|
|
double sum = 0.0;
|
|
for ( auto [cellIdx, weight] : matchingCells )
|
|
{
|
|
const auto valueIndex = contourMapProjection.gridResultIndex( cellIdx );
|
|
|
|
// Safety check, should not happen
|
|
if ( valueIndex >= gridCellValues.size() ) continue;
|
|
|
|
const double cellValue = gridCellValues[valueIndex];
|
|
if ( std::abs( cellValue ) != std::numeric_limits<double>::infinity() )
|
|
{
|
|
sum += cellValue * weight;
|
|
}
|
|
}
|
|
return sum;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool RigContourMapCalculator::isPointInsidePolygons( cvf::Vec2d point, const std::vector<std::vector<cvf::Vec3d>>& polygons )
|
|
{
|
|
cvf::Vec3d pos3D( point );
|
|
|
|
bool bIncludesCell = false;
|
|
|
|
for ( auto p : polygons )
|
|
{
|
|
if ( !bIncludesCell && RigCellGeometryTools::pointInsidePolygon2D( pos3D, p ) )
|
|
{
|
|
bIncludesCell = true;
|
|
}
|
|
}
|
|
|
|
return bIncludesCell;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::vector<std::vector<std::pair<size_t, double>>>
|
|
RigContourMapCalculator::generateGridMapping( RigContourMapProjection& contourMapProjection,
|
|
const RigContourMapGrid& contourMapGrid,
|
|
ResultAggregationType resultAggregation,
|
|
const std::vector<double>& weightingResultValues,
|
|
const std::set<int>& kLayers,
|
|
const std::vector<std::vector<cvf::Vec3d>>& limitToPolygons )
|
|
{
|
|
int nCells = contourMapGrid.numberOfCells();
|
|
std::vector<std::vector<std::pair<size_t, double>>> projected3dGridIndices( nCells );
|
|
|
|
const bool isSummationResult = RigContourMapCalculator::isStraightSummationResult( resultAggregation );
|
|
const bool usePolygonLimits = !limitToPolygons.empty();
|
|
|
|
#pragma omp parallel for
|
|
for ( int index = 0; index < nCells; ++index )
|
|
{
|
|
cvf::Vec2ui ij = contourMapGrid.ijFromCellIndex( index );
|
|
|
|
cvf::Vec2d globalPos = contourMapGrid.cellCenterPosition( ij.x(), ij.y() ) + contourMapGrid.origin2d();
|
|
|
|
if ( usePolygonLimits )
|
|
{
|
|
if ( !isPointInsidePolygons( globalPos, limitToPolygons ) )
|
|
{
|
|
projected3dGridIndices[index] = {};
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if ( isSummationResult )
|
|
{
|
|
projected3dGridIndices[index] =
|
|
cellRayIntersectionAndResults( contourMapProjection, contourMapGrid, globalPos, weightingResultValues, kLayers );
|
|
}
|
|
else
|
|
{
|
|
projected3dGridIndices[index] =
|
|
cellOverlapVolumesAndResults( contourMapProjection, contourMapGrid, globalPos, weightingResultValues, kLayers );
|
|
}
|
|
}
|
|
return projected3dGridIndices;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::vector<RigContourMapCalculator::CellIndexAndResult>
|
|
RigContourMapCalculator::cellOverlapVolumesAndResults( const RigContourMapProjection& contourMapProjection,
|
|
const RigContourMapGrid& contourMapGrid,
|
|
const cvf::Vec2d& globalPos2d,
|
|
const std::vector<double>& weightingResultValues,
|
|
const std::set<int>& kLayers )
|
|
{
|
|
const cvf::BoundingBox& expandedBoundingBox = contourMapGrid.expandedBoundingBox();
|
|
cvf::Vec3d top2dElementCentroid( globalPos2d, expandedBoundingBox.max().z() );
|
|
cvf::Vec3d bottom2dElementCentroid( globalPos2d, expandedBoundingBox.min().z() );
|
|
cvf::Vec3d planarDiagonalVector( 0.5 * contourMapGrid.sampleSpacing(), 0.5 * contourMapGrid.sampleSpacing(), 0.0 );
|
|
cvf::Vec3d topNECorner = top2dElementCentroid + planarDiagonalVector;
|
|
cvf::Vec3d bottomSWCorner = bottom2dElementCentroid - planarDiagonalVector;
|
|
|
|
cvf::BoundingBox bbox2dElement( bottomSWCorner, topNECorner );
|
|
|
|
std::vector<std::pair<size_t, double>> matchingVisibleCellsAndWeight;
|
|
|
|
// Bounding box has been expanded, so 2d element may be outside actual 3d grid
|
|
if ( !bbox2dElement.intersects( contourMapGrid.originalBoundingBox() ) )
|
|
{
|
|
return matchingVisibleCellsAndWeight;
|
|
}
|
|
|
|
std::vector<size_t> allCellIndices = contourMapProjection.findIntersectingCells( bbox2dElement );
|
|
|
|
std::vector<std::vector<size_t>> kLayerCellIndexVector;
|
|
kLayerCellIndexVector.resize( contourMapProjection.kLayers() );
|
|
|
|
if ( kLayerCellIndexVector.empty() )
|
|
{
|
|
return matchingVisibleCellsAndWeight;
|
|
}
|
|
|
|
auto cellGridIdxVisibility = contourMapProjection.getCellVisibility();
|
|
for ( size_t globalCellIdx : allCellIndices )
|
|
{
|
|
if ( cellGridIdxVisibility.isNull() || ( *cellGridIdxVisibility )[globalCellIdx] )
|
|
{
|
|
auto k = contourMapProjection.kLayer( globalCellIdx );
|
|
if ( !kLayers.empty() )
|
|
{
|
|
if ( !kLayers.contains( (int)k ) ) continue;
|
|
}
|
|
kLayerCellIndexVector[contourMapProjection.kLayer( globalCellIdx )].push_back( globalCellIdx );
|
|
}
|
|
}
|
|
|
|
for ( const auto& kLayerIndices : kLayerCellIndexVector )
|
|
{
|
|
for ( size_t globalCellIdx : kLayerIndices )
|
|
{
|
|
double overlapVolume = contourMapProjection.calculateOverlapVolume( globalCellIdx, bbox2dElement );
|
|
if ( overlapVolume > 0.0 )
|
|
{
|
|
double weight =
|
|
overlapVolume * contourMapProjection.getParameterWeightForCell( contourMapProjection.gridResultIndex( globalCellIdx ),
|
|
weightingResultValues );
|
|
if ( weight > 0.0 )
|
|
{
|
|
matchingVisibleCellsAndWeight.push_back( std::make_pair( globalCellIdx, weight ) );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return matchingVisibleCellsAndWeight;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::vector<RigContourMapCalculator::CellIndexAndResult>
|
|
RigContourMapCalculator::cellRayIntersectionAndResults( const RigContourMapProjection& contourMapProjection,
|
|
const RigContourMapGrid& contourMapGrid,
|
|
const cvf::Vec2d& globalPos2d,
|
|
const std::vector<double>& weightingResultValues,
|
|
const std::set<int>& kLayers )
|
|
{
|
|
std::vector<std::pair<size_t, double>> matchingVisibleCellsAndWeight;
|
|
|
|
const cvf::BoundingBox& expandedBoundingBox = contourMapGrid.expandedBoundingBox();
|
|
|
|
cvf::Vec3d highestPoint( globalPos2d, expandedBoundingBox.max().z() );
|
|
cvf::Vec3d lowestPoint( globalPos2d, expandedBoundingBox.min().z() );
|
|
|
|
// Bounding box has been expanded, so ray may be outside actual 3d grid
|
|
if ( !contourMapGrid.originalBoundingBox().contains( highestPoint ) )
|
|
{
|
|
return matchingVisibleCellsAndWeight;
|
|
}
|
|
|
|
cvf::BoundingBox rayBBox;
|
|
rayBBox.add( highestPoint );
|
|
rayBBox.add( lowestPoint );
|
|
|
|
std::vector<size_t> allCellIndices = contourMapProjection.findIntersectingCells( rayBBox );
|
|
|
|
std::map<size_t, std::vector<size_t>> kLayerIndexMap;
|
|
|
|
auto cellGridIdxVisibility = contourMapProjection.getCellVisibility();
|
|
for ( size_t globalCellIdx : allCellIndices )
|
|
{
|
|
if ( !contourMapProjection.isCellActive( globalCellIdx ) ) continue;
|
|
|
|
if ( cellGridIdxVisibility.isNull() || ( *cellGridIdxVisibility )[globalCellIdx] )
|
|
{
|
|
auto k = contourMapProjection.kLayer( globalCellIdx );
|
|
if ( !kLayers.empty() )
|
|
{
|
|
if ( !kLayers.contains( (int)k ) ) continue;
|
|
}
|
|
kLayerIndexMap[k].push_back( globalCellIdx );
|
|
}
|
|
}
|
|
|
|
for ( const auto& kLayerIndexPair : kLayerIndexMap )
|
|
{
|
|
double weightSumThisKLayer = 0.0;
|
|
std::vector<std::pair<size_t, double>> cellsAndWeightsThisLayer;
|
|
for ( size_t globalCellIdx : kLayerIndexPair.second )
|
|
{
|
|
double lengthInCell = contourMapProjection.calculateRayLengthInCell( globalCellIdx, highestPoint, lowestPoint );
|
|
if ( lengthInCell > 0.0 )
|
|
{
|
|
cellsAndWeightsThisLayer.push_back( std::make_pair( globalCellIdx, lengthInCell ) );
|
|
weightSumThisKLayer += lengthInCell;
|
|
}
|
|
}
|
|
for ( auto& cellWeightPair : cellsAndWeightsThisLayer )
|
|
{
|
|
cellWeightPair.second /= weightSumThisKLayer;
|
|
matchingVisibleCellsAndWeight.push_back( cellWeightPair );
|
|
}
|
|
}
|
|
|
|
return matchingVisibleCellsAndWeight;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool RigContourMapCalculator::isColumnResult( ResultAggregationType aggregationType )
|
|
{
|
|
return aggregationType == OIL_COLUMN || aggregationType == GAS_COLUMN || aggregationType == HYDROCARBON_COLUMN ||
|
|
isMobileColumnResult( aggregationType );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool RigContourMapCalculator::isMeanResult( ResultAggregationType aggregationType )
|
|
{
|
|
return aggregationType == MEAN || aggregationType == HARMONIC_MEAN || aggregationType == GEOMETRIC_MEAN;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool RigContourMapCalculator::isStraightSummationResult( ResultAggregationType aggregationType )
|
|
{
|
|
return isColumnResult( aggregationType ) || aggregationType == SUM;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool RigContourMapCalculator::isMobileColumnResult( ResultAggregationType aggregationType )
|
|
{
|
|
return aggregationType == MOBILE_OIL_COLUMN || aggregationType == MOBILE_GAS_COLUMN || aggregationType == MOBILE_HYDROCARBON_COLUMN;
|
|
}
|