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-04-02 13:34:01 +01:00
parent 8b2f56966d b264b92a77
commit e63b58b64e
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anispulation | \\/ M anispulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -494,7 +494,13 @@ autoPtr<mapPolyMesh> reorderMesh
newFlipMap[i] = fZone.flipMap()[i]; newFlipMap[i] = fZone.flipMap()[i];
} }
} }
fZone.resetAddressing(newAddressing, newFlipMap); labelList newToOld;
sortedOrder(newAddressing, newToOld);
fZone.resetAddressing
(
UIndirectList<label>(newAddressing, newToOld)(),
UIndirectList<bool>(newFlipMap, newToOld)()
);
} }
} }
// Re-do the cellZones // Re-do the cellZones
@ -508,6 +514,7 @@ autoPtr<mapPolyMesh> reorderMesh
reverseCellOrder, reverseCellOrder,
cellZones[zoneI] cellZones[zoneI]
)(); )();
Foam::sort(cellZones[zoneI]);
} }
} }

16
src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
View File

@ -77,10 +77,12 @@ Foam::PatchTools::sortedEdgeFaces
{ {
if (f0[fpI] != e.start()) if (f0[fpI] != e.start())
{ {
const vector faceEdgeDir = localPoints[f0[fpI]] - edgePt; vector faceEdgeDir = localPoints[f0[fpI]] - edgePt;
const scalar angle = faceEdgeDir & e2; faceEdgeDir /= mag(faceEdgeDir) + VSMALL;
if (angle < maxAngle) const scalar angle = e2 & faceEdgeDir;
if (mag(angle) < maxAngle)
{ {
maxAngle = angle; maxAngle = angle;
maxAngleEdgeDir = faceEdgeDir; maxAngleEdgeDir = faceEdgeDir;
@ -114,10 +116,12 @@ Foam::PatchTools::sortedEdgeFaces
{ {
if (f[fpI] != e.start()) if (f[fpI] != e.start())
{ {
const vector faceEdgeDir = localPoints[f[fpI]] - edgePt; vector faceEdgeDir = localPoints[f[fpI]] - edgePt;
const scalar angle = faceEdgeDir & e2; faceEdgeDir /= mag(faceEdgeDir) + VSMALL;
if (angle < maxAngle) const scalar angle = e2 & faceEdgeDir;
if (mag(angle) < maxAngle)
{ {
maxAngle = angle; maxAngle = angle;
maxAngleEdgeDir = faceEdgeDir; maxAngleEdgeDir = faceEdgeDir;