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: surfaceCheck. New writeSets option. Fixes #717.

Browse Source
This commit is contained in:
mattijs
2018-07-12 13:33:28 +01:00
parent cb727ab3d1
commit 9ee6036bb2
3 changed files with 314 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
View File

@ -2776,7 +2776,8 @@ void Foam::triSurfaceTools::calcInterpolationWeights
bool Foam::triSurfaceTools::validTri
(
const triSurface& surf,
const label facei
const label facei,
const bool verbose
)
{
typedef labelledTri FaceType;
@ -2787,22 +2788,26 @@ bool Foam::triSurfaceTools::validTri
{
if (f[fp] < 0 || f[fp] >= surf.points().size())
{
WarningInFunction
<< "triangle " << facei << " vertices " << f
<< " uses point indices outside point range 0.."
<< surf.points().size()-1
<< endl;
if (verbose)
{
WarningInFunction
<< "triangle " << facei << " vertices " << f
<< " uses point indices outside point range 0.."
<< surf.points().size()-1 << endl;
}
return false;
}
}
if (f[0] == f[1] || f[0] == f[2] || f[1] == f[2])
{
WarningInFunction
<< "triangle " << facei
<< " uses non-unique vertices " << f
<< " coords:" << f.points(surf.points())
<< endl;
if (verbose)
{
WarningInFunction
<< "triangle " << facei
<< " uses non-unique vertices " << f
<< " coords:" << f.points(surf.points()) << endl;
}
return false;
}
@ -2832,12 +2837,14 @@ bool Foam::triSurfaceTools::validTri
&& (f[2] == nbrF[0] || f[2] == nbrF[1] || f[2] == nbrF[2])
)
{
WarningInFunction
<< "triangle " << facei << " vertices " << f
<< " has the same vertices as triangle " << nbrFacei
<< " vertices " << nbrF
<< " coords:" << f.points(surf.points())
<< endl;
if (verbose)
{
WarningInFunction
<< "triangle " << facei << " vertices " << f
<< " has the same vertices as triangle " << nbrFacei
<< " vertices " << nbrF
<< " coords:" << f.points(surf.points()) << endl;
}
return false;
}
@ -2850,7 +2857,8 @@ bool Foam::triSurfaceTools::validTri
bool Foam::triSurfaceTools::validTri
(
const MeshedSurface<face>& surf,
const label facei
const label facei,
const bool verbose
)
{
typedef face FaceType;
@ -2858,11 +2866,13 @@ bool Foam::triSurfaceTools::validTri
if (f.size() != 3)
{
WarningInFunction
<< "face " << facei
<< " is not a triangle, it has " << f.size()
<< " indices"
<< endl;
if (verbose)
{
WarningInFunction
<< "face " << facei
<< " is not a triangle, it has " << f.size()
<< " indices" << endl;
}
return false;
}
@ -2871,22 +2881,26 @@ bool Foam::triSurfaceTools::validTri
{
if (f[fp] < 0 || f[fp] >= surf.points().size())
{
WarningInFunction
<< "triangle " << facei << " vertices " << f
<< " uses point indices outside point range 0.."
<< surf.points().size()-1
<< endl;
if (verbose)
{
WarningInFunction
<< "triangle " << facei << " vertices " << f
<< " uses point indices outside point range 0.."
<< surf.points().size()-1 << endl;
}
return false;
}
}
if (f[0] == f[1] || f[0] == f[2] || f[1] == f[2])
{
WarningInFunction
<< "triangle " << facei
<< " uses non-unique vertices " << f
<< " coords:" << f.points(surf.points())
<< endl;
if (verbose)
{
WarningInFunction
<< "triangle " << facei
<< " uses non-unique vertices " << f
<< " coords:" << f.points(surf.points()) << endl;
}
return false;
}
@ -2916,13 +2930,14 @@ bool Foam::triSurfaceTools::validTri
&& (f[2] == nbrF[0] || f[2] == nbrF[1] || f[2] == nbrF[2])
)
{
WarningInFunction
<< "triangle " << facei << " vertices " << f
<< " has the same vertices as triangle " << nbrFacei
<< " vertices " << nbrF
<< " coords:" << f.points(surf.points())
<< endl;
if (verbose)
{
WarningInFunction
<< "triangle " << facei << " vertices " << f
<< " has the same vertices as triangle " << nbrFacei
<< " vertices " << nbrF
<< " coords:" << f.points(surf.points()) << endl;
}
return false;
}
}

14
src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
View File

@ -617,10 +617,20 @@ public:
// Surface checking functionality
//- Check single triangle for (topological) validity
static bool validTri(const triSurface&, const label facei);
static bool validTri
(
const triSurface&,
const label facei,
const bool verbose = true
);
//- Check single triangle for (topological) validity
static bool validTri(const MeshedSurface<face>&, const label facei);
static bool validTri
(
const MeshedSurface<face>&,
const label facei,
const bool verbose = true
);
// Tracking