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: relocated tetBasePtIs adjustment from sampling to polyMeshTetDecomposition

Browse Source
This commit is contained in:
Mark Olesen
2021-09-17 12:20:32 +02:00
parent c0b4c26dc1
commit 134aaee91a
4 changed files with 221 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
src/sampling/surface/isoSurface/isoSurfaceTopo.C
View File

@ -53,192 +53,6 @@ namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::scalar Foam::isoSurfaceTopo::minTetQ
(
const label facei,
const label faceBasePtI
) const
{
const scalar ownQuality =
polyMeshTetDecomposition::minQuality
(
mesh_,
mesh_.cellCentres()[mesh_.faceOwner()[facei]],
facei,
true,
faceBasePtI
);
if (mesh_.isInternalFace(facei))
{
const scalar neiQuality =
polyMeshTetDecomposition::minQuality
(
mesh_,
mesh_.cellCentres()[mesh_.faceNeighbour()[facei]],
facei,
false,
faceBasePtI
);
if (neiQuality < ownQuality)
{
return neiQuality;
}
}
return ownQuality;
}
void Foam::isoSurfaceTopo::fixTetBasePtIs()
{
// Determine points used by two faces on the same cell
const cellList& cells = mesh_.cells();
const faceList& faces = mesh_.faces();
const labelList& faceOwn = mesh_.faceOwner();
const labelList& faceNei = mesh_.faceNeighbour();
// Get face triangulation base point
tetBasePtIs_ = mesh_.tetBasePtIs();
// Pre-filter: mark all cells with illegal base points
bitSet problemCells(cells.size());
forAll(tetBasePtIs_, facei)
{
if (tetBasePtIs_[facei] == -1)
{
problemCells.set(faceOwn[facei]);
if (mesh_.isInternalFace(facei))
{
problemCells.set(faceNei[facei]);
}
}
}
// Mark all points that are shared by just two faces within an adjacent
// problem cell as problematic
bitSet problemPoints(mesh_.points().size());
{
// Number of times a point occurs in a cell.
// Used to detect dangling vertices (count = 2)
Map<label> pointCount;
// Analyse problem cells for points shared by two faces only
for (const label celli : problemCells)
{
pointCount.clear();
for (const label facei : cells[celli])
{
for (const label pointi : faces[facei])
{
++pointCount(pointi);
}
}
forAllConstIters(pointCount, iter)
{
if (iter.val() == 1)
{
FatalErrorInFunction
<< "point:" << iter.key()
<< " at:" << mesh_.points()[iter.key()]
<< " only used by one face" << nl
<< exit(FatalError);
}
else if (iter.val() == 2)
{
problemPoints.set(iter.key());
}
}
}
}
// For all faces which form a part of a problem-cell, check if the base
// point is adjacent to any problem points. If it is, re-calculate the base
// point so that it is not.
label nAdapted = 0;
forAll(tetBasePtIs_, facei)
{
if
(
problemCells.test(faceOwn[facei])
|| (mesh_.isInternalFace(facei) && problemCells.test(faceNei[facei]))
)
{
const face& f = faces[facei];
// Check if either of the points adjacent to the base point is a
// problem point. If not, the existing base point can be retained.
const label fp0 = tetBasePtIs_[facei] < 0 ? 0 : tetBasePtIs_[facei];
if
(
!problemPoints.test(f.rcValue(fp0))
&& !problemPoints.test(f.fcValue(fp0))
)
{
continue;
}
// A new base point is required. Pick the point that results in the
// least-worst tet and which is not adjacent to any problem points.
scalar maxQ = -GREAT;
label maxFp = -1;
forAll(f, fp)
{
if
(
!problemPoints.test(f.rcValue(fp))
&& !problemPoints.test(f.fcValue(fp))
)
{
const scalar q = minTetQ(facei, fp);
if (q > maxQ)
{
maxQ = q;
maxFp = fp;
}
}
}
if (maxFp != -1)
{
// Success! Set the new base point
tetBasePtIs_[facei] = maxFp;
}
else
{
// No point was found on face that would not result in some
// duplicate triangle. Do what? Continue and hope? Spit an
// error? Silently or noisily reduce the filtering level?
tetBasePtIs_[facei] = 0;
}
++nAdapted;
}
}
if (debug)
{
Pout<< "isoSurface : adapted starting point of triangulation on "
<< nAdapted << " faces." << endl;
}
syncTools::syncFaceList(mesh_, tetBasePtIs_, maxEqOp<label>());
}
Foam::label Foam::isoSurfaceTopo::generatePoint
(
const label facei,
@ -1006,7 +820,9 @@ Foam::isoSurfaceTopo::isoSurfaceTopo
blockCells(cellCutType_, params.getClipBounds(), volumeType::OUTSIDE);
fixTetBasePtIs();
// Adjust tet base points to improve tet quality
tetBasePtIs_ = polyMeshTetDecomposition::adjustTetBasePtIs(mesh_, debug);
// Determine cell cuts
const label nCutCells = calcCellCuts(cellCutType_);

10
src/sampling/surface/isoSurface/isoSurfaceTopo.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2019 OpenFOAM Foundation
Copyright (C) 2019-2020 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -77,14 +77,6 @@ class isoSurfaceTopo
// Private Member Functions
scalar minTetQ
(
const label facei,
const label faceBasePtI
) const;
void fixTetBasePtIs();
//- Generate single point on edge
label generatePoint
(