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

Code style: Updated line comments to start with a space

Browse Source 
//This is a comment   ->   // This is a comment
This commit is contained in:
Henry Weller
2018-05-01 11:57:50 +01:00
parent 9ffc025b08
commit 87e32ab499
476 changed files with 2009 additions and 1967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/mesh/generation/blockMesh/blockMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -243,7 +243,7 @@ int main(int argc, char *argv[])
forAll(cellCentres, celli)
{
//point cc = b.blockShape().centre(b.points());
// point cc = b.blockShape().centre(b.points());
const point& cc = cellCentres[celli];
str << "v " << cc.x() << ' ' << cc.y() << ' ' << cc.z() << nl;

66
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
View File

@ -810,7 +810,7 @@ void addCouplingPatches
<< '\t' << newPatches[interRegionBottomPatch[zoneI]]->type()
<< nl;
}
else //patch using shadow face zones.
else // patch using shadow face zones.
{
interRegionTopPatch[zoneI] = addPatch<mappedWallPolyPatch>
(
@ -1256,7 +1256,7 @@ void extrudeGeometricProperties
)
);
//forAll(extrudePatch.edges(), edgeI)
// forAll(extrudePatch.edges(), edgeI)
//{
// const edge& e = extrudePatch.edges()[edgeI];
// Pout<< "Edge:" << e.centre(extrudePatch.localPoints()) << nl
@ -1599,49 +1599,49 @@ int main(int argc, char *argv[])
//// Read objects in time directory
//IOobjectList objects(mesh, runTime.timeName());
// IOobjectList objects(mesh, runTime.timeName());
//
//// Read vol fields.
//
//PtrList<volScalarField> vsFlds;
//ReadFields(mesh, objects, vsFlds);
// PtrList<volScalarField> vsFlds;
// ReadFields(mesh, objects, vsFlds);
//
//PtrList<volVectorField> vvFlds;
//ReadFields(mesh, objects, vvFlds);
// PtrList<volVectorField> vvFlds;
// ReadFields(mesh, objects, vvFlds);
//
//PtrList<volSphericalTensorField> vstFlds;
//ReadFields(mesh, objects, vstFlds);
// PtrList<volSphericalTensorField> vstFlds;
// ReadFields(mesh, objects, vstFlds);
//
//PtrList<volSymmTensorField> vsymtFlds;
//ReadFields(mesh, objects, vsymtFlds);
// PtrList<volSymmTensorField> vsymtFlds;
// ReadFields(mesh, objects, vsymtFlds);
//
//PtrList<volTensorField> vtFlds;
//ReadFields(mesh, objects, vtFlds);
// PtrList<volTensorField> vtFlds;
// ReadFields(mesh, objects, vtFlds);
//
//// Read surface fields.
//
//PtrList<surfaceScalarField> ssFlds;
//ReadFields(mesh, objects, ssFlds);
// PtrList<surfaceScalarField> ssFlds;
// ReadFields(mesh, objects, ssFlds);
//
//PtrList<surfaceVectorField> svFlds;
//ReadFields(mesh, objects, svFlds);
// PtrList<surfaceVectorField> svFlds;
// ReadFields(mesh, objects, svFlds);
//
//PtrList<surfaceSphericalTensorField> sstFlds;
//ReadFields(mesh, objects, sstFlds);
// PtrList<surfaceSphericalTensorField> sstFlds;
// ReadFields(mesh, objects, sstFlds);
//
//PtrList<surfaceSymmTensorField> ssymtFlds;
//ReadFields(mesh, objects, ssymtFlds);
// PtrList<surfaceSymmTensorField> ssymtFlds;
// ReadFields(mesh, objects, ssymtFlds);
//
//PtrList<surfaceTensorField> stFlds;
//ReadFields(mesh, objects, stFlds);
// PtrList<surfaceTensorField> stFlds;
// ReadFields(mesh, objects, stFlds);
//
//// Read point fields.
//
//PtrList<pointScalarField> psFlds;
//ReadFields(pointMesh::New(mesh), objects, psFlds);
// PtrList<pointScalarField> psFlds;
// ReadFields(pointMesh::New(mesh), objects, psFlds);
//
//PtrList<pointVectorField> pvFlds;
//ReadFields(pointMesh::New(mesh), objects, pvFlds);
// PtrList<pointVectorField> pvFlds;
// ReadFields(pointMesh::New(mesh), objects, pvFlds);
@ -2136,12 +2136,12 @@ int main(int argc, char *argv[])
// << " name:" << newPatches[patchi]->name()
// << endl;
// }
// //label nOldPatches = mesh.boundary().size();
// // label nOldPatches = mesh.boundary().size();
// mesh.clearOut();
// mesh.removeFvBoundary();
// mesh.addFvPatches(newPatches, true);
// //// Add calculated fvPatchFields for the added patches
// //for
// // for
// //(
// // label patchi = nOldPatches;
// // patchi < mesh.boundary().size();
@ -2152,7 +2152,7 @@ int main(int argc, char *argv[])
// // << endl;
// // addCalculatedPatchFields(mesh);
// //}
// //Pout<< "** Added " << mesh.boundary().size()-nOldPatches
// // Pout<< "** Added " << mesh.boundary().size()-nOldPatches
// // << " patches." << endl;
// }
@ -2368,7 +2368,7 @@ int main(int argc, char *argv[])
vectorField firstDisp(localRegionNormals.size());
forAll(firstDisp, regionI)
{
//const point& regionPt = regionCentres[regionI];
// const point& regionPt = regionCentres[regionI];
const point& regionPt = extrudePatch.points()
[
extrudePatch.meshPoints()
@ -2724,7 +2724,7 @@ int main(int argc, char *argv[])
}
}
if (zoneShadowNames.size() > 0) //if there is a top faceZone specified
if (zoneShadowNames.size() > 0) // if there is a top faceZone specified
{
forAll(extrudeMeshFaces, zoneFacei)
{
@ -2788,7 +2788,7 @@ int main(int argc, char *argv[])
true, // flip flux
interMeshTopPatch[zoneI], // patch for face
-1, // zone for face
false //face flip in zone
false // face flip in zone
);
}
}

