Commit 845b9552 authored by laurence's avatar laurence
Browse files

STYLE: Correct line lengths

parent f306994d
......@@ -121,21 +121,6 @@ void Foam::DelaunayMesh<Triangulation>::addPatches
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
//template<class Triangulation>
//Foam::DelaunayMesh<Triangulation>::DelaunayMesh(Istream& is)
//:
// base1(is),
// base2(is),
// member1(is),
// member2(is)
//{
// // Check state of Istream
// is.check("Foam::DelaunayMesh<Triangulation>::DelaunayMesh(Foam::Istream&)");
//}
// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
template<class Triangulation>
......
......@@ -1638,8 +1638,8 @@ Foam::labelList Foam::backgroundMeshDecomposition::overlapProcessors
//////
////// if (distSqr <= rSqr)
////// {
////// // If the sphere finds a nearest element of the patch, then it
////// // overlaps
////// // If the sphere finds a nearest element of the patch,
////// // then it overlaps
//// sphereOverlapsCandidate[sI] = true;
////// }
//// }
......@@ -1755,8 +1755,8 @@ Foam::labelList Foam::backgroundMeshDecomposition::overlapProcessors
////
//// if (distSqr <= rSqr)
//// {
//// // If the sphere finds a nearest element of the patch, then it
//// // overlaps
//// // If the sphere finds a nearest element of the patch, then
//// // it overlaps
// sphereOverlapsCandidate[sI] = true;
//// }
// }
......
......@@ -291,8 +291,8 @@ public:
) const;
// //- Which processors overlap the given sphere, returns all processors
// // whose boundary patch is touched by the sphere or whom the sphere is
// // inside. By default this does not return the processor that the
// // whose boundary patch is touched by the sphere or whom the sphere
// // is inside. By default this does not return the processor that the
// // query is launched from, it is assumed that the point is on that
// // processor.
// labelListList overlapsProcessors
......
......@@ -61,7 +61,13 @@ Foam::fileControl::fileControl
const conformationSurfaces& allGeometry
)
:
cellSizeAndAlignmentControl(runTime, name, controlFunctionDict, allGeometry),
cellSizeAndAlignmentControl
(
runTime,
name,
controlFunctionDict,
allGeometry
),
pointsFile_(controlFunctionDict.lookup("pointsFile")),
sizesFile_(controlFunctionDict.lookup("sizesFile")),
alignmentsFile_(controlFunctionDict.lookup("alignmentsFile"))
......
......@@ -161,7 +161,13 @@ Foam::searchableSurfaceControl::searchableSurfaceControl
const conformationSurfaces& allGeometry
)
:
cellSizeAndAlignmentControl(runTime, name, controlFunctionDict, allGeometry),
cellSizeAndAlignmentControl
(
runTime,
name,
controlFunctionDict,
allGeometry
),
searchableSurface_(allGeometry.geometry()[name]),
allGeometry_(allGeometry),
cellSizeFunction_
......@@ -194,7 +200,7 @@ Foam::searchableSurfaceControl::searchableSurfaceControl
// surfacesDict.subDict(iter().keyword())
// );
//
// // If the "surface" keyword is not found in the dictionary, assume that
// // If the "surface" keyword is not found in the dictionary, assume
// // the name of the dictionary is the surface. Distinction required to
// // allow the same surface to be used multiple times to supply multiple
// // cellSizeFunctions
......@@ -370,8 +376,8 @@ Foam::searchableSurfaceControl::~searchableSurfaceControl()
//// cartesianDirections[2] = vector(1,0,0);
////
//// // Rearrange each alignment tensor so that the x/y/z components are
//// // in order of whichever makes the smallest angle with the global coordinate
//// // system
//// // in order of whichever makes the smallest angle with the global
//// // coordinate system
//// FixedList<tensor, 4> alignments;
////
//// forAll(alignments, aI)
......@@ -402,51 +408,69 @@ Foam::searchableSurfaceControl::~searchableSurfaceControl()
////
//// if (mag(axx) >= minAngle)
//// {
//// tmpA.xx() = mag(a.xx()); tmpA.xy() = mag(a.xy()); tmpA.xz() = mag(a.xz());
//// tmpA.xx() = mag(a.xx());
//// tmpA.xy() = mag(a.xy());
//// tmpA.xz() = mag(a.xz());
//// minAngle = mag(axx);
//// }
//// if (mag(axy) >= minAngle)
//// {
//// tmpA.xx() = mag(a.yx()); tmpA.xy() = mag(a.yy()); tmpA.xz() = mag(a.yz());
//// tmpA.xx() = mag(a.yx());
//// tmpA.xy() = mag(a.yy());
//// tmpA.xz() = mag(a.yz());
//// minAngle = mag(axy);
//// }
//// if (mag(axz) >= minAngle)
//// {
//// tmpA.xx() = mag(a.zx()); tmpA.xy() = mag(a.zy()); tmpA.xz() = mag(a.zz());
//// tmpA.xx() = mag(a.zx());
//// tmpA.xy() = mag(a.zy());
//// tmpA.xz() = mag(a.zz());
//// }
////
//// minAngle = 0;
////
//// if (mag(ayx) >= minAngle)
//// {
//// tmpA.yx() = mag(a.xx()); tmpA.yy() = mag(a.xy()); tmpA.yz() = mag(a.xz());
//// tmpA.yx() = mag(a.xx());
//// tmpA.yy() = mag(a.xy());
//// tmpA.yz() = mag(a.xz());
//// minAngle = mag(ayx);
//// }
//// if (mag(ayy) >= minAngle)
//// {
//// tmpA.yx() = mag(a.yx()); tmpA.yy() = mag(a.yy()); tmpA.yz() = mag(a.yz());
//// tmpA.yx() = mag(a.yx());
//// tmpA.yy() = mag(a.yy());
//// tmpA.yz() = mag(a.yz());
//// minAngle = mag(ayy);
//// }
//// if (mag(ayz) >= minAngle)
//// {
//// tmpA.yx() = mag(a.zx()); tmpA.yy() = mag(a.zy()); tmpA.yz() = mag(a.zz());
//// tmpA.yx() = mag(a.zx());
//// tmpA.yy() = mag(a.zy());
//// tmpA.yz() = mag(a.zz());
//// }
////
//// minAngle = 0;
////
//// if (mag(azx) >= minAngle)
//// {
//// tmpA.zx() = mag(a.xx()); tmpA.zy() = mag(a.xy()); tmpA.zz() = mag(a.xz());
//// tmpA.zx() = mag(a.xx());
//// tmpA.zy() = mag(a.xy());
//// tmpA.zz() = mag(a.xz());
//// minAngle = mag(azx);
//// }
//// if (mag(azy) >= minAngle)
//// {
//// tmpA.zx() = mag(a.yx()); tmpA.zy() = mag(a.yy()); tmpA.zz() = mag(a.yz());
//// tmpA.zx() = mag(a.yx());
//// tmpA.zy() = mag(a.yy());
//// tmpA.zz() = mag(a.yz());
//// minAngle = mag(azy);
//// }
//// if (mag(azz) >= minAngle)
//// {
//// tmpA.zx() = mag(a.zx()); tmpA.zy() = mag(a.zy()); tmpA.zz() = mag(a.zz());
//// tmpA.zx() = mag(a.zx());
//// tmpA.zy() = mag(a.zy());
//// tmpA.zz() = mag(a.zz());
//// }
////
//// alignments[aI] = tmpA;
......@@ -464,7 +488,8 @@ Foam::searchableSurfaceControl::~searchableSurfaceControl()
//// qAlignments[aI] = quaternion(alignments[aI]);
//// qAlignments[aI].normalize();
////// Info<< " Quaternion: " << qAlignments[aI] << endl;
////// Info<< " Rot tensor from quat: " << qAlignments[aI].R() << endl;
////// Info<< " Rot tensor from quat: " << qAlignments[aI].R()
////// << endl;
//// }
//
// tensor alignment = Foam::tensor::zero;
......@@ -491,10 +516,12 @@ Foam::searchableSurfaceControl::~searchableSurfaceControl()
//// + qAlignments[2]*bary[2]
//// + qAlignments[3]*bary[3];
//
//// alignment = slerp(qAlignments[0], qAlignments[1], bary[0]+bary[1]+bary[2]);
//// alignment =
//// slerp(qAlignments[0], qAlignments[1], bary[0]+bary[1]+bary[2]);
//// alignment = slerp(alignment, qAlignments[2], bary[0]+bary[1]+bary[2]);
//// alignment = slerp(alignment, qAlignments[3], bary[0]+bary[1]+bary[2]);
//// alignment = slerp(alignment, qAlignments[0], bary[0]/(bary[0]+bary[1]+bary[2]));
//// alignment =
//// slerp(alignment, qAlignments[0], bary[0]/(bary[0]+bary[1]+bary[2]));
//
//// Info<< " Interp alignment : " << alignment << endl;
//// Info<< " Interp rot tensor: " << alignment.R() << endl;
......
......@@ -54,7 +54,8 @@ class searchableSurfaceControl
{
// Private data
// //- Reference to the searchableSurfaces object holding all geometry data
//- Reference to the searchableSurface object holding the geometry
// data
const searchableSurface& searchableSurface_;
const conformationSurfaces& allGeometry_;
......@@ -115,8 +116,8 @@ public:
// Access
// //- Return reference to the searchableSurfaces object containing all
// // of the geometry
// //- Return reference to the searchableSurfaces object containing
// // all of the geometry
// inline const searchableSurfaces& geometry() const;
//
// //- Return the surface indices
......
......@@ -81,10 +81,10 @@ void Foam::conformalVoronoiMesh::checkCells()
inplaceReorder(oldToNew, cellVerticesPair);
inplaceReorder(oldToNew, cellVertices);
// Pout<< "old " << cellVerticesOld << nl << "new " << cellVertices << endl;
//
// FixedList<label, 4> globalTetCell(cit->globallyOrderedCellVertices(gIndex));
// FixedList<label, 4> globalTetCell
// (
// cit->globallyOrderedCellVertices(gIndex)
// );
//
// FixedList<Point, 4> cellVertices(Point(0,0,0));
//
......@@ -209,10 +209,11 @@ void Foam::conformalVoronoiMesh::checkDuals()
List<Point> duals(number_of_finite_cells());
typedef CGAL::Exact_predicates_exact_constructions_kernel EK2;
typedef CGAL::Regular_triangulation_euclidean_traits_3<EK2> EK;
typedef CGAL::Exact_predicates_exact_constructions_kernel EK2;
typedef CGAL::Regular_triangulation_euclidean_traits_3<EK2> EK;
typedef CGAL::Cartesian_converter<typename baseK::Kernel, EK2> To_exact;
typedef CGAL::Cartesian_converter<EK2, typename baseK::Kernel> Back_from_exact;
typedef CGAL::Cartesian_converter<EK2, typename baseK::Kernel>
Back_from_exact;
// PackedBoolList bPoints(number_of_finite_cells());
......@@ -370,7 +371,6 @@ void Foam::conformalVoronoiMesh::checkDuals()
std::cout<< "master = " << x << " " << y << " " << z
<< std::endl;
CGAL::Gmpq xs(CGAL::to_double(closestPoint.x()));
CGAL::Gmpq ys(CGAL::to_double(closestPoint.y()));
CGAL::Gmpq zs(CGAL::to_double(closestPoint.z()));
......@@ -390,14 +390,14 @@ void Foam::conformalVoronoiMesh::checkDuals()
CGAL::Gmpq y(CGAL::to_double(masterPoint.y()));
CGAL::Gmpq z(CGAL::to_double(masterPoint.z()));
std::cout<< "master = " << x << " " << y << " " << z << endl;
std::cout<< "master = " << x << " " << y << " " << z
<< endl;
CGAL::Gmpq xs(CGAL::to_double(closestPoint.x()));
CGAL::Gmpq ys(CGAL::to_double(closestPoint.y()));
CGAL::Gmpq zs(CGAL::to_double(closestPoint.z()));
std::cout<< "slave = " << xs << " " << ys << " " << zs << endl;
std::cout<< "slave = " << xs << " " << ys << " " << zs
<< endl;
}
}
else
......@@ -530,7 +530,8 @@ void Foam::conformalVoronoiMesh::calcDualMesh
// {
// Pout<< nl << "Perfoming some checks . . ." << nl << nl
// << "Total number of vertices = " << number_of_vertices() << nl
// << "Total number of cells = " << number_of_finite_cells() << endl;
// << "Total number of cells = " << number_of_finite_cells()
// << endl;
//
// checkVertices();
// checkCells();
......@@ -964,9 +965,12 @@ Foam::label Foam::conformalVoronoiMesh::mergeIdenticalDualVertices
////
//// if (surfHit.hit())
//// {
//// pt +=
//// (surfHit.hitPoint() - pt)
//// *pow(cvMeshControls().filterErrorReductionCoeff(), fC);
//// pt += (surfHit.hitPoint() - pt)
//// *pow
//// (
//// cvMeshControls().filterErrorReductionCoeff(),
//// fC
//// );
//// }
//// }
//// }
......@@ -1112,8 +1116,8 @@ Foam::label Foam::conformalVoronoiMesh::mergeIdenticalDualVertices
//// }
//
//
//// if ((faceNormal & surfaceNormal) < cosPerpendicularToleranceAngle)
//// {
// if ((faceNormal & surfaceNormal) < cosPerpendicularToleranceAngle)
// {
// scalar targetFaceSize = averageAnyCellSize(vA, vB);
//
// // Selecting faces to collapse based on angle to
......@@ -1135,7 +1139,7 @@ Foam::label Foam::conformalVoronoiMesh::mergeIdenticalDualVertices
// {
// nCollapsedFaces++;
// }
//// }
// }
// }
// }
//
......
......@@ -543,9 +543,9 @@ void Foam::processorPolyPatch::initOrder
pointField anchors(getAnchorPoints(pp, ppPoints, transform()));
// Get the average of the points of each face. This is needed in case
// the face centroid calculation is incorrect due tothe face having a
// very high aspect ratio.
// Get the average of the points of each face. This is needed in
// case the face centroid calculation is incorrect due to the face
// having a very high aspect ratio.
pointField facePointAverages(pp.size(), point::zero);
forAll(pp, fI)
{
......@@ -986,7 +986,8 @@ bool Foam::processorPolyPatch::order
Pout<< "processorPolyPatch::order :"
<< " Dumping newly found match as lines between"
<< " corresponding face centres to OBJ file " << ccStr.name()
<< " corresponding face centres to OBJ file "
<< ccStr.name()
<< endl;
label vertI = 0;
......@@ -1015,10 +1016,10 @@ bool Foam::processorPolyPatch::order
<< endl
<< " masterCtrs[0]:" << masterCtrs[0] << endl
<< " ctrs[0]:" << pp.faceCentres()[0] << endl
<< " Please check your topology changes or maybe you have"
<< " Check your topology changes or maybe you have"
<< " multiple separated (from cyclics) processor patches"
<< endl
<< " Continuing with incorrect face ordering from now on!"
<< " Continuing with incorrect face ordering from now on"
<< endl;
return false;
......@@ -1027,9 +1028,9 @@ bool Foam::processorPolyPatch::order
// Set rotation.
forAll(faceMap, oldFaceI)
{
// The face f will be at newFaceI (after morphing) and we want its
// anchorPoint (= f[0]) to align with the anchorpoint for the
// corresponding face on the other side.
// The face f will be at newFaceI (after morphing) and we want
// its anchorPoint (= f[0]) to align with the anchorpoint for
// the corresponding face on the other side.
label newFaceI = faceMap[oldFaceI];
......@@ -1055,8 +1056,9 @@ bool Foam::processorPolyPatch::order
<< " with vertices "
<< UIndirectList<point>(pp.points(), pp[oldFaceI])()
<< " that matches point " << wantedAnchor
<< " when matching the halves of processor patch " << name()
<< "Continuing with incorrect face ordering from now on!"
<< " when matching the halves of processor patch "
<< name()
<< "Continuing with incorrect face ordering from now on"
<< endl;
return false;
......
......@@ -574,9 +574,17 @@ Foam::label Foam::polyMeshFilter::filter(const label nOriginalBadFaces)
Info<< indent
<< "Collapsing " << nCollapsed << " faces"
<< " (to point = "
<< returnReduce(nCollapsedPtEdge.first(), sumOp<label>())
<< returnReduce
(
nCollapsedPtEdge.first(),
sumOp<label>()
)
<< ", to edge = "
<< returnReduce(nCollapsedPtEdge.second(), sumOp<label>())
<< returnReduce
(
nCollapsedPtEdge.second(),
sumOp<label>()
)
<< ")" << endl;
if (nCollapsed == 0)
......
Supports Markdown
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