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

Fixed compiler warnings for variables declared outside an OpenMP loop

Browse Source
This commit is contained in:
Magne Sjaastad 2016-08-11 15:30:55 +02:00
parent d9973743ee
commit 541c770b80
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ModelVisualization/RivCrossSectionPartMgr.cpp
View File

@ -250,16 +250,13 @@ void RivCrossSectionPartMgr::calculateEclipseTextureCoordinates(cvf::Vec2fArray*
textureCoords->resize(numVertices);
cvf::Vec2f* rawPtr = textureCoords->ptr();
double cellScalarValue;
cvf::Vec2f texCoord;
int triangleCount = static_cast<int>(triangleToCellIdxMap.size());
#pragma omp parallel for private(texCoord, cellScalarValue)
#pragma omp parallel for
for (int tIdx = 0; tIdx < triangleCount; tIdx++)
{
cellScalarValue = resultAccessor->cellScalarGlobIdx(triangleToCellIdxMap[tIdx]);
texCoord = mapper->mapToTextureCoord(cellScalarValue);
double cellScalarValue = resultAccessor->cellScalarGlobIdx(triangleToCellIdxMap[tIdx]);
cvf::Vec2f texCoord = mapper->mapToTextureCoord(cellScalarValue);
if (cellScalarValue == HUGE_VAL || cellScalarValue != cellScalarValue) // a != a is true for NAN's
{
texCoord[1] = 1.0f;

9
ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp
View File

@ -159,14 +159,11 @@ void RivNNCGeometryGenerator::textureCoordinates(cvf::Vec2fArray* textureCoords,
return;
}
double cellScalarValue;
cvf::Vec2f texCoord;
#pragma omp parallel for private(texCoord, cellScalarValue)
#pragma omp parallel for
for (int tIdx = 0; tIdx < static_cast<int>(m_triangleIndexToNNCIndex->size()); tIdx++)
{
cellScalarValue = (*nncResultVals)[(*m_triangleIndexToNNCIndex)[tIdx]];
texCoord = mapper->mapToTextureCoord(cellScalarValue);
double cellScalarValue = (*nncResultVals)[(*m_triangleIndexToNNCIndex)[tIdx]];
cvf::Vec2f texCoord = mapper->mapToTextureCoord(cellScalarValue);
if (cellScalarValue == HUGE_VAL || cellScalarValue != cellScalarValue) // a != a is true for NAN's
{
texCoord[1] = 1.0f;

9
ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
View File

@ -138,17 +138,14 @@ void RivTernaryTextureCoordsCreator::createTextureCoords(
quadTextureCoords->resize(numVertices);
cvf::Vec2f* rawPtr = quadTextureCoords->ptr();
cvf::Vec2d resultValue;
cvf::Vec2f texCoord;
#pragma omp parallel for private(texCoord, resultValue)
#pragma omp parallel for
for (int i = 0; i < static_cast<int>(quadMapper->quadCount()); i++)
{
cvf::StructGridInterface::FaceType faceId = quadMapper->cellFace(i);
size_t cellIdx = quadMapper->cellIndex(i);
resultValue = resultAccessor->cellFaceScalar(cellIdx, faceId);
texCoord = texMapper->getTexCoord(resultValue.x(), resultValue.y(), cellIdx);
cvf::Vec2d resultValue = resultAccessor->cellFaceScalar(cellIdx, faceId);
cvf::Vec2f texCoord = texMapper->getTexCoord(resultValue.x(), resultValue.y(), cellIdx);
size_t j;
for (j = 0; j < 4; j++)