2
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict
View File

@ -49,7 +49,7 @@ sampleMode nearestPatchFace;
oneD false;
//- If oneD: specify which boundary is wanted between the layers
//oneDPolyPatchType empty; //wedge
// oneDPolyPatchType empty; // wedge
//- If oneD: specify whether to duplicate points (i.e. disconnect 1D
// columns) or only on non-manifold extrusion areas. Default is false.

12
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.C
View File

@ -88,7 +88,7 @@ Foam::extrude2DMesh::extrude2DMesh
:
mesh_(mesh),
dict_(dict),
//patchDict_(dict.subDict("patchInfo")),
// patchDict_(dict.subDict("patchInfo")),
model_(model),
modelType_(dict.lookup("extrudeModel")),
patchType_(dict.lookup("patchType")),
@ -209,11 +209,11 @@ void Foam::extrude2DMesh::setRefinement
{
meshMod.addCell
(
-1, //masterPointID,
-1, //masterEdgeID,
-1, //masterFaceID,
celli + offset, //masterCellID,
mesh_.cellZones().whichZone(celli) //zoneID
-1, // masterPointID,
-1, // masterEdgeID,
-1, // masterFaceID,
celli + offset, // masterCellID,
mesh_.cellZones().whichZone(celli) // zoneID
);
}
}

6
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -68,7 +68,7 @@ class extrude2DMesh
const dictionary dict_;
//const dictionary patchDict_;
// const dictionary patchDict_;
const extrudeModel& model_;
@ -85,7 +85,7 @@ class extrude2DMesh
void check2D() const;
//- Find extrusion direction
//void findExtrudeDirection();
// void findExtrudeDirection();
//- Disallow default bitwise copy construct
extrude2DMesh(const extrude2DMesh&);

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
View File

@ -1074,7 +1074,7 @@ bool Foam::backgroundMeshDecomposition::overlapsThisProcessor
const scalar radiusSqr
) const
{
//return bFTreePtr_().findAnyOverlap(centre, radiusSqr);
// return bFTreePtr_().findAnyOverlap(centre, radiusSqr);
return bFTreePtr_().findNearest(centre, radiusSqr).hit();
}
@ -1448,7 +1448,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::overlapProcessors
////
//// if (flagOverlap)
//// {
//// //if (vertexOctree.findAnyOverlap(c, rSqr))
//// // if (vertexOctree.findAnyOverlap(c, rSqr))
////// if (vertexOctree.findNearest(c, rSqr*1.001).hit())
////// {
////// sphereOverlapsCandidate[sI] = true;
@ -1565,7 +1565,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::overlapProcessors
//
// if (flagOverlap)
// {
// //if (vertexOctree.findAnyOverlap(c, rSqr))
// // if (vertexOctree.findAnyOverlap(c, rSqr))
//// if (vertexOctree.findNearest(c, rSqr*1.001).hit())
//// {
//// sphereOverlapsCandidate[sI] = true;

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
View File

