Commit 2aebbcdb authored by Franjo's avatar Franjo
Browse files

Merge branch 'feature-regExpIntersecting' into development

parents db3f8105 1eba5582
......@@ -374,15 +374,17 @@ void meshOctreeAddressing::findUsedBoxes() const
boolList removeFacets(ts.size(), false);
//- remove facets in patches
forAll(ts.patches(), patchI)
forAllConstIter(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
forAllConstIter(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());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment