COMP: avoid ambiguous construct from tmp - parallel

This commit is contained in:
Mark Olesen
2010-12-17 17:11:57 +01:00
parent fa6b1157f2
commit 8de19df4a7
3 changed files with 6 additions and 8 deletions

View File

@ -59,7 +59,7 @@ void Foam::hierarchGeomDecomp::setDecompOrder()
<< exit(FatalIOError); << exit(FatalIOError);
} }
for (label i = 0; i < 3; i++) for (label i = 0; i < 3; ++i)
{ {
if (order[i] == 'x') if (order[i] == 'x')
{ {
@ -693,8 +693,7 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
slice[i] = i; slice[i] = i;
} }
pointField rotatedPoints = rotDelta_ & points; pointField rotatedPoints(rotDelta_ & points);
// Calculate tolerance of cell distribution. For large cases finding // Calculate tolerance of cell distribution. For large cases finding
// distibution to the cell exact would cause too many iterations so allow // distibution to the cell exact would cause too many iterations so allow
@ -735,7 +734,7 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
slice[i] = i; slice[i] = i;
} }
pointField rotatedPoints = rotDelta_ & points; pointField rotatedPoints(rotDelta_ & points);
// Calculate tolerance of cell distribution. For large cases finding // Calculate tolerance of cell distribution. For large cases finding
// distibution to the cell exact would cause too many iterations so allow // distibution to the cell exact would cause too many iterations so allow
@ -775,6 +774,4 @@ Foam::hierarchGeomDecomp::hierarchGeomDecomp
} }
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* // // ************************************************************************* //

View File

@ -139,7 +139,7 @@ Foam::labelList Foam::simpleGeomDecomp::decompose(const pointField& points)
pointIndices[i] = i; pointIndices[i] = i;
} }
pointField rotatedPoints = rotDelta_ & points; const pointField rotatedPoints(rotDelta_ & points);
// and one to take the processor group id's. For each direction. // and one to take the processor group id's. For each direction.
// we assign the processors to groups of processors labelled // we assign the processors to groups of processors labelled
@ -212,7 +212,7 @@ Foam::labelList Foam::simpleGeomDecomp::decompose
pointIndices[i] = i; pointIndices[i] = i;
} }
pointField rotatedPoints = rotDelta_ & points; const pointField rotatedPoints(rotDelta_ & points);
// and one to take the processor group id's. For each direction. // and one to take the processor group id's. For each direction.
// we assign the processors to groups of processors labelled // we assign the processors to groups of processors labelled

View File

@ -63,6 +63,7 @@ namespace Foam
}; };
} }
const Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3> const Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>
Foam::distributedTriSurfaceMesh::distributionTypeNames_; Foam::distributedTriSurfaceMesh::distributionTypeNames_;