zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve warning messages generated by Clang-15

Browse Source
This commit is contained in:
Will Bainbridge
2023-01-03 10:11:16 +00:00
parent b082f06ac0
commit 20c7c7c21a
25 changed files with 79 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseMixture/compressibleMultiphaseMixture.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -463,9 +463,6 @@ void Foam::compressibleMultiphaseMixture::solveAlphas
const scalar cAlpha const scalar cAlpha
) )
{ {
static label nSolves=-1;
nSolves++;
word alphaScheme("div(phi,alpha)"); word alphaScheme("div(phi,alpha)");
word alpharScheme("div(phirb,alpha)"); word alpharScheme("div(phirb,alpha)");

5
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -441,9 +441,6 @@ void Foam::multiphaseMixture::solveAlphas
const scalar cAlpha const scalar cAlpha
) )
{ {
static label nSolves=-1;
nSolves++;
word alphaScheme("div(phi,alpha)"); word alphaScheme("div(phi,alpha)");
word alpharScheme("div(phirb,alpha)"); word alpharScheme("div(phirb,alpha)");

6
applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
View File

@ -42,8 +42,6 @@ for (label i=0; i<nPoints; i++)
labelList i1tab(nPoints), i3tab(nPoints), i8tab(nPoints), idreg(nPoints), labelList i1tab(nPoints), i3tab(nPoints), i8tab(nPoints), idreg(nPoints),
f(nPoints), bcl(nPoints), bcf(nPoints), bcb(nPoints); f(nPoints), bcl(nPoints), bcf(nPoints), bcb(nPoints);
label nBfaces = 0;
for (label i=0; i<nPoints; i++) for (label i=0; i<nPoints; i++)
{ {
label i1, i3, i8; label i1, i3, i8;
@ -64,10 +62,6 @@ for (label i=0; i<nPoints; i++)
bcl[i] = label(fbcl); bcl[i] = label(fbcl);
bcf[i] = label(fbcf); bcf[i] = label(fbcf);
bcb[i] = label(fbcb); bcb[i] = label(fbcb);
if (bcl[i] > 0 && bcl[i] != 4) nBfaces++;
if (bcf[i] > 0 && bcf[i] != 4) nBfaces++;
if (bcb[i] > 0 && bcb[i] != 4) nBfaces++;
} }

5
applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -61,8 +61,6 @@ void writeOBJ(const point& pt, Ostream& os)
// All edges of mesh // All edges of mesh
void writePoints(const polyMesh& mesh, const fileName& timeName) void writePoints(const polyMesh& mesh, const fileName& timeName)
{ {
label vertI = 0;
fileName pointFile(mesh.time().path()/"meshPoints_" + timeName + ".obj"); fileName pointFile(mesh.time().path()/"meshPoints_" + timeName + ".obj");
Info<< "Writing mesh points and edges to " << pointFile << endl; Info<< "Writing mesh points and edges to " << pointFile << endl;
@ -72,7 +70,6 @@ void writePoints(const polyMesh& mesh, const fileName& timeName)
forAll(mesh.points(), pointi) forAll(mesh.points(), pointi)
{ {
writeOBJ(mesh.points()[pointi], pointStream); writeOBJ(mesh.points()[pointi], pointStream);
vertI++;
} }
forAll(mesh.edges(), edgeI) forAll(mesh.edges(), edgeI)

20
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -169,23 +169,14 @@ template<class Triangulation>
void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
{ {
label nInternal = 0; label nInternal = 0;
label nInternalRef = 0;
label nUnassigned = 0; label nUnassigned = 0;
label nUnassignedRef = 0;
label nInternalNearBoundary = 0; label nInternalNearBoundary = 0;
label nInternalNearBoundaryRef = 0;
label nInternalSurface = 0; label nInternalSurface = 0;
label nInternalSurfaceRef = 0;
label nInternalFeatureEdge = 0; label nInternalFeatureEdge = 0;
label nInternalFeatureEdgeRef = 0;
label nInternalFeaturePoint = 0; label nInternalFeaturePoint = 0;
label nInternalFeaturePointRef = 0;
label nExternalSurface = 0; label nExternalSurface = 0;
label nExternalSurfaceRef = 0;
label nExternalFeatureEdge = 0; label nExternalFeatureEdge = 0;
label nExternalFeatureEdgeRef = 0;
label nExternalFeaturePoint = 0; label nExternalFeaturePoint = 0;
label nExternalFeaturePointRef = 0;
label nFar = 0; label nFar = 0;
label nReferred = 0; label nReferred = 0;
@ -201,7 +192,6 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (vit->referred()) if (vit->referred())
{ {
nReferred++; nReferred++;
nInternalRef++;
} }
nInternal++; nInternal++;
@ -211,7 +201,6 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (vit->referred()) if (vit->referred())
{ {
nReferred++; nReferred++;
nUnassignedRef++;
} }
nUnassigned++; nUnassigned++;
@ -221,7 +210,6 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (vit->referred()) if (vit->referred())
{ {
nReferred++; nReferred++;
nInternalNearBoundaryRef++;
} }
nInternalNearBoundary++; nInternalNearBoundary++;
@ -231,7 +219,6 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (vit->referred()) if (vit->referred())
{ {
nReferred++; nReferred++;
nInternalSurfaceRef++;
} }
nInternalSurface++; nInternalSurface++;
@ -241,7 +228,6 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (vit->referred()) if (vit->referred())
{ {
nReferred++; nReferred++;
nInternalFeatureEdgeRef++;
} }
nInternalFeatureEdge++; nInternalFeatureEdge++;
@ -251,7 +237,6 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (vit->referred()) if (vit->referred())
{ {
nReferred++; nReferred++;
nInternalFeaturePointRef++;
} }
nInternalFeaturePoint++; nInternalFeaturePoint++;
@ -261,7 +246,6 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (vit->referred()) if (vit->referred())
{ {
nReferred++; nReferred++;
nExternalSurfaceRef++;
} }
nExternalSurface++; nExternalSurface++;
@ -271,7 +255,6 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (vit->referred()) if (vit->referred())
{ {
nReferred++; nReferred++;
nExternalFeatureEdgeRef++;
} }
nExternalFeatureEdge++; nExternalFeatureEdge++;
@ -281,7 +264,6 @@ void Foam::DelaunayMesh<Triangulation>::printVertexInfo(Ostream& os) const
if (vit->referred()) if (vit->referred())
{ {
nReferred++; nReferred++;
nExternalFeaturePointRef++;
} }
nExternalFeaturePoint++; nExternalFeaturePoint++;

5
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -911,8 +911,6 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
typename Triangulation::Locate_type lt; typename Triangulation::Locate_type lt;
int li, lj; int li, lj;
label nNotInserted = 0;
labelPairHashSet uninserted labelPairHashSet uninserted
( (
Triangulation::number_of_vertices() Triangulation::number_of_vertices()
@ -1037,7 +1035,6 @@ Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
else else
{ {
uninserted.insert(labelPair(vert.procIndex(), vert.index())); uninserted.insert(labelPair(vert.procIndex(), vert.index()));
nNotInserted++;
} }
} }

49
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -183,52 +183,21 @@ Foam::tensor Foam::cellShapeControl::cellAlignment(const point& pt) const
} }
else else
{ {
label nFarPoints = 0; triad tri;
for (label pI = 0; pI < 4; ++pI) for (label pI = 0; pI < 4; ++pI)
{ {
if (ch->vertex(pI)->farPoint()) if (bary[pI] > small)
{ {
nFarPoints++; tri += triad(bary[pI]*ch->vertex(pI)->alignment());
} }
} }
// if (nFarPoints != 0) tri.normalise();
// { tri.orthogonalise();
// for (label pI = 0; pI < 4; ++pI) tri = tri.sortxyz();
// {
// if (!ch->vertex(pI)->farPoint())
// {
// alignment = ch->vertex(pI)->alignment();
// }
// }
// }
// else
{
triad tri;
for (label pI = 0; pI < 4; ++pI) alignment = tri;
{
if (bary[pI] > small)
{
tri += triad(bary[pI]*ch->vertex(pI)->alignment());
}
}
tri.normalise();
tri.orthogonalise();
tri = tri.sortxyz();
alignment = tri;
}
// cellShapeControlMesh::Vertex_handle nearV =
// shapeControlMesh_.nearest_vertex_in_cell
// (
// toPoint<cellShapeControlMesh::Point>(pt),
// ch
// );
//
// alignment = nearV->alignment();
} }
return alignment; return alignment;

11
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -79,16 +79,9 @@ bool Foam::controlMeshRefinement::detectEdge
Foam::point midPoint = (a + b)/2.0; Foam::point midPoint = (a + b)/2.0;
label nIterations = 0;
while (true) while (true)
{ {
nIterations++; if (magSqr(a - b) < tolSqr)
if
(
magSqr(a - b) < tolSqr
)
{ {
pointFound.setPoint(midPoint); pointFound.setPoint(midPoint);
pointFound.setHit(); pointFound.setHit();

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -72,8 +72,6 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
return false; return false;
} }
label nVert = foamyHexMesh_.number_of_vertices();
const label initialNumOfPoints = pts.size(); const label initialNumOfPoints = pts.size();
const scalar ppDist = foamyHexMesh_.pointPairDistance(featPt); const scalar ppDist = foamyHexMesh_.pointPairDistance(featPt);
@ -267,7 +265,6 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
for (label i = 0; i < 2; ++i) for (label i = 0; i < 2; ++i)
{ {
pts.remove(); pts.remove();
nVert--;
} }
return false; return false;
@ -504,8 +501,6 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
return false; return false;
} }
label nVert = foamyHexMesh_.number_of_vertices();
const label initialNumOfPoints = pts.size(); const label initialNumOfPoints = pts.size();
const scalar ppDist = foamyHexMesh_.pointPairDistance(featPt); const scalar ppDist = foamyHexMesh_.pointPairDistance(featPt);
@ -703,7 +698,6 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
for (label i = 0; i < 2; ++i) for (label i = 0; i < 2; ++i)
{ {
pts.remove(); pts.remove();
nVert--;
} }
return false; return false;

4
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertSurfaceNearestPointPairs.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -122,12 +122,10 @@ void Foam::CV2D::insertPointPairs
if (meshControls().objOutput()) if (meshControls().objOutput())
{ {
OFstream str(fName); OFstream str(fName);
label vertI = 0;
forAll(surfacePoints, ppi) forAll(surfacePoints, ppi)
{ {
meshTools::writeOBJ(str, toPoint3D(surfacePoints[ppi])); meshTools::writeOBJ(str, toPoint3D(surfacePoints[ppi]));
vertI++;
} }
Info<< "insertPointPairs: Written " << surfacePoints.size() Info<< "insertPointPairs: Written " << surfacePoints.size()

2
applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_gold_part_build_info.H
View File

@ -8,7 +8,7 @@ int USERD_get_gold_part_build_info
char *part_descriptions[Z_BUFL], char *part_descriptions[Z_BUFL],
int *number_of_nodes, int *number_of_nodes,
int *number_of_elements[Z_MAXTYPE], int *number_of_elements[Z_MAXTYPE],
int *ijk_dimensions[3], int *ijk_dimensions[9],
int *iblanking_options[6] int *iblanking_options[6]
) )
{ {

6
applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -114,9 +114,10 @@ void Foam::writeVTKFields
forAll(values, fieldi) forAll(values, fieldi)
{ {
Info<< " writing field " << fieldNames[fieldi] << endl; Info<< " writing field " << fieldNames[fieldi] << endl;
os << nl << fieldNames[fieldi] << ' ' << pTraits<Type>::nComponents os << nl << fieldNames[fieldi] << ' ' << pTraits<Type>::nComponents
<< ' ' << values[fieldi].size() << " float" << nl; << ' ' << values[fieldi].size() << " float" << nl;
label offset = 0;
forAll(addr, trackI) forAll(addr, trackI)
{ {
const List<label> ids(addr[trackI]); const List<label> ids(addr[trackI]);
@ -135,7 +136,6 @@ void Foam::writeVTKFields
os << ' '; os << ' ';
} }
} }
offset += ids.size();
} }
} }
} }

