Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
e63b58b6
Commit
e63b58b6
authored
Apr 02, 2013
by
andy
Browse files
Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev
parents
8b2f5696
b264b92a
Changes
2
Hide whitespace changes
Inline
Side-by-side
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View file @
e63b58b6
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
2
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
3
OpenFOAM Foundation
\\/ M anispulation |
-------------------------------------------------------------------------------
License
...
...
@@ -494,7 +494,13 @@ autoPtr<mapPolyMesh> reorderMesh
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
...
...
@@ -508,6 +514,7 @@ autoPtr<mapPolyMesh> reorderMesh
reverseCellOrder
,
cellZones
[
zoneI
]
)();
Foam
::
sort
(
cellZones
[
zoneI
]);
}
}
...
...
src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
View file @
e63b58b6
...
...
@@ -77,10 +77,12 @@ Foam::PatchTools::sortedEdgeFaces
{
if
(
f0
[
fpI
]
!=
e
.
start
())
{
const
vector
faceEdgeDir
=
localPoints
[
f0
[
fpI
]]
-
edgePt
;
const
scalar
angle
=
faceEdgeDir
&
e2
;
vector
faceEdgeDir
=
localPoints
[
f0
[
fpI
]]
-
edgePt
;
faceEdgeDir
/=
mag
(
faceEdgeDir
)
+
VSMALL
;
if
(
angle
<
maxAngle
)
const
scalar
angle
=
e2
&
faceEdgeDir
;
if
(
mag
(
angle
)
<
maxAngle
)
{
maxAngle
=
angle
;
maxAngleEdgeDir
=
faceEdgeDir
;
...
...
@@ -114,10 +116,12 @@ Foam::PatchTools::sortedEdgeFaces
{
if
(
f
[
fpI
]
!=
e
.
start
())
{
const
vector
faceEdgeDir
=
localPoints
[
f
[
fpI
]]
-
edgePt
;
const
scalar
angle
=
faceEdgeDir
&
e2
;
vector
faceEdgeDir
=
localPoints
[
f
[
fpI
]]
-
edgePt
;
faceEdgeDir
/=
mag
(
faceEdgeDir
)
+
VSMALL
;
const
scalar
angle
=
e2
&
faceEdgeDir
;
if
(
angle
<
maxAngle
)
if
(
mag
(
angle
)
<
maxAngle
)
{
maxAngle
=
angle
;
maxAngleEdgeDir
=
faceEdgeDir
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment