STYLE: Correct formatting

This commit is contained in:
laurence
2012-03-19 11:29:03 +00:00
parent db8857a88b
commit c0524a8eeb
3 changed files with 23 additions and 20 deletions

View File

@ -719,12 +719,15 @@ bool Foam::conformalVoronoiMesh::dualCellSurfaceAllIntersections
const Foam::point& p = infoList[hitI].hitPoint(); const Foam::point& p = infoList[hitI].hitPoint();
const scalar separationDistance const scalar separationDistance =
= mag(p - info.hitPoint()); mag(p - info.hitPoint());
const scalar minSepDist const scalar minSepDist =
= sqr(cvMeshControls().removalDistCoeff() sqr
*targetCellSize(p)); (
cvMeshControls().removalDistCoeff()
*targetCellSize(p)
);
// Reject the point if it is too close to another // Reject the point if it is too close to another
// surface point. // surface point.

View File

@ -157,8 +157,8 @@ scalarField calcCurvature(const triSurface& surf)
// << monge_fit.condition_number() << nl << std::endl; // << monge_fit.condition_number() << nl << std::endl;
// Use the maximum curvature to give smaller cell sizes later. // Use the maximum curvature to give smaller cell sizes later.
k[vertI++] k[vertI++] =
= max max
( (
mag(monge_form.principal_curvatures(0)), mag(monge_form.principal_curvatures(0)),
mag(monge_form.principal_curvatures(1)) mag(monge_form.principal_curvatures(1))
@ -174,8 +174,10 @@ bool edgesConnected(const edge& e1, const edge& e2)
{ {
if if
( (
e1.start() == e2.start() || e1.start() == e2.end() e1.start() == e2.start()
|| e1.end() == e2.start() || e1.end() == e2.end() || e1.start() == e2.end()
|| e1.end() == e2.start()
|| e1.end() == e2.end()
) )
{ {
return true; return true;
@ -265,8 +267,8 @@ scalar calcProximityOfFeatureEdges
// Don't refine if the edges are connected to each other // Don't refine if the edges are connected to each other
if (!edgesConnected(e1, e2)) if (!edgesConnected(e1, e2))
{ {
scalar curDist scalar curDist =
= mag(pHit1.hitPoint() - pHit2.hitPoint()); mag(pHit1.hitPoint() - pHit2.hitPoint());
minDist = min(curDist, minDist); minDist = min(curDist, minDist);
} }
@ -897,8 +899,6 @@ int main(int argc, char *argv[])
scalar span = searchSurf.bounds().mag(); scalar span = searchSurf.bounds().mag();
//args.optionReadIfPresent("closeness", span);
scalar externalAngleTolerance = 10; scalar externalAngleTolerance = 10;
scalar externalToleranceCosAngle = scalar externalToleranceCosAngle =
Foam::cos Foam::cos