zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve issues relating to compilation with clang-3.5.0

Browse Source
This commit is contained in:
Henry
2014-12-15 22:38:10 +00:00
parent 41368addc9
commit f4596ad247
52 changed files with 413 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sampling/cuttingPlane/cuttingPlane.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// set values for what is close to zero and what is considered to
// Set values for what is close to zero and what is considered to
// be positive (and not just rounding noise)
//! \cond localScope
const Foam::scalar zeroish = Foam::SMALL;
@ -39,7 +39,6 @@ const Foam::scalar positive = Foam::SMALL * 1E3;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Find cut cells
void Foam::cuttingPlane::calcCutCells
(
const primitiveMesh& mesh,
@ -51,7 +50,7 @@ void Foam::cuttingPlane::calcCutCells
const edgeList& edges = mesh.edges();
label listSize = cellEdges.size();
if (&cellIdLabels)
if (notNull(cellIdLabels))
{
listSize = cellIdLabels.size();
}
@ -64,7 +63,8 @@ void Foam::cuttingPlane::calcCutCells
for (label listI = 0; listI < listSize; ++listI)
{
label cellI = listI;
if (&cellIdLabels)
if (notNull(cellIdLabels))
{
cellI = cellIdLabels[listI];
}
@ -100,9 +100,6 @@ void Foam::cuttingPlane::calcCutCells
}
// Determine for each edge the intersection point. Calculates
// - cutPoints_ : coordinates of all intersection points
// - edgePoint : per edge -1 or the index into cutPoints
void Foam::cuttingPlane::intersectEdges
(
const primitiveMesh& mesh,
@ -160,8 +157,6 @@ void Foam::cuttingPlane::intersectEdges
}
// Coming from startEdgeI cross the edge to the other face
// across to the next cut edge.
bool Foam::cuttingPlane::walkCell
(
const primitiveMesh& mesh,
@ -253,7 +248,6 @@ bool Foam::cuttingPlane::walkCell
}
// For every cut cell determine a walk through all? its cuts.
void Foam::cuttingPlane::walkCellCuts
(
const primitiveMesh& mesh,
@ -367,7 +361,6 @@ Foam::cuttingPlane::cuttingPlane
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// recut mesh with existing planeDesc
void Foam::cuttingPlane::reCut
(
const primitiveMesh& mesh,
@ -393,14 +386,13 @@ void Foam::cuttingPlane::reCut
}
// remap action on triangulation
void Foam::cuttingPlane::remapFaces
(
const labelUList& faceMap
)
{
// recalculate the cells cut
if (&faceMap && faceMap.size())
if (notNull(faceMap) && faceMap.size())
{
MeshStorage::remapFaces(faceMap);
@ -413,6 +405,7 @@ void Foam::cuttingPlane::remapFaces
}
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
void Foam::cuttingPlane::operator=(const cuttingPlane& rhs)

4
src/sampling/sampledSurface/sampledPatch/sampledPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -203,7 +203,7 @@ bool Foam::sampledPatch::update()
void Foam::sampledPatch::remapFaces(const labelUList& faceMap)
{
// recalculate the cells cut
if (&faceMap && faceMap.size())
if (notNull(faceMap) && faceMap.size())
{
MeshStorage::remapFaces(faceMap);
patchFaceLabels_ = labelList