@ -95,7 +95,7 @@ class backgroundMeshDecomposition
// Private data
//- Method details dictionary
//dictionary coeffsDict_;
// dictionary coeffsDict_;
//- Reference to runtime
const Time& runTime_;

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
View File

@ -142,7 +142,7 @@ word cellShapeControlMesh::meshSubDir = "cellShapeControlMesh";
// }
// }
//
// //external spoke
// // external spoke
//
// Foam::point mirrorPt = pt + 2*d;
//
@ -769,17 +769,17 @@ Foam::label Foam::cellShapeControlMesh::estimateCellCount
scalar volume = CGAL::to_double(tet.volume());
scalar averagedPointCellSize = 0;
//scalar averagedPointCellSize = 1;
// scalar averagedPointCellSize = 1;
// Get an average volume by averaging the cell size of the vertices
for (label vI = 0; vI < 4; ++vI)
{
averagedPointCellSize += cit->vertex(vI)->targetCellSize();
//averagedPointCellSize *= cit->vertex(vI)->targetCellSize();
// averagedPointCellSize *= cit->vertex(vI)->targetCellSize();
}
averagedPointCellSize /= 4;
//averagedPointCellSize = ::sqrt(averagedPointCellSize);
// averagedPointCellSize = ::sqrt(averagedPointCellSize);
// if (averagedPointCellSize < small)
// {

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -122,7 +122,7 @@ Foam::fileControl::~fileControl()
// tensor alignment = Zero;
// forAll(bary, pI)
// {
// //alignment += bary[pI]*ch->vertex(pI)->alignment();
// // alignment += bary[pI]*ch->vertex(pI)->alignment();
//
// // Find nearest point
// if (bary[pI] > nearest)

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
View File

@ -429,7 +429,7 @@ void Foam::controlMeshRefinement::initialMeshPopulation
}
}
//mesh_.rangeInsertWithInfo(vertices.begin(), vertices.end());
// mesh_.rangeInsertWithInfo(vertices.begin(), vertices.end());
Info<< " Inserted "
<< returnReduce
@ -623,7 +623,7 @@ void Foam::controlMeshRefinement::initialMeshPopulation
}
}
//mesh_.rangeInsertWithInfo(vertices.begin(), vertices.end());
// mesh_.rangeInsertWithInfo(vertices.begin(), vertices.end());
Info<< " Inserted extra points "
<< returnReduce

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
View File

@ -272,7 +272,7 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
}
}
//smoothField(surfaceCellSize);
// smoothField(surfaceCellSize);
pointCellSize.write();

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
View File

@ -530,7 +530,7 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
for (label i = 0; i < nMaxIter; ++i)
{
label nAdded = meshRefinement.refineMesh(decomposition_);
//cellShapeControl_.refineMesh(decomposition_);
// cellShapeControl_.refineMesh(decomposition_);
reduce(nAdded, sumOp<label>());
if (Pstream::parRun())
@ -572,7 +572,7 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
if (foamyHexMeshControls().writeCellShapeControlMesh())
{
//cellSizeMesh.writeTriangulation();
// cellSizeMesh.writeTriangulation();
cellSizeMesh.write();
}

14
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
View File

@ -824,7 +824,7 @@ void Foam::conformalVoronoiMesh::checkCellSizing()
autoPtr<polyMesh> meshPtr = createPolyMeshFromPoints(ptsField);
const polyMesh& pMesh = meshPtr();
//pMesh.write();
// pMesh.write();
// Find cells with poor quality
DynamicList<label> checkFaces(identity(pMesh.nFaces()));
@ -921,7 +921,7 @@ void Foam::conformalVoronoiMesh::checkCellSizing()
Info<< " DISABLED: Automatically re-sizing " << cellsToResize.size()
<< " cells that are attached to the bad faces: " << endl;
//cellSizeControl_.setCellSizes(cellsToResize);
// cellSizeControl_.setCellSizes(cellsToResize);
}
timeCheck("End of Cell Sizing");
@ -1291,9 +1291,9 @@ void Foam::conformalVoronoiMesh::indexDualVertices
}
}
//OBJstream snapping1("snapToSurface1.obj");
//OBJstream snapping2("snapToSurface2.obj");
//OFstream tetToSnapTo("tetsToSnapTo.obj");
// OBJstream snapping1("snapToSurface1.obj");
// OBJstream snapping2("snapToSurface2.obj");
// OFstream tetToSnapTo("tetsToSnapTo.obj");
for
(
@ -1490,9 +1490,9 @@ void Foam::conformalVoronoiMesh::indexDualVertices
}
}
//pts.setSize(this->cellCount());
// pts.setSize(this->cellCount());
//boundaryPts.setSize(this->cellCount());
// boundaryPts.setSize(this->cellCount());
}

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
View File

