From 50b1ae648dc0024266c8a2e35019b7fb9a215c90 Mon Sep 17 00:00:00 2001 From: graham <g.macpherson@opencfd.co.uk> Date: Tue, 21 Dec 2010 18:00:06 +0000 Subject: [PATCH] ENH: Small improvements. Returns by reference. Not writing cellCentres. Implement surface outside ( = !inside) function. --- .../conformalVoronoiMesh.C | 6 +-- ...alVoronoiMeshFeaturePointSpecialisations.C | 14 ++++--- .../conformalVoronoiMeshIO.C | 40 ++++++++++--------- .../conformationSurfaces.C | 2 +- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C index 47d049e20dd..c7567200c10 100644 --- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C +++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C @@ -563,7 +563,7 @@ void Foam::conformalVoronoiMesh::insertConvexFeaturePoints() vector cornerNormal = sum(featPtNormals); cornerNormal /= mag(cornerNormal); - point internalPt = featPt - pointPairDistance(featPt)*cornerNormal; + point internalPt = featPt - pointPairDistance(featPt)*cornerNormal; label internalPtIndex = insertPoint(internalPt, number_of_vertices() + 1); @@ -651,7 +651,7 @@ void Foam::conformalVoronoiMesh::insertMixedFeaturePoints() // non-specialised feature points, inserting mixed internal and // external edge groups at feature point. - labelList pEds(feMesh.pointEdges()[ptI]); + const labelList& pEds(feMesh.pointEdges()[ptI]); // Skipping unsupported mixed feature point types @@ -695,7 +695,7 @@ void Foam::conformalVoronoiMesh::insertMixedFeaturePoints() label edgeI = pEds[e]; point edgePt = - pt + edgeGroupDistance*feMesh.edgeDirection(edgeI, ptI); + pt + edgeGroupDistance*feMesh.edgeDirection(edgeI, ptI); pointIndexHit edgeHit(true, edgePt, edgeI); diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C index a57cf654318..ea9206897f5 100644 --- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C +++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePointSpecialisations.C @@ -33,7 +33,7 @@ bool Foam::conformalVoronoiMesh::insertSpecialisedFeaturePoint label ptI ) { - labelList pEds(feMesh.pointEdges()[ptI]); + const labelList& pEds(feMesh.pointEdges()[ptI]); if (pEds.size() != 3) { @@ -48,13 +48,17 @@ bool Foam::conformalVoronoiMesh::insertSpecialisedFeaturePoint label nOpen = 0; label nMultiple = 0; - forAll(pEds, e) + List<featureEdgeMesh::edgeStatus> allEdStat(pEds.size()); + + forAll(pEds, i) { - label edgeI = pEds[e]; + label edgeI = pEds[i]; + + featureEdgeMesh::edgeStatus& eS = allEdStat[i]; - featureEdgeMesh::edgeStatus edStatus = feMesh.getEdgeStatus(edgeI); + eS = feMesh.getEdgeStatus(edgeI); - switch (edStatus) + switch (eS) { case featureEdgeMesh::EXTERNAL: { diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C index df153258acf..8960adba954 100644 --- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C +++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C @@ -304,26 +304,28 @@ void Foam::conformalVoronoiMesh::writeMesh << exit(FatalError); } - pointIOField cellCs - ( - IOobject - ( - "cellCentres", - mesh.pointsInstance(), - fvMesh::meshSubDir, - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - cellCentres - ); - - Info<< nl - << "Writing " << cellCs.name() - << " to " << cellCs.instance() - << endl; + Info<< "Not writing cell centres" << endl; - cellCs.write(); + // pointIOField cellCs + // ( + // IOobject + // ( + // "cellCentres", + // mesh.pointsInstance(), + // fvMesh::meshSubDir, + // mesh, + // IOobject::NO_READ, + // IOobject::AUTO_WRITE + // ), + // cellCentres + // ); + + // Info<< nl + // << "Writing " << cellCs.name() + // << " to " << cellCs.instance() + // << endl; + + // cellCs.write(); writeCellSizes(mesh); } diff --git a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C index 1dbe372db08..f85193b820e 100644 --- a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C +++ b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C @@ -325,7 +325,7 @@ bool Foam::conformationSurfaces::outside const point& samplePt ) const { - return wellOutside(pointField(1, samplePt), scalarField(1, 0))[0]; + return !inside(samplePt); } -- GitLab