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

BUG: foamyHexMesh: Correct max depth of recursion

Browse Source
This commit is contained in:
laurence
2013-08-01 14:23:31 +01:00
parent ee8b1f4332
commit 700215cab3
2 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
View File

@ -179,16 +179,15 @@ bool Foam::autoDensity::combinedWellInside
}
void Foam::autoDensity::recurseAndFill
Foam::label Foam::autoDensity::recurseAndFill
(
DynamicList<Vb::Point>& initialPoints,
const treeBoundBox& bb,
label levelLimit,
word recursionName,
label& nRecursionLevels
word recursionName
) const
{
nRecursionLevels++;
label maxDepth = 0;
for (direction i = 0; i < 8; i++)
{
@ -202,14 +201,18 @@ void Foam::autoDensity::recurseAndFill
{
if (levelLimit > 0)
{
recurseAndFill
(
initialPoints,
subBB,
levelLimit - 1,
newName,
nRecursionLevels
);
maxDepth =
max
(
maxDepth,
recurseAndFill
(
initialPoints,
subBB,
levelLimit - 1,
newName
)
);
}
else
{
@ -226,14 +229,18 @@ void Foam::autoDensity::recurseAndFill
if (!fillBox(initialPoints, subBB, true))
{
recurseAndFill
(
initialPoints,
subBB,
levelLimit - 1,
newName,
nRecursionLevels
);
maxDepth =
max
(
maxDepth,
recurseAndFill
(
initialPoints,
subBB,
levelLimit - 1,
newName
)
);
}
}
}
@ -252,14 +259,18 @@ void Foam::autoDensity::recurseAndFill
if (!fillBox(initialPoints, subBB, false))
{
recurseAndFill
(
initialPoints,
subBB,
levelLimit - 1,
newName,
nRecursionLevels
);
maxDepth =
max
(
maxDepth,
recurseAndFill
(
initialPoints,
subBB,
levelLimit - 1,
newName
)
);
}
}
else
@ -274,6 +285,8 @@ void Foam::autoDensity::recurseAndFill
}
}
}
return maxDepth + 1;
}
@ -925,15 +938,12 @@ List<Vb::Point> autoDensity::initialPoints() const
Pout<< " Filling box " << hierBB << endl;
}
label nRecursionLevels = 0;
recurseAndFill
label maxDepth = recurseAndFill
(
initialPoints,
hierBB,
minLevels_ - 1,
"recursionBox",
nRecursionLevels
"recursionBox"
);
initialPoints.shrink();
@ -953,7 +963,7 @@ List<Vb::Point> autoDensity::initialPoints() const
<< scalar(nInitialPoints)/scalar(max(globalTrialPoints_, 1))
<< " success rate" << nl
<< indent
<< returnReduce(nRecursionLevels, maxOp<label>())
<< returnReduce(maxDepth, maxOp<label>())
<< " levels of recursion (maximum)"
<< decrIndent << decrIndent
<< endl;

5
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.H
View File

@ -114,13 +114,12 @@ private:
) const;
//- Descend into octants of the supplied bound box
void recurseAndFill
label recurseAndFill
(
DynamicList<Vb::Point>& initialPoints,
const treeBoundBox& bb,
label levelLimit,
word recursionName,
label& nRecursionLevels
word recursionName
) const;
//- Fill the given box, optionally filling surface overlapping boxes.