zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

triangle, triFace, face: Rationalized normal for consistency with the rest of OpenFOAM

Browse Source 
For compatibility with all the mesh and related classes in OpenFOAM The 'normal'
function of the 'triangle', 'triFace' and 'face' classes now returns the unit
normal vector rather than the vector area which is now provided by the 'area'
function.
This commit is contained in:
Henry Weller
2018-04-06 13:57:36 +01:00
parent 1fd4ecb024
commit 43b35a5173
65 changed files with 288 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,7 +432,7 @@ int main(int argc, char *argv[])
Info<< nl << "Extracting curvature of surface at the points."
<< endl;
vectorField pointNormals = calcVertexNormals(surf);
const vectorField pointNormals(surf.pointNormals2());
triadField pointCoordSys = calcVertexCoordSys(surf, pointNormals);
triSurfacePointScalarField k = calcCurvature

10
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.H
View File

@ -43,14 +43,6 @@ namespace Foam
extern const scalar externalAngleTolerance;
extern const scalar externalToleranceCosAngle;
scalar calcVertexNormalWeight
(
const triFace& f,
const label pI,
const vector& fN,
const pointField& points
);
point randomPointInPlane(const plane& p);
triadField calcVertexCoordSys
@ -59,8 +51,6 @@ namespace Foam
const vectorField& pointNormals
);
vectorField calcVertexNormals(const triSurface& surf);
triSurfacePointScalarField calcCurvature
(
const word& name,

87
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtractUtilities.C
View File

@ -56,29 +56,6 @@ const Foam::scalar Foam::externalToleranceCosAngle
);
Foam::scalar Foam::calcVertexNormalWeight
(
const triFace& f,
const label pI,
const vector& fN,
const pointField& points
)
{
label index = findIndex(f, pI);
if (index == -1)
{
FatalErrorInFunction
<< "Point not in face" << abort(FatalError);
}
const vector e1 = points[f[index]] - points[f[f.fcIndex(index)]];
const vector e2 = points[f[index]] - points[f[f.rcIndex(index)]];
return mag(fN)/(magSqr(e1)*magSqr(e2) + vSmall);
}
Foam::point Foam::randomPointInPlane(const plane& p)
{
// Perturb base point
@ -184,48 +161,6 @@ Foam::triadField Foam::calcVertexCoordSys
}
Foam::vectorField Foam::calcVertexNormals(const triSurface& surf)
{
// Weighted average of normals of faces attached to the vertex
// Weight = fA / (mag(e0)^2 * mag(e1)^2);
Info<< "Calculating vertex normals" << endl;
vectorField pointNormals(surf.nPoints(), Zero);
const pointField& points = surf.points();
const labelListList& pointFaces = surf.pointFaces();
const labelList& meshPoints = surf.meshPoints();
forAll(pointFaces, pI)
{
const labelList& pFaces = pointFaces[pI];
forAll(pFaces, fi)
{
const label facei = pFaces[fi];
const triFace& f = surf[facei];
vector fN = f.normal(points);
scalar weight = calcVertexNormalWeight
(
f,
meshPoints[pI],
fN,
points
);
pointNormals[pI] += weight*fN;
}
pointNormals[pI] /= mag(pointNormals[pI]) + vSmall;
}
return pointNormals;
}
Foam::triSurfacePointScalarField Foam::calcCurvature
(
const word& name,
@ -286,7 +221,7 @@ Foam::triSurfacePointScalarField Foam::calcCurvature
// Set up a local coordinate system for the face
const vector& e0 = edgeVectors[0];
const vector eN = f.normal(points);
const vector eN = f.area(points);
const vector e1 = (e0 ^ eN);
if (magSqr(eN) < rootVSmall)
@ -371,11 +306,11 @@ Foam::triSurfacePointScalarField Foam::calcCurvature
// Calculate weight
// TODO: Voronoi area weighting
scalar weight = calcVertexNormalWeight
const scalar weight = surf.pointNormalWeight
(
f,
meshPoints[patchPointIndex],
f.normal(points),
f.area(points),
points
);
@ -385,22 +320,6 @@ Foam::triSurfacePointScalarField Foam::calcCurvature
accumulatedWeights[patchPointIndex] += weight;
}
if (false)
{
Info<< "Points = " << points[f[0]] << " "
<< points[f[1]] << " "
<< points[f[2]] << endl;
Info<< "edgeVecs = " << edgeVectors[0] << " "
<< edgeVectors[1] << " "
<< edgeVectors[2] << endl;
Info<< "normDiff = " << normalDifferences[0] << " "
<< normalDifferences[1] << " "
<< normalDifferences[2] << endl;
Info<< "faceCoordSys = " << faceCoordSys << endl;
Info<< "T = " << T << endl;
Info<< "Z = " << Z << endl;
}
}
forAll(curvaturePointField, pI)