From 8de19df4a795fbe20f7ea9e473bf8585688ceef2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 17 Dec 2010 17:11:57 +0100
Subject: [PATCH] COMP: avoid ambiguous construct from tmp - parallel
---
.../hierarchGeomDecomp/hierarchGeomDecomp.C | 9 +++------
.../simpleGeomDecomp/simpleGeomDecomp.C | 4 ++--
.../distributedTriSurfaceMesh.C | 1 +
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index 921e04d2aa4..a61bc785c10 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -59,7 +59,7 @@ void Foam::hierarchGeomDecomp::setDecompOrder()
<< exit(FatalIOError);
}
- for (label i = 0; i < 3; i++)
+ for (label i = 0; i < 3; ++i)
{
if (order[i] == 'x')
{
@@ -693,8 +693,7 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
slice[i] = i;
}
- pointField rotatedPoints = rotDelta_ & points;
-
+ pointField rotatedPoints(rotDelta_ & points);
// Calculate tolerance of cell distribution. For large cases finding
// distibution to the cell exact would cause too many iterations so allow
@@ -735,7 +734,7 @@ Foam::labelList Foam::hierarchGeomDecomp::decompose
slice[i] = i;
}
- pointField rotatedPoints = rotDelta_ & points;
+ pointField rotatedPoints(rotDelta_ & points);
// Calculate tolerance of cell distribution. For large cases finding
// distibution to the cell exact would cause too many iterations so allow
@@ -775,6 +774,4 @@ Foam::hierarchGeomDecomp::hierarchGeomDecomp
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
index d7f45bb1e73..99e219f5994 100644
--- a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.C
@@ -139,7 +139,7 @@ Foam::labelList Foam::simpleGeomDecomp::decompose(const pointField& points)
pointIndices[i] = i;
}
- pointField rotatedPoints = rotDelta_ & points;
+ const pointField rotatedPoints(rotDelta_ & points);
// and one to take the processor group id's. For each direction.
// we assign the processors to groups of processors labelled
@@ -212,7 +212,7 @@ Foam::labelList Foam::simpleGeomDecomp::decompose
pointIndices[i] = i;
}
- pointField rotatedPoints = rotDelta_ & points;
+ const pointField rotatedPoints(rotDelta_ & points);
// and one to take the processor group id's. For each direction.
// we assign the processors to groups of processors labelled
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 6f1b4f036dc..0043b68af41 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -63,6 +63,7 @@ namespace Foam
};
}
+
const Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>
Foam::distributedTriSurfaceMesh::distributionTypeNames_;
--
GitLab