Commit c0ba0228 authored by graham's avatar graham
Browse files

STYLE: conformalVoronoiMesh. Rearranging indentation and spacing.

parent 2122b085
......@@ -520,7 +520,7 @@ void Foam::conformalVoronoiMesh::insertFlatEdgePointGroup
const pointIndexHit& edHit
)
{
Info<< " NOT INSERTING FLAT EDGE POINT GROUP, NOT IMPLEMENTED" << endl;
Info<< "NOT INSERTING FLAT EDGE POINT GROUP, NOT IMPLEMENTED" << endl;
}
......@@ -530,7 +530,7 @@ void Foam::conformalVoronoiMesh::insertOpenEdgePointGroup
const pointIndexHit& edHit
)
{
Info<< " NOT INSERTING OPEN EDGE POINT GROUP, NOT IMPLEMENTED" << endl;
Info<< "NOT INSERTING OPEN EDGE POINT GROUP, NOT IMPLEMENTED" << endl;
}
......@@ -540,7 +540,7 @@ void Foam::conformalVoronoiMesh::insertMultipleEdgePointGroup
const pointIndexHit& edHit
)
{
Info<< " NOT INSERTING MULTIPLE EDGE POINT GROUP, NOT IMPLEMENTED"
Info<< "NOT INSERTING MULTIPLE EDGE POINT GROUP, NOT IMPLEMENTED"
<< endl;
}
......@@ -723,7 +723,7 @@ void Foam::conformalVoronoiMesh::insertMixedFeaturePoints()
|| edStatus == featureEdgeMesh::MULTIPLE
)
{
Info<< " Edge type " << edStatus
Info<< "Edge type " << edStatus
<< " found for mixed feature point " << ptI
<< ". Not supported."
<< endl;
......@@ -735,7 +735,7 @@ void Foam::conformalVoronoiMesh::insertMixedFeaturePoints()
if(skipEdge)
{
Info<< " Skipping point " << ptI << nl << endl;
Info<< "Skipping point " << ptI << nl << endl;
continue;
}
......@@ -789,7 +789,7 @@ void Foam::conformalVoronoiMesh::constructFeaturePointLocations()
void Foam::conformalVoronoiMesh::reinsertFeaturePoints()
{
Info<< nl << " Reinserting stored feature points" << endl;
Info<< nl << "Reinserting stored feature points" << endl;
forAll(featureVertices_, f)
{
......@@ -868,7 +868,7 @@ void Foam::conformalVoronoiMesh::storeSizesAndAlignments
{
timeCheck();
Info << nl << " Initialise stored size and alignment data" << endl;
Info << nl << "Initialise stored size and alignment data" << endl;
sizeAndAlignmentLocations_.setSize(initPts.size());
......@@ -910,7 +910,7 @@ Foam::conformalVoronoiMesh::sizeAndAlignmentTree() const
void Foam::conformalVoronoiMesh::setVertexSizeAndAlignment()
{
Info<< nl << " Looking up target cell alignment and size" << endl;
Info<< nl << "Looking up target cell alignment and size" << endl;
scalar spanSqr = cvMeshControls().spanSqr();
......@@ -935,7 +935,7 @@ void Foam::conformalVoronoiMesh::setVertexSizeAndAlignment()
}
}
// Info<< nl << " Calculating target cell alignment and size" << endl;
// Info<< nl << "Calculating target cell alignment and size" << endl;
// for
// (
......@@ -1162,7 +1162,7 @@ void Foam::conformalVoronoiMesh::move()
scalar relaxation = relaxationModel_->relaxation();
Info<< nl << " Relaxation = " << relaxation << endl;
Info<< nl << "Relaxation = " << relaxation << endl;
pointField dualVertices(number_of_cells());
......@@ -1202,7 +1202,7 @@ void Foam::conformalVoronoiMesh::move()
timeCheck();
Info<< nl << " Determining vertex displacements" << endl;
Info<< nl << "Determining vertex displacements" << endl;
vectorField cartesianDirections(3);
......@@ -1458,7 +1458,7 @@ void Foam::conformalVoronoiMesh::move()
timeCheck();
Info<< nl << " Inserting displaced tessellation" << endl;
Info<< nl << "Inserting displaced tessellation" << endl;
insertPoints(pointsToInsert);
......@@ -1476,10 +1476,10 @@ void Foam::conformalVoronoiMesh::move()
timeCheck();
Info<< nl
<< " Total displacement = " << totalDisp << nl
<< " Total distance = " << totalDist << nl
<< " Points added = " << pointsAdded << nl
<< " Points removed = " << pointsRemoved
<< "Total displacement = " << totalDisp << nl
<< "Total distance = " << totalDist << nl
<< "Points added = " << pointsAdded << nl
<< "Points removed = " << pointsRemoved
<< endl;
}
......
......@@ -95,7 +95,7 @@ void Foam::conformalVoronoiMesh::calcDualMesh
// establish if the mesh can be produced at all to the
// specified criteria
Info<< nl << " Merging close points" << endl;
Info<< nl << "Merging close points" << endl;
// There is no guarantee that a merge of close points is
// no-risk, but it seems to work using 1e-4 as the mergeClosenessCoeff
......@@ -104,7 +104,7 @@ void Foam::conformalVoronoiMesh::calcDualMesh
label nInitialBadQualityFaces = checkPolyMeshQuality(points);
Info<< "Initial check before face collapse, found "
Info<< nl << "Initial check before face collapse, found "
<< nInitialBadQualityFaces << " bad quality faces"
<< endl;
......@@ -139,7 +139,7 @@ void Foam::conformalVoronoiMesh::calcDualMesh
indexDualVertices(points);
{
Info<< nl << " Merging close points" << endl;
Info<< nl << "Merging close points" << endl;
mergeCloseDualVertices(points);
}
......@@ -148,18 +148,19 @@ void Foam::conformalVoronoiMesh::calcDualMesh
// Risky and undo-able face filtering to reduce the face count
// as much as possible, staying within the specified criteria
Info<< nl << " Smoothing surface" << endl;
Info<< nl << "Smoothing surface" << endl;
smoothSurface(points);
Info<< nl << " Collapsing unnecessary faces" << endl;
Info<< nl << "Collapsing unnecessary faces" << endl;
collapseFaces(points, deferredCollapseFaces);
}
nBadQualityFaces = checkPolyMeshQuality(points);
Info<< "Found " << nBadQualityFaces << " bad quality faces" << endl;
Info<< nl << "Found " << nBadQualityFaces
<< " bad quality faces" << endl;
} while (nBadQualityFaces > nInitialBadQualityFaces);
}
......@@ -332,8 +333,8 @@ void Foam::conformalVoronoiMesh::calcTetMesh
WarningIn("Foam::conformalVoronoiMesh::calcTetMesh")
<< "Tet face centre at " << nl
<< " " << newFace.centre(points) << nl
<< " did not find a surface patch. Adding to "
<< newFace.centre(points) << nl
<< "did not find a surface patch. Adding to "
<< patchNames[patchIndex]
<< endl;
}
......@@ -403,7 +404,7 @@ void Foam::conformalVoronoiMesh::mergeCloseDualVertices(const pointField& pts)
if (nPtsMerged > 0)
{
Info<< " Merged " << nPtsMerged << " points " << endl;
Info<< " Merged " << nPtsMerged << " points " << endl;
}
reindexDualVertices(dualPtIndexMap);
......@@ -476,7 +477,7 @@ void Foam::conformalVoronoiMesh::smoothSurface(pointField& pts)
if (nCollapsedFaces > 0)
{
Info<< " Collapsed " << nCollapsedFaces << " boundary faces"
Info<< " Collapsed " << nCollapsedFaces << " boundary faces"
<< endl;
}
......@@ -715,7 +716,7 @@ void Foam::conformalVoronoiMesh::collapseFaces
if (nCollapsedFaces > 0)
{
Info<< " Collapsed " << nCollapsedFaces << " faces" << endl;
Info<< " Collapsed " << nCollapsedFaces << " faces" << endl;
// Info<< "dualPtIndexMap" << nl << dualPtIndexMap << endl;
}
......@@ -1292,7 +1293,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
timeCheck();
Info<< " Creating polyMesh to assess quality" << endl;
Info<< nl << "Creating polyMesh to assess quality" << endl;
createFacesOwnerNeighbourAndPatches
(
......@@ -1345,6 +1346,8 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
labelHashSet wrongFaces(pMesh.nFaces()/100);
Info << endl;
motionSmoother::checkMesh
(
false,
......@@ -1455,7 +1458,8 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
}
}
Info<< "maxFilterCount " << maxFilterCount << endl;
Info<< nl << "Maximum number of filter limits applied: "
<< maxFilterCount << endl;
return wrongFaces.size();
......@@ -1603,9 +1607,9 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
// WarningIn("Foam::conformalVoronoiMesh::calcDualMesh")
// << "Dual face found between Dv pair " << nl
// << " " << ptA << nl
// << " " << ptB << nl
// << " that is not on a surface patch. Adding to "
// << ptA << nl
// << ptB << nl
// << "that is not on a surface patch. Adding to "
// << patchNames[patchIndex]
// << endl;
}
......@@ -1679,7 +1683,7 @@ void Foam::conformalVoronoiMesh::sortFaces
// 1) sort by owner
Info<< nl
<< " Sorting faces, owner and neighbour into upper triangular order"
<< "Sorting faces, owner and neighbour into upper triangular order"
<< endl;
labelList oldToNew;
......@@ -1846,7 +1850,7 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
pointField& pts
) const
{
Info<< nl << " Removing unused points after filtering" << endl;
Info<< nl << "Removing unused points after filtering" << endl;
PackedBoolList ptUsed(pts.size(), false);
......@@ -1878,7 +1882,7 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
inplaceReorder(oldToNew, pts);
Info<< " Removing " << pts.size() - pointI << " unused points"
Info<< " Removing " << pts.size() - pointI << " unused points"
<< endl;
pts.setSize(pointI);
......@@ -1898,7 +1902,7 @@ void Foam::conformalVoronoiMesh::removeUnusedCells
labelList& neighbour
) const
{
Info<< nl << " Removing unused cells after filtering" << endl;
Info<< nl << "Removing unused cells after filtering" << endl;
PackedBoolList cellUsed(max(max(owner), max(neighbour)), false);
......@@ -1930,7 +1934,7 @@ void Foam::conformalVoronoiMesh::removeUnusedCells
if (unusedCells.size() > 0)
{
Info<< " Removing " << unusedCells.size() << " unused cells "
Info<< "Removing " << unusedCells.size() << " unused cells "
<< endl;
forAll(owner, oI)
......
......@@ -50,7 +50,7 @@ Foam::conformalVoronoiMesh::reconformationControl() const
{
if (!runTime_.run())
{
Info<< nl << " Rebuilding surface conformation for final output"
Info<< nl << "Rebuilding surface conformation for final output"
<< endl;
return rmFine;
......@@ -61,7 +61,7 @@ Foam::conformalVoronoiMesh::reconformationControl() const
% cvMeshControls().surfaceConformationRebuildFrequency() == 0
)
{
Info<< nl << " Rebuilding surface conformation for more iterations"
Info<< nl << "Rebuilding surface conformation for more iterations"
<< endl;
return rmCoarse;
......@@ -78,11 +78,11 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
{
if (reconfMode == rmCoarse)
{
Info<< nl << " Build coarse surface conformation" << endl;
Info<< nl << "Build coarse surface conformation" << endl;
}
else if (reconfMode == rmFine)
{
Info<< nl << " Build fine surface conformation" << endl;
Info<< nl << "Build fine surface conformation" << endl;
}
else if (reconfMode == rmNone)
{
......@@ -118,7 +118,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
// Initial surface protrusion conformation - nearest surface point
{
Info<< " EDGE DISTANCE COEFFS HARD-CODED." << endl;
Info<< "EDGE DISTANCE COEFFS HARD-CODED." << endl;
scalar edgeSearchDistCoeffSqr = sqr(1.1);
scalar surfacePtReplaceDistCoeffSqr = sqr(0.5);
......@@ -178,10 +178,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
}
}
Info<< nl <<" Initial conformation" << nl
<< " Number of vertices " << number_of_vertices() << nl
<< " Number of surface hits " << surfaceHits.size() << nl
<< " Number of edge hits " << featureEdgeHits.size()
Info<< nl << "Initial conformation" << nl
<< " Number of vertices " << number_of_vertices() << nl
<< " Number of surface hits " << surfaceHits.size() << nl
<< " Number of edge hits " << featureEdgeHits.size()
<< endl;
insertSurfacePointPairs
......@@ -205,13 +205,13 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
label maxIterations = 10;
Info<< nl << " MAX ITERATIONS HARD CODED TO "<< maxIterations << endl;
Info<< nl << "MAX ITERATIONS HARD CODED TO "<< maxIterations << endl;
scalar iterationToIntialHitRatioLimit = 0.01;
label hitLimit = label(iterationToIntialHitRatioLimit*initialTotalHits);
Info<< " STOPPING ITERATIONS WHEN TOTAL NUMBER OF HITS DROPS BELOW "
Info<< "STOPPING ITERATIONS WHEN TOTAL NUMBER OF HITS DROPS BELOW "
<< iterationToIntialHitRatioLimit << " (HARD CODED) OF INITIAL HITS ("
<< hitLimit << ")"
<< endl;
......@@ -227,7 +227,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
&& iterationNo < maxIterations
)
{
Info<< " EDGE DISTANCE COEFFS HARD-CODED." << endl;
Info<< "EDGE DISTANCE COEFFS HARD-CODED." << endl;
scalar edgeSearchDistCoeffSqr = sqr(1.25);
scalar surfacePtReplaceDistCoeffSqr = sqr(0.7);
......@@ -279,10 +279,10 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
}
}
Info<< nl <<" Conformation iteration " << iterationNo << nl
<< " Number of vertices " << number_of_vertices() << nl
<< " Number of surface hits " << surfaceHits.size() << nl
<< " Number of edge hits " << featureEdgeHits.size()
Info<< nl << "Conformation iteration " << iterationNo << nl
<< " Number of vertices " << number_of_vertices() << nl
<< " Number of surface hits " << surfaceHits.size() << nl
<< " Number of edge hits " << featureEdgeHits.size()
<< endl;
totalHits = surfaceHits.size() + featureEdgeHits.size();
......@@ -318,13 +318,13 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
if (totalHits < hitLimit)
{
Info<< nl << " Total hits (" << totalHits
Info<< nl << "Total hits (" << totalHits
<< ") less than limit (" << hitLimit
<< "), stopping iterations" << endl;
}
}
// Info<< nl << " After iterations, check penetrations" << endl;
// Info<< nl << "After iterations, check penetrations" << endl;
// for
// (
......@@ -513,14 +513,14 @@ void Foam::conformalVoronoiMesh::limitDisplacement
// If dispPt is outside bounding box then displacement cuts boundary
limit = true;
// Info<< " bb limit" << endl;
// Info<< "bb limit" << endl;
}
else if (geometryToConformTo_.findSurfaceAnyIntersection(pt, dispPt))
{
// Full surface penetration test
limit = true;
// Info<< " intersection limit" << endl;
// Info<< "intersection limit" << endl;
}
else
{
......@@ -544,13 +544,13 @@ void Foam::conformalVoronoiMesh::limitDisplacement
if (surfHit.hit())
{
// Info<< " proximity limit" << endl;
// Info<< "proximity limit" << endl;
limit = true;
if (magSqr(pt - surfHit.hitPoint()) <= searchDistanceSqr)
{
// Info<< " Cannot limit displacement, point " << pt
// Info<< "Cannot limit displacement, point " << pt
// << " closer than tolerance" << endl;
return;
......@@ -565,7 +565,7 @@ void Foam::conformalVoronoiMesh::limitDisplacement
displacement *= 0.5;
// Info<< " Limiting displacement of point " << pt << endl;
// Info<< "Limiting displacement of point " << pt << endl;
limitDisplacement(vit, displacement, callCount);
}
......@@ -784,7 +784,7 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
void Foam::conformalVoronoiMesh::storeSurfaceConformation()
{
Info<< nl << " Storing surface conformation" << endl;
Info<< nl << "Storing surface conformation" << endl;
surfaceConformationVertices_.setSize
(
......@@ -828,7 +828,7 @@ void Foam::conformalVoronoiMesh::storeSurfaceConformation()
void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
{
Info<< nl << " Reinserting stored surface conformation" << endl;
Info<< nl << "Reinserting stored surface conformation" << endl;
startOfSurfacePointPairs_ = number_of_vertices();
......
......@@ -253,7 +253,7 @@ inline void Foam::conformalVoronoiMesh::insertPoints
const std::vector<Point>& points
)
{
Info<< nl << " " << points.size() << " points to insert..." << endl;
Info<< " " << points.size() << " points to insert..." << endl;
label nVert = number_of_vertices();
......
......@@ -124,7 +124,7 @@ void Foam::conformalVoronoiMesh::writeInternalDelaunayVertices
);
}
Info<< nl << " Writing " << io.name() << " to " << io.instance() << endl;
Info<< nl << "Writing " << io.name() << " to " << io.instance() << endl;
pointIOField internalDVs(io, internalDelaunayVertices);
......@@ -234,7 +234,7 @@ void Foam::conformalVoronoiMesh::writeMesh
if (writeToConstant)
{
Info<< nl << " Writing mesh to constant." << endl;
Info<< nl << "Writing mesh to constant." << endl;
io = IOobject
(
......@@ -247,7 +247,7 @@ void Foam::conformalVoronoiMesh::writeMesh
}
else
{
Info<< nl << " Writing mesh to time directory "
Info<< nl << "Writing mesh to time directory "
<< runTime_.timeName() << endl;
}
......@@ -292,7 +292,7 @@ void Foam::conformalVoronoiMesh::writeObjMesh
const fileName& fName
) const
{
Info<< nl << " Writing points and faces to " << fName << endl;
Info<< nl << "Writing points and faces to " << fName << endl;
OFstream str(fName);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment