COMP: autoHexMesh: fix pow(int, int) ambiguity

This commit is contained in:
mattijs
2015-12-10 11:25:53 +00:00
parent e2cefb1a10
commit 0ab048e076

View File

@ -546,7 +546,7 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement
// //
// if (cLevel >= minLevel && cLevel < maxLevel) // if (cLevel >= minLevel && cLevel < maxLevel)
// { // {
// scalar cellSize = edge0Len/pow(2, cLevel); // scalar cellSize = edge0Len/pow(2.0, cLevel);
// //
// // Update gap size // // Update gap size
// nearGap[i] = nGapCells*cellSize; // nearGap[i] = nGapCells*cellSize;
@ -687,7 +687,7 @@ Foam::label Foam::meshRefinement::generateRays
if (cLevel >= gapInfo[1] && cLevel < gapInfo[2]) if (cLevel >= gapInfo[1] && cLevel < gapInfo[2])
{ {
scalar cellSize = meshCutter_.level0EdgeLength()/pow(2, cLevel); scalar cellSize = meshCutter_.level0EdgeLength()/pow(2.0, cLevel);
// Calculate gap size // Calculate gap size
scalar nearGap = gapInfo[0]*cellSize; scalar nearGap = gapInfo[0]*cellSize;
@ -803,7 +803,7 @@ Foam::label Foam::meshRefinement::generateRays
if (cLevel >= gapInfo[1] && cLevel < gapInfo[2]) if (cLevel >= gapInfo[1] && cLevel < gapInfo[2])
{ {
scalar cellSize = meshCutter_.level0EdgeLength()/pow(2, cLevel); scalar cellSize = meshCutter_.level0EdgeLength()/pow(2.0, cLevel);
// Calculate gap size // Calculate gap size
scalar nearGap = gapInfo[0]*cellSize; scalar nearGap = gapInfo[0]*cellSize;
@ -1133,7 +1133,7 @@ Foam::label Foam::meshRefinement::markInternalGapRefinement
forAll(cellMap, i) forAll(cellMap, i)
{ {
label cellI = cellMap[i]; label cellI = cellMap[i];
scalar cellSize = edge0Len/pow(2, cellLevel[cellI]); scalar cellSize = edge0Len/pow(2.0, cellLevel[cellI]);
gapSize[i] = shellGapInfo[i][0]*cellSize; gapSize[i] = shellGapInfo[i][0]*cellSize;
} }
@ -1410,7 +1410,8 @@ Foam::label Foam::meshRefinement::markInternalGapRefinement
{ {
// Needed gap size // Needed gap size
label cLevel = cellLevel[cellI]; label cLevel = cellLevel[cellI];
scalar cellSize = meshCutter_.level0EdgeLength()/pow(2, cLevel); scalar cellSize =
meshCutter_.level0EdgeLength()/pow(2.0, cLevel);
scalar neededGapSize = numGapCells[cellI]*cellSize; scalar neededGapSize = numGapCells[cellI]*cellSize;
if (neededGapSize > detectedGapSize[cellI]) if (neededGapSize > detectedGapSize[cellI])