zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2013-06-04 14:47:12 +01:00
parent b8b5f6c100 a0097c43a9
commit 210807a025
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
View File

@ -513,7 +513,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
// Sample the box to find an estimate of the min size, and a volume // Sample the box to find an estimate of the min size, and a volume
// estimate when overlapping == true. // estimate when overlapping == true.
const conformationSurfaces& geometry = geometryToConformTo_; // const conformationSurfaces& geometry = geometryToConformTo_;
treeBoundBox cellBb treeBoundBox cellBb
( (

11
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
View File

@ -442,12 +442,13 @@ void Foam::searchableSurfaceControl::initialVertices
intersectionList intersectionList
); );
if (intersectionList[0].hit()) // if (intersectionList[0].hit())
{ // {
scalar dist = mag(intersectionList[0].hitPoint() - pts[pI]); // scalar dist =
// mag(intersectionList[0].hitPoint() - pts[pI]);
//
// limitedCellSize = dist/2.0; // limitedCellSize = dist/2.0;
} // }
} }
} }

10
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
View File

@ -319,8 +319,6 @@ void Foam::controlMeshRefinement::initialMeshPopulation
sizes.clear(); sizes.clear();
alignments.clear(); alignments.clear();
label nRejected = 0;
PackedBoolList keepVertex(vertices.size(), true); PackedBoolList keepVertex(vertices.size(), true);
forAll(vertices, vI) forAll(vertices, vI)
@ -496,8 +494,6 @@ void Foam::controlMeshRefinement::initialMeshPopulation
} }
} }
label nRejected = 0;
PackedBoolList keepVertex(vertices.size(), true); PackedBoolList keepVertex(vertices.size(), true);
forAll(vertices, vI) forAll(vertices, vI)
@ -602,9 +598,9 @@ void Foam::controlMeshRefinement::initialMeshPopulation
// if (newPtPriority >= highestPriority) // if (newPtPriority >= highestPriority)
// { // {
const label oldSize = mesh_.vertexCount(); // const label oldSize = mesh_.vertexCount();
//
cellShapeControlMesh::Vertex_handle insertedVert = // cellShapeControlMesh::Vertex_handle insertedVert =
mesh_.insert mesh_.insert
( (
pt, pt,

2
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
View File

@ -2076,8 +2076,6 @@ Foam::vector Foam::conformalVoronoiMesh::calcSharedPatchNormal
{ {
List<Foam::point> patchEdge(2, point::max); List<Foam::point> patchEdge(2, point::max);
label count = 0;
// Get shared Facet // Get shared Facet
for (label cI = 0; cI < 4; ++cI) for (label cI = 0; cI < 4; ++cI)
{ {

12
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
View File

@ -111,6 +111,10 @@ bool Foam::conformalVoronoiMesh::meshableRegion
{ {
return false; return false;
} }
default:
{
return false;
}
} }
} }
@ -944,8 +948,8 @@ void Foam::conformalVoronoiMesh::createMixedFeaturePoints
// external edge groups at feature point. // external edge groups at feature point.
// Skipping unsupported mixed feature point types // Skipping unsupported mixed feature point types
bool skipEdge = false; // bool skipEdge = false;
//
// forAll(pEds, e) // forAll(pEds, e)
// { // {
// const label edgeI = pEds[e]; // const label edgeI = pEds[e];
@ -1231,7 +1235,7 @@ void Foam::conformalVoronoiMesh::addMasterAndSlavePoints
) )
); );
const label masterIndex = pts[pts.size() - 1].index(); // const label masterIndex = pts[pts.size() - 1].index();
//meshTools::writeOBJ(strMasters, masterPt); //meshTools::writeOBJ(strMasters, masterPt);
@ -1330,7 +1334,7 @@ void Foam::conformalVoronoiMesh::createMasterAndSlavePoints
// Loop around the edges of the feature point // Loop around the edges of the feature point
if (circ.size()) do if (circ.size()) do
{ {
const edgeStatus eStatusPrev = feMesh.getEdgeStatus(circ.prev()); // const edgeStatus eStatusPrev = feMesh.getEdgeStatus(circ.prev());
const edgeStatus eStatusCurr = feMesh.getEdgeStatus(circ()); const edgeStatus eStatusCurr = feMesh.getEdgeStatus(circ());
// const edgeStatus eStatusNext = feMesh.getEdgeStatus(circ.next()); // const edgeStatus eStatusNext = feMesh.getEdgeStatus(circ.next());