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
Community
integration-cfmesh
Commits
f591f118
Commit
f591f118
authored
Jun 04, 2015
by
Franjo
Browse files
Merge branch 'enhancement-subsetWithBadFaces' into developmentPublicRepo
parents
81cda8c5
8eb41606
Changes
3
Hide whitespace changes
Inline
Side-by-side
meshLibrary/utilities/smoothers/geometry/meshOptimizer/optimizeMeshFV.C
View file @
f591f118
...
...
@@ -285,6 +285,17 @@ void meshOptimizer::untangleMeshFV
}
while
(
nBadFaces
);
if
(
nBadFaces
!=
0
)
{
label
subsetId
=
mesh_
.
faceSubsetIndex
(
"badFaces"
);
if
(
subsetId
>=
0
)
mesh_
.
removeFaceSubset
(
subsetId
);
subsetId
=
mesh_
.
addFaceSubset
(
"badFaces"
);
forAllConstIter
(
labelHashSet
,
badFaces
,
it
)
mesh_
.
addFaceToSubset
(
subsetId
,
it
.
key
());
}
Info
<<
"Finished untangling the mesh"
<<
endl
;
}
...
...
meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.C
View file @
f591f118
...
...
@@ -83,7 +83,7 @@ meshSurfaceOptimizer::meshSurfaceOptimizer(const meshSurfaceEngine& surface)
octreePtr_
(
NULL
),
triMeshPtr_
(
NULL
),
enforceConstraints_
(
false
),
badPointsSubsetName_
()
badPointsSubsetName_
(
"invertedBoundaryPoints"
)
{
classifySurfaceVertices
();
}
...
...
@@ -97,7 +97,7 @@ meshSurfaceOptimizer::meshSurfaceOptimizer(const meshSurfacePartitioner& mPart)
octreePtr_
(
NULL
),
triMeshPtr_
(
NULL
),
enforceConstraints_
(
false
),
badPointsSubsetName_
()
badPointsSubsetName_
(
"invertedBoundaryPoints"
)
{
classifySurfaceVertices
();
}
...
...
@@ -115,7 +115,7 @@ meshSurfaceOptimizer::meshSurfaceOptimizer
octreePtr_
(
&
octree
),
triMeshPtr_
(
NULL
),
enforceConstraints_
(
false
),
badPointsSubsetName_
()
badPointsSubsetName_
(
"invertedBoundaryPoints"
)
{
classifySurfaceVertices
();
}
...
...
@@ -133,7 +133,7 @@ meshSurfaceOptimizer::meshSurfaceOptimizer
octreePtr_
(
&
octree
),
triMeshPtr_
(
NULL
),
enforceConstraints_
(
false
),
badPointsSubsetName_
()
badPointsSubsetName_
(
"invertedBoundaryPoints"
)
{
classifySurfaceVertices
();
}
...
...
meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C
View file @
f591f118
...
...
@@ -542,6 +542,23 @@ bool meshSurfaceOptimizer::untangleSurface
deleteDemandDrivenData
(
mapperPtr
);
if
(
nInvertedTria
!=
0
)
{
//- the procedure has given up without success
//- there exist some remaining inverted faces in the mesh
polyMeshGen
&
mesh
=
const_cast
<
polyMeshGen
&>
(
surfaceEngine_
.
mesh
());
label
subsetId
=
mesh
.
pointSubsetIndex
(
badPointsSubsetName_
);
if
(
subsetId
>=
0
)
mesh
.
removePointSubset
(
subsetId
);
subsetId
=
mesh
.
addPointSubset
(
badPointsSubsetName_
);
forAll
(
smoothVertex
,
bpI
)
if
(
smoothVertex
[
bpI
]
)
mesh
.
addPointToSubset
(
subsetId
,
bPoints
[
bpI
]);
}
Info
<<
"Finished untangling the surface of the volume mesh"
<<
endl
;
return
changed
;
...
...
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