Commit cf4bde49 authored by Mark Olesen's avatar Mark Olesen
Browse files

COMP: avoid ambiguous construct from tmp - src/OpenFOAM

parent f883a3f1
......@@ -318,8 +318,6 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
Field<Type>& result = tresult();
const pointField& points = patch_.localPoints();
const faceList& faces = patch_.localFaces();
const edgeList& edges = patch_.edges();
const labelListList& edgeFaces = patch_.edgeFaces();
......
......@@ -419,11 +419,19 @@ Foam::label Foam::cyclicPolyPatch::getConsistentRotationFace
const pointField& faceCentres
) const
{
const scalarField magRadSqr =
magSqr((faceCentres - rotationCentre_) ^ rotationAxis_);
scalarField axisLen = (faceCentres - rotationCentre_) & rotationAxis_;
axisLen = axisLen - min(axisLen);
const scalarField magLenSqr = magRadSqr + axisLen*axisLen;
const scalarField magRadSqr
(
magSqr((faceCentres - rotationCentre_) ^ rotationAxis_)
);
scalarField axisLen
(
(faceCentres - rotationCentre_) & rotationAxis_
);
axisLen -= min(axisLen);
const scalarField magLenSqr
(
magRadSqr + axisLen*axisLen
);
label rotFace = -1;
scalar maxMagLenSqr = -GREAT;
......
......@@ -538,11 +538,19 @@ Foam::label Foam::oldCyclicPolyPatch::getConsistentRotationFace
const pointField& faceCentres
) const
{
const scalarField magRadSqr =
magSqr((faceCentres - rotationCentre_) ^ rotationAxis_);
scalarField axisLen = (faceCentres - rotationCentre_) & rotationAxis_;
const scalarField magRadSqr
(
magSqr((faceCentres - rotationCentre_) ^ rotationAxis_)
);
scalarField axisLen
(
(faceCentres - rotationCentre_) & rotationAxis_
);
axisLen = axisLen - min(axisLen);
const scalarField magLenSqr = magRadSqr + axisLen*axisLen;
const scalarField magLenSqr
(
magRadSqr + axisLen*axisLen
);
label rotFace = -1;
scalar maxMagLenSqr = -GREAT;
......
......@@ -302,7 +302,7 @@ bool Foam::primitiveMesh::checkFaceAreas
<< "checking face area magnitudes" << endl;
}
const scalarField magFaceAreas = mag(faceAreas());
const scalarField magFaceAreas(mag(faceAreas()));
scalar minArea = GREAT;
scalar maxArea = -GREAT;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment