Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Community
integration-cfmesh
Commits
2aebbcdb
Commit
2aebbcdb
authored
Sep 22, 2014
by
Franjo
Browse files
Merge branch 'feature-regExpIntersecting' into development
parents
db3f8105
1eba5582
Changes
1
Hide whitespace changes
Inline
Side-by-side
meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingCreation.C
View file @
2aebbcdb
...
...
@@ -374,15 +374,17 @@ void meshOctreeAddressing::findUsedBoxes() const
boolList
removeFacets
(
ts
.
size
(),
false
);
//- remove facets in patches
forAll
(
ts
.
patches
(),
patchI
)
forAll
ConstIter
(
HashSet
<
word
>
,
patchesToRemove
,
it
)
{
if
(
patchesToRemove
.
found
(
ts
.
patches
()[
patchI
].
name
())
)
const
labelList
matchedPatches
=
ts
.
findPatches
(
it
.
key
());
boolList
activePatch
(
ts
.
patches
().
size
(),
false
);
forAll
(
matchedPatches
,
ptchI
)
activePatch
[
matchedPatches
[
ptchI
]]
=
true
;
forAll
(
ts
,
triI
)
{
forAll
(
ts
,
triI
)
{
if
(
ts
[
triI
].
region
()
==
patchI
)
removeFacets
[
triI
]
=
true
;
}
if
(
activePatch
[
ts
[
triI
].
region
()]
)
removeFacets
[
triI
]
=
true
;
}
}
...
...
@@ -441,20 +443,22 @@ void meshOctreeAddressing::findUsedBoxes() const
const
triSurf
&
ts
=
octree_
.
surface
();
boolList
keepFacets
(
ts
.
size
(),
false
);
//-
remove
facets in patches
forAll
(
ts
.
patches
(),
patchI
)
//-
keep
facets in patches
forAll
ConstIter
(
HashSet
<
word
>
,
patchesToKeep
,
it
)
{
if
(
patchesToKeep
.
found
(
ts
.
patches
()[
patchI
].
name
())
)
const
labelList
matchedPatches
=
ts
.
findPatches
(
it
.
key
());
boolList
activePatch
(
ts
.
patches
().
size
(),
false
);
forAll
(
matchedPatches
,
ptchI
)
activePatch
[
matchedPatches
[
ptchI
]]
=
true
;
forAll
(
ts
,
triI
)
{
forAll
(
ts
,
triI
)
{
if
(
ts
[
triI
].
region
()
==
patchI
)
keepFacets
[
triI
]
=
true
;
}
if
(
activePatch
[
ts
[
triI
].
region
()]
)
keepFacets
[
triI
]
=
true
;
}
}
//-
remove
facets in subsets
//-
keep
facets in subsets
forAllConstIter
(
wordHashSet
,
patchesToKeep
,
it
)
{
const
label
subsetID
=
ts
.
facetSubsetIndex
(
it
.
key
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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