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

Add ifdefs for OpenMP usage.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-09-11 18:38:39 +02:00
parent 81a93a80fd
commit 02944f4eca
4 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -59,7 +59,10 @@
#include <cmath> // Needed for HUGE_VAL on Linux
#include <iostream>
#include <map>
#ifdef USE_OPENMP
#include <omp.h>
#endif
//--------------------------------------------------------------------------------------------------
/// ECLIPSE cell numbering layout:
@@ -138,7 +141,10 @@ bool transferGridCellData( RigMainGrid* mainGrid,
// Loop over cells and fill them with data
#pragma omp parallel
{
int cellCountPerThread = std::max( 1, cellCount / omp_get_num_threads() );
int cellCountPerThread = cellCount;
#ifdef USE_OPENMP
cellCountPerThread = std::max( 1, cellCount / omp_get_num_threads() );
#endif
int computedThreadCellCount = 0;
@@ -210,13 +216,18 @@ bool transferGridCellData( RigMainGrid* mainGrid,
// if (!invalid && (cell.isInCoarseCell() || (!cell.isActiveInMatrixModel() &&
// !cell.isActiveInFractureModel()) ) )
cell.setInvalid( cell.isLongPyramidCell() );
#ifdef USE_OPENMP
if ( omp_get_thread_num() == 0 )
{
computedThreadCellCount++;
if ( computedThreadCellCount <= maxProgressCell && computedThreadCellCount % cellsPrProgressTick == 0 )
progInfo.incrementProgress();
}
#else
computedThreadCellCount++;
if ( computedThreadCellCount <= maxProgressCell && computedThreadCellCount % cellsPrProgressTick == 0 )
progInfo.incrementProgress();
#endif
}
}
return true;
@@ -1428,7 +1439,7 @@ cvf::Vec3d interpolate3DPosition( const std::vector<SegmentPositionContribution>
// distance = 1.0;
}
distance = 1.0 / distance;
distance = 1.0 / distance;
nominators[i] = distance;
denominator += distance;