4
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -645,7 +645,6 @@ int main(int argc, char *argv[])
label nIntOrExt = 0; label nIntOrExt = 0;
label nFlat = 0; label nFlat = 0;
label nOpen = 0; label nOpen = 0;
label nMultiple = 0;
forAll(edgeNormals, eI) forAll(edgeNormals, eI)
{ {
@ -671,7 +670,6 @@ int main(int argc, char *argv[])
} }
else if (nEdNorms > 2) else if (nEdNorms > 2)
{ {
nMultiple++;
} }
} }

14
applications/utilities/surface/surfaceClean/collapseBase.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -776,8 +776,6 @@ label collapseBase
{ {
label nTotalSplit = 0; label nTotalSplit = 0;
label iter = 0;
while (true) while (true)
{ {
// Detect faces to collapse // Detect faces to collapse
@ -971,17 +969,7 @@ label collapseBase
// Pack the triangles // Pack the triangles
newTris.shrink(); newTris.shrink();
// Pout<< "Resetting surface from " << surf.size() << " to "
// << newTris.size() << " triangles" << endl;
surf = triSurface(newTris, surf.patches(), surf.localPoints()); surf = triSurface(newTris, surf.patches(), surf.localPoints());
//{
// fileName fName("bla" + name(iter) + ".obj");
// Pout<< "Writing surf to " << fName << endl;
// surf.write(fName);
//}
iter++;
} }
// Remove any unused vertices // Remove any unused vertices

10
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -202,9 +202,6 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
boolList& faceFlipMap = faceFlipMap_[fineLevelIndex]; boolList& faceFlipMap = faceFlipMap_[fineLevelIndex];
label nFlipped = 0;
label nDissapear = 0;
forAll(faceRestrictAddr, fineFacei) forAll(faceRestrictAddr, fineFacei)
{ {
label coarseFacei = faceRestrictAddr[fineFacei]; label coarseFacei = faceRestrictAddr[fineFacei];
@ -221,7 +218,6 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
if (cOwn == rmUpperAddr && cNei == rmLowerAddr) if (cOwn == rmUpperAddr && cNei == rmLowerAddr)
{ {
faceFlipMap[fineFacei] = true; faceFlipMap[fineFacei] = true;
nFlipped++;
} }
else if (cOwn == rmLowerAddr && cNei == rmUpperAddr) else if (cOwn == rmLowerAddr && cNei == rmUpperAddr)
{ {
@ -240,10 +236,6 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
<< exit(FatalError); << exit(FatalError);
} }
} }
else
{
nDissapear++;
}
} }

14
src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -2458,7 +2458,6 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
globalIndex globalPPoints(meshPoints.size()); globalIndex globalPPoints(meshPoints.size());
labelList patchToCoupled(meshPoints.size(), -1); labelList patchToCoupled(meshPoints.size(), -1);
label nCoupled = 0;
labelList coupledToGlobalPatch(pointSlavesMap.constructSize(), -1); labelList coupledToGlobalPatch(pointSlavesMap.constructSize(), -1);
// Note: loop over patch since usually smaller // Note: loop over patch since usually smaller
@ -2472,14 +2471,9 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
{ {
patchToCoupled[patchPointi] = iter(); patchToCoupled[patchPointi] = iter();
coupledToGlobalPatch[iter()] = globalPPoints.toGlobal(patchPointi); coupledToGlobalPatch[iter()] = globalPPoints.toGlobal(patchPointi);
nCoupled++;
} }
} }
// Pout<< "Patch:" << nl
// << " points:" << meshPoints.size() << nl
// << " of which on coupled patch:" << nCoupled << endl;
// Determine master of connected points // Determine master of connected points
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -2560,12 +2554,6 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
autoPtr<globalIndex> globalPointsPtr(new globalIndex(nMasters)); autoPtr<globalIndex> globalPointsPtr(new globalIndex(nMasters));
// Pout<< "Patch:" << nl
// << " points:" << meshPoints.size() << nl
// << " of which on coupled patch:" << nCoupled << nl
// << " of which master:" << nMasters << endl;
// Push back compact numbering for master point onto slaves // Push back compact numbering for master point onto slaves
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

5
src/conversion/meshReader/starcd/STARCDMeshReader.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -633,7 +633,7 @@ etc,
void Foam::meshReaders::STARCD::readBoundary(const fileName& inputName) void Foam::meshReaders::STARCD::readBoundary(const fileName& inputName)
{ {
const word fileSignature = "PROSTAR_BOUNDARY"; const word fileSignature = "PROSTAR_BOUNDARY";
label nPatches = 0, nFaces = 0, nBafflePatches = 0, maxId = 0; label nPatches = 0, nBafflePatches = 0, maxId = 0;
label lineLabel, starCellId, cellFaceId, starRegion, configNumber; label lineLabel, starCellId, cellFaceId, starRegion, configNumber;
word patchType; word patchType;
@ -672,7 +672,6 @@ void Foam::meshReaders::STARCD::readBoundary(const fileName& inputName)
while ((is >> lineLabel).good()) while ((is >> lineLabel).good())
{ {
nFaces++;
is >> starCellId is >> starCellId
>> cellFaceId >> cellFaceId
>> starRegion >> starRegion

6
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -457,8 +457,6 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::fvMeshDistribute::deleteProcPatches
// or new patchID // or new patchID
labelList newPatchID(mesh_.nFaces() - mesh_.nInternalFaces(), -1); labelList newPatchID(mesh_.nFaces() - mesh_.nInternalFaces(), -1);
label nProcPatches = 0;
forAll(mesh_.boundaryMesh(), patchi) forAll(mesh_.boundaryMesh(), patchi)
{ {
const polyPatch& pp = mesh_.boundaryMesh()[patchi]; const polyPatch& pp = mesh_.boundaryMesh()[patchi];
@ -478,8 +476,6 @@ Foam::autoPtr<Foam::polyTopoChangeMap> Foam::fvMeshDistribute::deleteProcPatches
{ {
newPatchID[offset+i] = destinationPatch; newPatchID[offset+i] = destinationPatch;
} }
nProcPatches++;
} }
} }

6
src/finiteVolume/cfdTools/general/MRF/MRFZone.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -67,14 +67,11 @@ void Foam::MRFZone::setMRFFaces()
zoneCell[cellLabels[i]] = true; zoneCell[cellLabels[i]] = true;
} }
label nZoneFaces = 0;
for (label facei = 0; facei < mesh_.nInternalFaces(); facei++) for (label facei = 0; facei < mesh_.nInternalFaces(); facei++)
{ {
if (zoneCell[own[facei]] || zoneCell[nei[facei]]) if (zoneCell[own[facei]] || zoneCell[nei[facei]])
{ {
faceInMRF[facei] = true; faceInMRF[facei] = true;
nZoneFaces++;
} }
} }
@ -91,7 +88,6 @@ void Foam::MRFZone::setMRFFaces()
if (zoneCell[own[facei]]) if (zoneCell[own[facei]])
{ {
faceInMRF[facei] = true; faceInMRF[facei] = true;
nZoneFaces++;
} }
} }
} }

