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

ENH: polyBoundaryMesh: matches patches to patchgroups

Browse Source
This commit is contained in:
mattijs
2012-06-27 13:03:50 +01:00
parent 5696a83fbe
commit 6e68e105ca
3 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
applications/utilities/miscellaneous/patchSummary/patchSummary.C
View File

@ -42,60 +42,6 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Return names of groups and patches. If multiple groups the first one wins.
wordHashSet matchGroupOrPatch
(
const polyBoundaryMesh& bm,
const labelList& patchIDs
)
{
// Current matched groups
wordHashSet matchedGroups;
// Current set of unmatched patches
labelHashSet nonGroupPatches(patchIDs);
const HashTable<labelList, word>& groupPatchIDs =
bm.groupPatchIDs();
for
(
HashTable<labelList,word>::const_iterator iter =
groupPatchIDs.begin();
iter != groupPatchIDs.end();
++iter
)
{
// Store currently unmatched patches
labelHashSet oldNonGroupPatches(nonGroupPatches);
// Match by deleting patches in group from the current set and seeing
// if all have been deleted.
labelHashSet groupPatchSet(iter());
label nMatch = nonGroupPatches.erase(groupPatchSet);
if (nMatch == groupPatchSet.size())
{
matchedGroups.insert(iter.key());
}
else
{
// No full match. Undo.
nonGroupPatches.transfer(oldNonGroupPatches);
}
}
// Add remaining patches
forAllConstIter(labelHashSet, nonGroupPatches, iter)
{
matchedGroups.insert(bm[iter.key()].name());
}
return matchedGroups;
}
int main(int argc, char *argv[])
{
timeSelector::addOptions();
@ -172,7 +118,7 @@ int main(int argc, char *argv[])
forAll(bm, patchI)
{
Info<< bm[patchI].type() << ": " << bm[patchI].name() << nl;
Info<< bm[patchI].type() << "\t: " << bm[patchI].name() << nl;
outputFieldList<scalar>(vsf, patchI);
outputFieldList<vector>(vvf, patchI);
outputFieldList<sphericalTensor>(vsptf, patchI);
@ -221,19 +167,23 @@ int main(int argc, char *argv[])
if (patchIDs.size() > 1)
{
// Check if part of a group
wordList patchOrGroup
(
matchGroupOrPatch(bm, patchIDs).sortedToc()
);
wordList groups;
labelHashSet nonGroupPatches;
bm.matchGroups(patchIDs, groups, nonGroupPatches);
//Info<< patchOrGroup << endl;
Info<< patchOrGroup[0];
for (label i = 1; i < patchOrGroup.size(); i++)
const labelList sortedPatches(nonGroupPatches.sortedToc());
forAll(sortedPatches, i)
{
Info<< ' ' << patchOrGroup[i];
Info<< bm[sortedPatches[i]].type()
<< "\t: " << bm[sortedPatches[i]].name() << nl;
}
if (groups.size())
{
forAll(groups, i)
{
Info<< "group\t: " << groups[i] << nl;
}
}
Info<< endl;
outputFieldList<scalar>(vsf, patchIDs[0]);
outputFieldList<vector>(vvf, patchIDs[0]);
outputFieldList<sphericalTensor>(vsptf, patchIDs[0]);

48
src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -792,6 +792,52 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
}
void Foam::polyBoundaryMesh::matchGroups
(
const labelUList& patchIDs,
wordList& groups,
labelHashSet& nonGroupPatches
) const
{
// Current matched groups
DynamicList<word> matchedGroups(1);
// Current set of unmatched patches
nonGroupPatches = labelHashSet(patchIDs);
const HashTable<labelList, word>& groupPatchIDs = this->groupPatchIDs();
for
(
HashTable<labelList,word>::const_iterator iter =
groupPatchIDs.begin();
iter != groupPatchIDs.end();
++iter
)
{
// Store currently unmatched patches so we can restore
labelHashSet oldNonGroupPatches(nonGroupPatches);
// Match by deleting patches in group from the current set and seeing
// if all have been deleted.
labelHashSet groupPatchSet(iter());
label nMatch = nonGroupPatches.erase(groupPatchSet);
if (nMatch == groupPatchSet.size())
{
matchedGroups.append(iter.key());
}
else if (nMatch != 0)
{
// No full match. Undo.
nonGroupPatches.transfer(oldNonGroupPatches);
}
}
groups.transfer(matchedGroups);
}
bool Foam::polyBoundaryMesh::checkParallelSync(const bool report) const
{
if (!Pstream::parRun())

11
src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -195,6 +195,15 @@ public:
const bool usePatchGroups = true
) const;
//- Match the patches to groups. Returns all the (fully matched) groups
// and any remaining unmatched patches.
void matchGroups
(
const labelUList& patchIDs,
wordList& groups,
labelHashSet& nonGroupPatches
) const;
//- Check whether all procs have all patches and in same order. Return
// true if in error.
bool checkParallelSync(const bool report = false) const;