@ -389,7 +389,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation()
// Re-index the point pairs
ptPairs_.reIndex(oldToNewIndices);
//writePointPairs("pointPairs_initial.obj");
// writePointPairs("pointPairs_initial.obj");
// Remove location from surface/edge tree
@ -630,7 +630,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation()
// Reindex the point pairs
ptPairs_.reIndex(oldToNewIndices);
//writePointPairs("pointPairs_" + name(iterationNo) + ".obj");
// writePointPairs("pointPairs_" + name(iterationNo) + ".obj");
if (Pstream::parRun())
{
@ -1955,8 +1955,8 @@ bool Foam::conformalVoronoiMesh::nearFeatureEdgeLocation
&& (mag(lineBetweenPoints) > pointPairDistance(pt))
)
{
//pt = edgeHit.hitPoint();
//pHit.setPoint(pt);
// pt = edgeHit.hitPoint();
// pHit.setPoint(pt);
closeToFeatureEdge = false;
}
else

10
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -432,8 +432,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::conformalVoronoiMesh::createDummyMesh
{
patches[patchi] = new processorPolyPatch
(
0, //patchSizes[p],
0, //patchStarts[p],
0, // patchSizes[p],
0, // patchStarts[p],
patchi,
mesh.boundaryMesh(),
readLabel(patchDicts[patchi].lookup("myProcNo")),
@ -447,8 +447,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::conformalVoronoiMesh::createDummyMesh
(
patchDicts[patchi].lookup("type"),
patchNames[patchi],
0, //patchSizes[p],
0, //patchStarts[p],
0, // patchSizes[p],
0, // patchStarts[p],
patchi,
mesh.boundaryMesh()
).ptr();

12
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -148,7 +148,7 @@ void Foam::featurePointConformer::addMasterAndSlavePoints
const label masterIndex = pts.last().index();
//meshTools::writeOBJ(strMasters, masterPt);
// meshTools::writeOBJ(strMasters, masterPt);
const planeDynList& masterPointPlanes = masterPointReflections[pI];
@ -186,7 +186,7 @@ void Foam::featurePointConformer::addMasterAndSlavePoints
pts.last().index()
);
//meshTools::writeOBJ(strSlaves, slavePt);
// meshTools::writeOBJ(strSlaves, slavePt);
}
}
}
@ -279,7 +279,7 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
: Vb::vtInternalFeaturePoint // false
);
//Info<< " " << " " << firstPlane << endl;
// Info<< " " << " " << firstPlane << endl;
// const Foam::point reflectedPoint = reflectPointInPlane
// (
@ -500,7 +500,7 @@ void Foam::featurePointConformer::createFeaturePoints(DynamicList<Vb>& pts)
{
for
(
//label ptI = feMesh.convexStart();
// label ptI = feMesh.convexStart();
label ptI = feMesh.mixedStart();
ptI < feMesh.nonFeatureStart();
ptI++
@ -561,7 +561,7 @@ Foam::featurePointConformer::featurePointConformer
{
Vb& pt = pts[pI];
//if (pt.featureEdgePoint())
// if (pt.featureEdgePoint())
{
if (pt.internalBoundaryPoint())
{

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
View File

@ -394,7 +394,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
if (totalAngle > foamyHexMeshControls_.maxQuadAngle())
{
// Add additional mitreing points
//scalar angleSign = 1.0;
// scalar angleSign = 1.0;
vector convexEdgesPlaneNormal =
@ -828,7 +828,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
if (totalAngle > foamyHexMeshControls_.maxQuadAngle())
{
// Add additional mitreing points
//scalar angleSign = 1.0;
// scalar angleSign = 1.0;
vector convexEdgesPlaneNormal =

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -274,7 +274,7 @@ public:
{
return
(
//this->point() == rhs.point()
// this->point() == rhs.point()
this->type_ == rhs.type()
&& this->index_ == rhs.index()
&& this->processor_ == rhs.procIndex()

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -230,7 +230,7 @@ inline bool CGAL::indexedVertex<Gt, Vb>::referred() const
{
// Can't be zero as the first few points are far points which won't be
// referred
//return index_ < 0;
// return index_ < 0;
// processor_ will be take the value of the processor that this vertex is
// from, so it cannot be on this processor.

12
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
View File

@ -558,7 +558,7 @@ Foam::conformationSurfaces::conformationSurfaces
// Extend the global bounds to stop the bound box sitting on the surfaces
// to be conformed to
//globalBounds_ = globalBounds_.extend(rndGen_, 1e-4);
// globalBounds_ = globalBounds_.extend(rndGen_, 1e-4);
vector newSpan = 1e-4*globalBounds_.span();
@ -652,7 +652,7 @@ bool Foam::conformationSurfaces::outside
) const
{
return wellOutside(pointField(1, samplePt), scalarField(1, 0))[0];
//return !inside(samplePt);
// return !inside(samplePt);
}
@ -693,7 +693,7 @@ Foam::Field<bool> Foam::conformationSurfaces::wellInOutSide
// Assume that the point is wellInside until demonstrated otherwise.
Field<bool> insideOutsidePoint(samplePts.size(), testForInside);
//Check if the points are inside the surface by the given distance squared
// Check if the points are inside the surface by the given distance squared
labelList hitSurfaces;
List<pointIndexHit> hitInfo;
@ -1182,9 +1182,9 @@ void Foam::conformationSurfaces::findAllNearestEdges
) const
{
// Initialise
//featuresHit.setSize(features_.size());
//featuresHit = -1;
//edgeHitsByFeature.setSize(features_.size());
// featuresHit.setSize(features_.size());
// featuresHit = -1;
// edgeHitsByFeature.setSize(features_.size());
// Work arrays
List<pointIndexHit> hitInfo(extendedFeatureEdgeMesh::nEdgeTypes);

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C
View File

@ -89,7 +89,7 @@ scalar rampHoldFall::relaxation()
}
else
{
//Hold
// Hold
return holdRelaxation_;
}

6
applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMeshDict
View File

@ -179,7 +179,7 @@ surfaceConformation
// Additional features.
additionalFeatures
{
//line
// line
//{
// featureMethod extendedFeatureEdgeMesh; // or none;
// extendedFeatureEdgeMesh "line.extendedFeatureEdgeMesh";
@ -309,7 +309,7 @@ motionControl
// and lowers to 0 (at simulation endTime) to converge points.
// adaptiveLinear is preferred choice.
// Points move by e.g. 10% of tet size.
relaxationModel adaptiveLinear; //rampHoldFall
relaxationModel adaptiveLinear; // rampHoldFall
adaptiveLinearCoeffs
{
@ -467,7 +467,7 @@ meshQualityControls
//- minVolRatio (0 -> 1)
minVolRatio 0.01;
//must be >0 for Fluent compatibility
// must be >0 for Fluent compatibility
minTriangleTwist -1;
}

8
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
View File

@ -562,8 +562,8 @@ int main(int argc, char *argv[])
autoPtr<mapDistributePolyMesh> map = distributor.distribute(decomp);
// Print some statistics
//Info<< "After distribution:" << endl;
//printMeshData(mesh);
// Info<< "After distribution:" << endl;
// printMeshData(mesh);
mesh.setInstance(runTime.constant());
Info<< "Writing redistributed mesh" << nl << endl;
@ -721,8 +721,8 @@ int main(int argc, char *argv[])
fvm,
cellDistance,
pointDistance,
0, //distance,
false //regularise
0, // distance,
false // regularise
);
isoFaces.setSize(iso.size());

98
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C
View File

@ -199,14 +199,14 @@ public:
////- Surface intersects bb (but not using intersection test)
//scalar ccDist = signedDistance(bb.midpoint());
//scalar ccVal = ccDist - _iso_val;
//if (mag(ccVal) < small)
// scalar ccDist = signedDistance(bb.midpoint());
// scalar ccVal = ccDist - _iso_val;
// if (mag(ccVal) < small)
//{
// return true;
//}
//const pointField points(bb.points());
//forAll(points, pointi)
// const pointField points(bb.points());
// forAll(points, pointi)
//{
// scalar pointVal = signedDistance(points[pointi]) - _iso_val;
// if (ccVal*pointVal < 0)
@ -214,24 +214,24 @@ public:
// return true;
// }
//}
//return false;
// return false;
////- Refinement based on intersection with multiple planes.
//// Does not work well - too high a ratio between
//// neighbouring cubes.
//const pointField points(bb.points());
//const edgeList& edges = treeBoundBox::edges;
//pointField start(edges.size());
//pointField end(edges.size());
//forAll(edges, i)
// const pointField points(bb.points());
// const edgeList& edges = treeBoundBox::edges;
// pointField start(edges.size());
// pointField end(edges.size());
// forAll(edges, i)
//{
// start[i] = points[edges[i][0]];
// end[i] = points[edges[i][1]];
//}
//Foam::List<Foam::List<pointIndexHit>> hitInfo;
//labelListList hitSurfaces;
//searchableSurfacesQueries::findAllIntersections
// Foam::List<Foam::List<pointIndexHit>> hitInfo;
// labelListList hitSurfaces;
// searchableSurfacesQueries::findAllIntersections
//(
// geometry,
// surfaces,
@ -242,13 +242,13 @@ public:
//);
//
//// Count number of intersections
//label nInt = 0;
//forAll(hitSurfaces, edgeI)
// label nInt = 0;
// forAll(hitSurfaces, edgeI)
//{
// nInt += hitSurfaces[edgeI].size();
//}
//
//if (nInt == 0)
// if (nInt == 0)
//{
// // No surface intersected. See if there is one inside
// forAll(surfaces, i)
@ -262,8 +262,8 @@ public:
//}
//
//// Check multiple surfaces
//label baseSurfI = -1;
//forAll(hitSurfaces, edgeI)
// label baseSurfI = -1;
// forAll(hitSurfaces, edgeI)
//{
// const labelList& hSurfs = hitSurfaces[edgeI];
// forAll(hSurfs, i)
@ -281,8 +281,8 @@ public:
//}
//
//// Get normals
//DynamicList<pointIndexHit> baseInfo(nInt);
//forAll(hitInfo, edgeI)
// DynamicList<pointIndexHit> baseInfo(nInt);
// forAll(hitInfo, edgeI)
//{
// const Foam::List<pointIndexHit>& hits = hitInfo[edgeI];
// forAll(hits, i)
@ -291,62 +291,62 @@ public:
// baseInfo.append(hits[i]);
// }
//}
//vectorField normals;
//geometry[surfaces[baseSurfI]].getNormal(baseInfo, normals);
//for (label i = 1; i < normals.size(); ++i)
// vectorField normals;
// geometry[surfaces[baseSurfI]].getNormal(baseInfo, normals);
// for (label i = 1; i < normals.size(); ++i)
//{
// if ((normals[0] & normals[i]) < 0.9)
// {
// return true;
// }
//}
//labelList regions;
//geometry[surfaces[baseSurfI]].getRegion(baseInfo, regions);
//for (label i = 1; i < regions.size(); ++i)
// labelList regions;
// geometry[surfaces[baseSurfI]].getRegion(baseInfo, regions);
// for (label i = 1; i < regions.size(); ++i)
//{
// if (regions[0] != regions[i])
// {
// return true;
// }
//}
//return false;
// return false;
//samples[0] = point(c.xmin(), c.ymin(), c.zmin());
//samples[1] = point(c.xmax(), c.ymin(), c.zmin());
//samples[2] = point(c.xmax(), c.ymax(), c.zmin());
//samples[3] = point(c.xmin(), c.ymax(), c.zmin());
// samples[0] = point(c.xmin(), c.ymin(), c.zmin());
// samples[1] = point(c.xmax(), c.ymin(), c.zmin());
// samples[2] = point(c.xmax(), c.ymax(), c.zmin());
// samples[3] = point(c.xmin(), c.ymax(), c.zmin());
//
//samples[4] = point(c.xmin(), c.ymin(), c.zmax());
//samples[5] = point(c.xmax(), c.ymin(), c.zmax());
//samples[6] = point(c.xmax(), c.ymax(), c.zmax());
//samples[7] = point(c.xmin(), c.ymax(), c.zmax());
// samples[4] = point(c.xmin(), c.ymin(), c.zmax());
// samples[5] = point(c.xmax(), c.ymin(), c.zmax());
// samples[6] = point(c.xmax(), c.ymax(), c.zmax());
// samples[7] = point(c.xmin(), c.ymax(), c.zmax());
//scalarField nearestDistSqr(8, great);
// scalarField nearestDistSqr(8, great);
//
//Foam::List<pointIndexHit> nearestInfo;
//surf_.findNearest(samples, nearestDistSqr, nearestInfo);
//vectorField normals;
//surf_.getNormal(nearestInfo, normals);
// Foam::List<pointIndexHit> nearestInfo;
// surf_.findNearest(samples, nearestDistSqr, nearestInfo);
// vectorField normals;
// surf_.getNormal(nearestInfo, normals);
//
//for (label i = 1; i < normals.size(); ++i)
// for (label i = 1; i < normals.size(); ++i)
//{
// if ((normals[0] & normals[i]) < 0.5)
// {
// return true;
// }
//}
//return false;
// return false;
//// Check if surface octree same level
//const labelList elems(surf_.tree().findBox(bb));
// const labelList elems(surf_.tree().findBox(bb));
//
//if (elems.size() > 1)
// if (elems.size() > 1)
//{
// return true;
//}
//else
// else
//{
// return false;
//}
@ -470,9 +470,9 @@ int main(int argc, char *argv[])
distanceCalc ref
(
8, //maxLevel
0.0, //distance
minLevel, //minLevel
8, // maxLevel
0.0, // distance
minLevel, // minLevel
geometryToConformTo,
converter
);

2
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify_non_octree.C
View File

@ -52,7 +52,7 @@ int main(int argc, char *argv[])
(
"Re-sample surfaces used in foamyHexMesh operation"
);
//argList::validArgs.append("inputFile");
// argList::validArgs.append("inputFile");
argList::validArgs.append("(nx ny nz)");
argList::validArgs.append("outputName");

6
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -882,8 +882,8 @@ void Foam::CV2D::newPoints()
{
w = magSqr(deltai.x()*ei.y() - deltai.y()*ei.x());
// alternative weights
//w = mag(deltai.x()*ei.y() - deltai.y()*ei.x());
//w = magSqr(ei)*mag(deltai);
// w = mag(deltai.x()*ei.y() - deltai.y()*ei.x());
// w = magSqr(ei)*mag(deltai);
// Use the following for an ~square mesh
// Find the coordinate contributions for this edge delta

4
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -157,7 +157,7 @@ private:
mutable Random rndGen_;
//- The surface to mesh
//const querySurface& qSurf_;
// const querySurface& qSurf_;
//- All geometry of the meshing process, including surfaces to be
// conformed to and those to be used for refinement
searchableSurfaces allGeometry_;

6
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -195,8 +195,8 @@ inline void Foam::CV2D::movePoint(const Vertex_handle& vh, const Point& P)
// move(vh, P);
// vh->index() = i;
//vh->set_point(P);
//fast_restore_Delaunay(vh);
// vh->set_point(P);
// fast_restore_Delaunay(vh);
}

8
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMeshDict
View File

@ -154,16 +154,16 @@ extrusion
extrude on;
extrudeModel linearDirection;
//extrudeModel wedge;
// extrudeModel wedge;
patchInfo
{
//type empty;
//startFace
// type empty;
// startFace
}
patchType empty;
//patchType wedge;
// patchType wedge;
nLayers 1;

4
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/insertFeaturePoints.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -227,7 +227,7 @@ void Foam::CV2D::insertFeaturePoints()
int(totalAngle/meshControls().maxQuadAngle()) + 1;
// The number of additional master points needed to
//obtain the required number of quadrants.
// obtain the required number of quadrants.
int nAddPoints = min(max(nQuads - 2, 0), 2);
// index of reflMaster

10
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -321,7 +321,7 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
minLevel,
maxLevel,
gapLevel,
scalarField(nRegions, -great), //perpendicularAngle,
scalarField(nRegions, -great), // perpendicularAngle,
patchInfo
)
);
@ -872,7 +872,7 @@ int main(int argc, char *argv[])
(
"abc", // dummy name
mesh.time().constant(), // instance
//mesh.time().findInstance("triSurface", word::null),// instance
// mesh.time().findInstance("triSurface", word::null),// instance
"triSurface", // local
mesh.time(), // registry
IOobject::MUST_READ,
@ -922,9 +922,9 @@ int main(int argc, char *argv[])
const scalar initialCellSize = ::pow(meshPtr().V()[0], 1.0/3.0);
//Info<< "Wanted cell size = " << defaultCellSize << endl;
//Info<< "Current cell size = " << initialCellSize << endl;
//Info<< "Fraction = " << initialCellSize/defaultCellSize
// Info<< "Wanted cell size = " << defaultCellSize << endl;
// Info<< "Current cell size = " << initialCellSize << endl;
// Info<< "Fraction = " << initialCellSize/defaultCellSize
// << endl;
surfacesPtr =

36
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
View File

@ -51,8 +51,8 @@ geometry
type triSurfaceMesh;
file "sphere.stl"
//tolerance 1E-5; // optional:non-default tolerance on intersections
//maxTreeDepth 10; // optional:depth of octree. Decrease only in case
// tolerance 1E-5; // optional:non-default tolerance on intersections
// maxTreeDepth 10; // optional:depth of octree. Decrease only in case
// of memory limitations.
// Per region the patchname. If not provided will be <surface>_<region>.
@ -130,7 +130,7 @@ castellatedMeshControls
(
//{
// file "someLine.eMesh";
// //level 2;
// // level 2;
// levels ((0.0 2) (1.0 3));
//}
);
@ -171,13 +171,13 @@ castellatedMeshControls
//- Optional increment (on top of max level) in small gaps
//gapLevelIncrement 2;
// gapLevelIncrement 2;
//- Optional angle to detect small-large cell situation
// perpendicular to the surface. Is the angle of face w.r.t.
// the local surface normal. Use on flat(ish) surfaces only.
// Otherwise leave out or set to negative number.
//perpendicularAngle 10;
// perpendicularAngle 10;
//- Optional faceZone and (for closed surface) cellZone with
// how to select the cells that are in the cellZone
@ -186,9 +186,9 @@ castellatedMeshControls
// - if on cellZone(s) : point out of (maximum) cellZone
// - if freestanding : oriented according to surface
//faceZone sphere;
//cellZone sphere;
//cellZoneInside inside; //outside/insidePoint
// faceZone sphere;
// cellZone sphere;
// cellZoneInside inside; // outside/insidePoint
//- Optional specification of what to do with faceZone faces:
// internal : keep them as internal faces (default)
@ -196,7 +196,7 @@ castellatedMeshControls
// freedom in mesh motion
// boundary : create free-standing boundary faces (baffles
// but without the shared points)
//faceType baffle;
// faceType baffle;
}
}
@ -206,7 +206,7 @@ castellatedMeshControls
resolveFeatureAngle 30;
//- Optional increment (on top of max level) in small gaps
//gapLevelIncrement 2;
// gapLevelIncrement 2;
// Planar angle:
@ -243,7 +243,7 @@ castellatedMeshControls
mode inside;
levels ((1.0 4));
}
//sphere
// sphere
//{
// mode distance;
// levels ((1.0 5) (2.0 3));
@ -271,7 +271,7 @@ castellatedMeshControls
// Optional: switch off topological test for cells to-be-squashed
// and use geometric test instead
//useTopologicalSnapDetection false;
// useTopologicalSnapDetection false;
}
// Settings for the snapping.
@ -344,12 +344,12 @@ addLayersControls
// Wanted thickness of the layer next to the wall.
// If relativeSizes this is relative to undistorted size of cell
// outside layer.
//firstLayerThickness 0.3;
// firstLayerThickness 0.3;
// Wanted overall thickness of layers.
// If relativeSizes this is relative to undistorted size of cell
// outside layer.
//thickness 0.5
// thickness 0.5
// Minimum overall thickness of total layers. If for any reason layer
@ -433,15 +433,15 @@ addLayersControls
// Optional: limit the number of steps walking away from the surface.
// Default is unlimited.
//nMedialAxisIter 10;
// nMedialAxisIter 10;
// Optional: smooth displacement after medial axis determination.
// default is 0.
//nSmoothDisplacement 90;
// nSmoothDisplacement 90;
// (wip)Optional: do not extrude a point if none of the surrounding points is
// not extruded. Default is false.
//detectExtrusionIsland true;
// detectExtrusionIsland true;
// Mesh shrinking
@ -473,7 +473,7 @@ addLayersControls
// Additional reporting: if there are just a few faces where there
// are mesh errors (after adding the layers) print their face centres.
// This helps in tracking down problematic mesh areas.
//additionalReporting true;
// additionalReporting true;
}
// Generic mesh quality settings. At any undoable phase these determine