Skip to content

Commit

Permalink
clang again
Browse files Browse the repository at this point in the history
  • Loading branch information
jonjenssen committed Jan 13, 2025
1 parent 9998404 commit 5cb6ecc
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions ApplicationLibCode/ProjectDataModel/RimStatisticsContourMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,9 @@ void RimStatisticsContourMap::doStatisticsCalculation( std::map<size_t, std::vec
std::vector<double> maxResults( nCells, std::numeric_limits<double>::infinity() );

const size_t numSamples = res.size();

#ifndef __clang__
#pragma omp parallel for
#endif
for ( int i = 0; i < nCells; i++ )
{
std::vector<double> samples( numSamples, 0.0 );
Expand Down Expand Up @@ -390,19 +391,11 @@ void RimStatisticsContourMap::computeStatistics()
cvf::BoundingBox gridBoundingBox = eclipseCase()->activeCellsBoundingBox();
gridBoundingBox.expandPercent( m_boundingBoxExpPercent() );

auto computeSampleSpacing = []( auto ec, double relativeSampleSpacing )
double sampleSpacing = 1.0;
if ( auto mainGrid = eclipseCase()->mainGrid() )
{
if ( ec )
{
if ( auto mainGrid = ec->mainGrid() )
{
return relativeSampleSpacing * mainGrid->characteristicIJCellSize();
}
}
return 0.0;
};

double sampleSpacing = computeSampleSpacing( eclipseCase(), m_relativeSampleSpacing() );
sampleSpacing = m_relativeSampleSpacing * mainGrid->characteristicIJCellSize();
}

auto contourMapGrid = std::make_unique<RigContourMapGrid>( gridBoundingBox, sampleSpacing );

Expand Down

0 comments on commit 5cb6ecc

Please sign in to comment.