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

COMP: namespace qualify min/max functions (#3348)

Browse Source 
FIX: missing patch face index writeFields (#3347)
This commit is contained in:
Mark Olesen
2025-04-02 21:23:16 +02:00
parent 01727c84f1
commit 0be19b7fae
30 changed files with 127 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -887,7 +887,7 @@ int main(int argc, char *argv[])
writeParts
(
surf,
min(outputThreshold, numZones),
Foam::min(outputThreshold, numZones),
faceZone,
surfFilePath,
surfFileStem
@ -953,7 +953,7 @@ int main(int argc, char *argv[])
writeParts
(
surf,
min(outputThreshold, numNormalZones),
Foam::min(outputThreshold, numNormalZones),
normalZone,
surfFilePath,
surfFileStem + "_normal"

2
applications/utilities/surface/surfaceHookUp/surfaceHookUp.C
View File

@ -280,7 +280,7 @@ int main(int argc, char *argv[])
const IOdictionary dict(dictIO);
const scalar dist(args.get<scalar>(1));
const scalar matchTolerance(max(1e-6*dist, SMALL));
const scalar matchTolerance(Foam::max(1e-6*dist, SMALL));
const label maxIters = 100;
Info<< "Hooking distance = " << dist << endl;

12
applications/utilities/surface/surfaceInflate/surfaceInflate.C
View File

@ -276,7 +276,7 @@ label detectIntersectionPoints
// 1. Extrusion offset vectors intersecting new surface location
{
scalar tol = max(tolerance, 10*s.tolerance());
scalar tol = Foam::max(tolerance, 10*s.tolerance());
// Collect all the edge vectors. Slightly shorten the edges to prevent
// finding lots of intersections. The fast triangle intersection routine
@ -296,7 +296,7 @@ label detectIntersectionPoints
&& !localFaces[hits[pointI].index()].found(pointI)
)
{
scale[pointI] = max(0.0, scale[pointI]-0.2);
scale[pointI] = Foam::max(0.0, scale[pointI]-0.2);
isPointOnHitEdge.set(pointI);
nHits++;
@ -330,7 +330,7 @@ label detectIntersectionPoints
<< pt
<< endl;
scale[e[0]] = max(0.0, scale[e[0]]-0.2);
scale[e[0]] = Foam::max(0.0, scale[e[0]]-0.2);
nHits++;
}
if (isPointOnHitEdge.set(e[1]))
@ -342,7 +342,7 @@ label detectIntersectionPoints
<< pt
<< endl;
scale[e[1]] = max(0.0, scale[e[1]]-0.2);
scale[e[1]] = Foam::max(0.0, scale[e[1]]-0.2);
nHits++;
}
}
@ -418,7 +418,7 @@ void minSmooth
const edge& e = edges[edgeI];
scalar w = mag(points[mp[e[0]]]-points[mp[e[1]]]);
edgeWeights[edgeI] = 1.0/(max(w, SMALL));
edgeWeights[edgeI] = 1.0/(Foam::max(w, SMALL));
}
tmp<scalarField> tavgFld = avg(s, fld, edgeWeights);
@ -429,7 +429,7 @@ void minSmooth
{
if (isAffectedPoint.test(pointI))
{
newFld[pointI] = min
newFld[pointI] = Foam::min
(
fld[pointI],
0.5*fld[pointI] + 0.5*avgFld[pointI]

2
applications/utilities/surface/surfaceMeshExtract/surfaceMeshExtract.C
View File

@ -109,7 +109,7 @@ void writeOBJ
const auto& constraints = ppp.constraints();
forAll(constraints, i)
{
maxConstraint = max(maxConstraint, constraints[i].first());
maxConstraint = Foam::max(maxConstraint, constraints[i].first());
}
reduce(maxConstraint, maxOp<label>());