22
src/finiteVolume/finiteVolume/fvc/fvcDdt.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -192,7 +192,7 @@ ddt
template<class Type> template<class Type>
tmp<SurfaceField<typename flux<Type>::type>> ddtCorr tmp<SurfaceField<typename Foam::flux<Type>::type>> ddtCorr
( (
const VolField<Type>& U, const VolField<Type>& U,
const SurfaceField<Type>& Uf const SurfaceField<Type>& Uf
@ -207,10 +207,10 @@ tmp<SurfaceField<typename flux<Type>::type>> ddtCorr
template<class Type> template<class Type>
tmp<SurfaceField<typename flux<Type>::type>> ddtCorr tmp<SurfaceField<typename Foam::flux<Type>::type>> ddtCorr
( (
const VolField<Type>& U, const VolField<Type>& U,
const SurfaceField<typename flux<Type>::type>& phi const SurfaceField<typename Foam::flux<Type>::type>& phi
) )
{ {
return fv::ddtScheme<Type>::New return fv::ddtScheme<Type>::New
@ -222,10 +222,10 @@ tmp<SurfaceField<typename flux<Type>::type>> ddtCorr
template<class Type> template<class Type>
tmp<SurfaceField<typename flux<Type>::type>> ddtCorr tmp<SurfaceField<typename Foam::flux<Type>::type>> ddtCorr
( (
const VolField<Type>& U, const VolField<Type>& U,
const SurfaceField<typename flux<Type>::type>& phi, const SurfaceField<typename Foam::flux<Type>::type>& phi,
const autoPtr<SurfaceField<Type>>& Uf const autoPtr<SurfaceField<Type>>& Uf
) )
{ {
@ -241,7 +241,7 @@ tmp<SurfaceField<typename flux<Type>::type>> ddtCorr
template<class Type> template<class Type>
tmp<SurfaceField<typename flux<Type>::type>> ddtCorr tmp<SurfaceField<typename Foam::flux<Type>::type>> ddtCorr
( (
const volScalarField& rho, const volScalarField& rho,
const VolField<Type>& U, const VolField<Type>& U,
@ -257,11 +257,11 @@ tmp<SurfaceField<typename flux<Type>::type>> ddtCorr
template<class Type> template<class Type>
tmp<SurfaceField<typename flux<Type>::type>> ddtCorr tmp<SurfaceField<typename Foam::flux<Type>::type>> ddtCorr
( (
const volScalarField& rho, const volScalarField& rho,
const VolField<Type>& U, const VolField<Type>& U,
const SurfaceField<typename flux<Type>::type>& phi const SurfaceField<typename Foam::flux<Type>::type>& phi
) )
{ {
return fv::ddtScheme<Type>::New return fv::ddtScheme<Type>::New
@ -273,11 +273,11 @@ tmp<SurfaceField<typename flux<Type>::type>> ddtCorr
template<class Type> template<class Type>
tmp<SurfaceField<typename flux<Type>::type>> ddtCorr tmp<SurfaceField<typename Foam::flux<Type>::type>> ddtCorr
( (
const volScalarField& rho, const volScalarField& rho,
const VolField<Type>& U, const VolField<Type>& U,
const SurfaceField<typename flux<Type>::type>& phi, const SurfaceField<typename Foam::flux<Type>::type>& phi,
const autoPtr<SurfaceField<Type>>& Uf const autoPtr<SurfaceField<Type>>& Uf
) )
{ {

5
src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -443,7 +443,6 @@ bool Foam::functionObjects::regionSizeDistribution::write()
// Determine blocked faces // Determine blocked faces
boolList blockedFace(mesh_.nFaces(), false); boolList blockedFace(mesh_.nFaces(), false);
label nBlocked = 0;
{ {
for (label facei = 0; facei < mesh_.nInternalFaces(); facei++) for (label facei = 0; facei < mesh_.nInternalFaces(); facei++)
@ -458,7 +457,6 @@ bool Foam::functionObjects::regionSizeDistribution::write()
) )
{ {
blockedFace[facei] = true; blockedFace[facei] = true;
nBlocked++;
} }
} }
@ -487,7 +485,6 @@ bool Foam::functionObjects::regionSizeDistribution::write()
) )
{ {
blockedFace[start+i] = true; blockedFace[start+i] = true;
nBlocked++;
} }
} }
} }

8
src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -1831,14 +1831,11 @@ Foam::label Foam::meshRefinement::markPatchZones
// Protect all non-manifold edges // Protect all non-manifold edges
{ {
label nProtected = 0;
forAll(nMasterFacesPerEdge, edgei) forAll(nMasterFacesPerEdge, edgei)
{ {
if (nMasterFacesPerEdge[edgei] > 2) if (nMasterFacesPerEdge[edgei] > 2)
{ {
allEdgeInfo[edgei] = -2; allEdgeInfo[edgei] = -2;
nProtected++;
} }
} }
} }
@ -1989,8 +1986,6 @@ void Foam::meshRefinement::consistentOrientation
// - slaves of coupled faces // - slaves of coupled faces
// - non-manifold edges // - non-manifold edges
{ {
label nProtected = 0;
forAll(patch.addressing(), facei) forAll(patch.addressing(), facei)
{ {
const label meshFacei = patch.addressing()[facei]; const label meshFacei = patch.addressing()[facei];
@ -2005,7 +2000,6 @@ void Foam::meshRefinement::consistentOrientation
{ {
// Slave side. Mark so doesn't get visited. // Slave side. Mark so doesn't get visited.
allFaceInfo[facei] = orientedSurface::NOFLIP; allFaceInfo[facei] = orientedSurface::NOFLIP;
nProtected++;
} }
} }
} }

91
src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -714,7 +714,6 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
// Get number of anchor points (pointLevel <= cellLevel) // Get number of anchor points (pointLevel <= cellLevel)
label nBoundaryAnchors = 0; label nBoundaryAnchors = 0;
label nNonAnchorBoundary = 0;
label nonBoundaryAnchor = -1; label nonBoundaryAnchor = -1;
forAll(cPoints, i) forAll(cPoints, i)
@ -734,74 +733,52 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
nonBoundaryAnchor = pointi; nonBoundaryAnchor = pointi;
} }
} }
else if (isBoundaryPoint[pointi])
{
nNonAnchorBoundary++;
}
} }
if (nBoundaryAnchors == 8) if (nBoundaryAnchors == 8)
{ {
const cell& cFaces = mesh_.cells()[celli]; const cell& cFaces = mesh_.cells()[celli];
// Count boundary faces. if
label nBfaces = 0; (
checkCollapse
forAll(cFaces, cFacei) && !isCollapsedCell(newPoints, volFraction, celli)
)
{ {
if (isBoundaryFace[cFaces[cFacei]]) nPrevented++;
{
nBfaces++; // Pout<< "Preventing baffling/removal of 8 anchor point"
} // << " cell "
// << celli << " at " << mesh_.cellCentres()[celli]
// << " since new volume "
// << mesh_.cells()[celli].mag(newPoints, mesh_.faces())
// << " old volume " << mesh_.cellVolumes()[celli]
// << endl;
} }
else
// If nBfaces > 1 make all non-boundary non-baffle faces baffles.
// We assume that this situation is where there is a single
// cell sticking out which would get flattened.
// Eugene: delete cell no matter what.
// if (nBfaces > 1)
{ {
if // Block all faces of cell
( forAll(cFaces, cf)
checkCollapse
&& !isCollapsedCell(newPoints, volFraction, celli)
)
{ {
nPrevented++; const label facei = cFaces[cf];
// Pout<< "Preventing baffling/removal of 8 anchor point"
// << " cell " if
// << celli << " at " << mesh_.cellCentres()[celli] (
// << " since new volume " facePatch[facei] == -1
// << mesh_.cells()[celli].mag(newPoints, mesh_.faces()) && mesh_.isInternalFace(facei)
// << " old volume " << mesh_.cellVolumes()[celli] )
// << endl;
}
else
{
// Block all faces of cell
forAll(cFaces, cf)
{ {
const label facei = cFaces[cf]; facePatch[facei] = nearestAdaptPatch[facei];
nBaffleFaces++;
if // Mark face as a 'boundary'
markBoundaryFace
( (
facePatch[facei] == -1 facei,
&& mesh_.isInternalFace(facei) isBoundaryFace,
) isBoundaryEdge,
{ isBoundaryPoint
facePatch[facei] = nearestAdaptPatch[facei]; );
nBaffleFaces++;
// Mark face as a 'boundary'
markBoundaryFace
(
facei,
isBoundaryFace,
isBoundaryEdge,
isBoundaryPoint
);
}
} }
} }
} }

4
src/meshTools/regionSplit/localPointRegion.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -514,7 +514,6 @@ Foam::labelList Foam::localPointRegion::findDuplicateFaces
); );
labelList duplicateFace(allPatch.size(), -1); labelList duplicateFace(allPatch.size(), -1);
label nDuplicateFaces = 0;
// Find all duplicate faces. // Find all duplicate faces.
forAll(allPatch, bFacei) forAll(allPatch, bFacei)
@ -569,7 +568,6 @@ Foam::labelList Foam::localPointRegion::findDuplicateFaces
duplicateFace[bFacei] = otherFacei; duplicateFace[bFacei] = otherFacei;
duplicateFace[otherFacei] = bFacei; duplicateFace[otherFacei] = bFacei;
nDuplicateFaces++;
} }
} }
} }

4
src/meshTools/sets/cellSources/regionToCell/regionToCell.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -294,7 +294,6 @@ void Foam::regionToCell::erode
// Select all cells using these points // Select all cells using these points
label nChanged = 0;
forAll(boundaryPoint, pointi) forAll(boundaryPoint, pointi)
{ {
if (boundaryPoint[pointi]) if (boundaryPoint[pointi])
@ -306,7 +305,6 @@ void Foam::regionToCell::erode
if (!removeCell[celli]) if (!removeCell[celli])
{ {
removeCell[celli] = true; removeCell[celli] = true;
nChanged++;
} }
} }
} }