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

ENH: For cell size functions of equal priority, choose the smallest size, not average.

Browse Source
This commit is contained in:
graham
2010-09-24 18:29:47 +01:00
parent 43c2ab5d51
commit 02f4581b30
2 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
View File

@ -39,6 +39,7 @@ Foam::cellSizeControlSurfaces::cellSizeControlSurfaces
cvMesh_(cvMesh),
allGeometry_(allGeometry),
surfaces_(),
cellSizeFunctions_(),
defaultCellSize_(readScalar(motionControlDict.lookup("defaultCellSize"))),
defaultPriority_
(
@ -161,44 +162,89 @@ Foam::scalar Foam::cellSizeControlSurfaces::cellSize
bool isSurfacePoint
) const
{
scalar sizeAccumulator = 0;
scalar numberOfFunctions = 0;
label previousPriority = defaultPriority_;
// Regions requesting with the same priority take the average
// scalar sizeAccumulator = 0;
// scalar numberOfFunctions = 0;
// label previousPriority = defaultPriority_;
// if (cellSizeFunctions_.size())
// {
// previousPriority =
// cellSizeFunctions_[cellSizeFunctions_.size() - 1].priority();
// forAll(cellSizeFunctions_, i)
// {
// const cellSizeFunction& cSF = cellSizeFunctions_[i];
// if (cSF.priority() < previousPriority && numberOfFunctions > 0)
// {
// return sizeAccumulator/numberOfFunctions;
// }
// scalar sizeI;
// if (cSF.cellSize(pt, sizeI, isSurfacePoint))
// {
// previousPriority = cSF.priority();
// sizeAccumulator += sizeI;
// numberOfFunctions++;
// }
// }
// }
// if (previousPriority == defaultPriority_ || numberOfFunctions == 0)
// {
// sizeAccumulator += defaultCellSize_;
// numberOfFunctions++;
// }
// return sizeAccumulator/numberOfFunctions;
// Regions requesting with the same priority take the smallest
scalar minSize = defaultCellSize_;
if (cellSizeFunctions_.size())
{
previousPriority =
cellSizeFunctions_[cellSizeFunctions_.size() - 1].priority();
// Initialise to the last (lowest) priority
label previousPriority = cellSizeFunctions_.last().priority();
forAll(cellSizeFunctions_, i)
{
const cellSizeFunction& cSF = cellSizeFunctions_[i];
if (cSF.priority() < previousPriority && numberOfFunctions > 0)
if (cSF.priority() < previousPriority)
{
return sizeAccumulator/numberOfFunctions;
return minSize;
}
scalar sizeI;
if (cSF.cellSize(pt, sizeI, isSurfacePoint))
{
previousPriority = cSF.priority();
sizeAccumulator += sizeI;
numberOfFunctions++;
}
}
}
if (previousPriority == defaultPriority_ || numberOfFunctions == 0)
if (cSF.priority() == previousPriority)
{
sizeAccumulator += defaultCellSize_;
numberOfFunctions++;
if (sizeI < minSize)
{
minSize = sizeI;
}
}
else
{
minSize = sizeI;
}
return sizeAccumulator/numberOfFunctions;
previousPriority = cSF.priority();
}
}
}
return minSize;
}
@ -237,7 +283,3 @@ Foam::scalarField Foam::cellSizeControlSurfaces::cellSize
// ************************************************************************* //

3
src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
View File

@ -74,8 +74,7 @@ class cellSizeControlSurfaces
scalar defaultCellSize_;
//- Assigning a priority to all requests for cell sizes, the highest
// overrules. Regions requesting with the same priority take the
// average
// overrules.
label defaultPriority_;