diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C index d344845fae..d23acc6a69 100644 --- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C +++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.C @@ -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 @@ -28,6 +28,11 @@ Description Writes fields and boundary condition info for each patch at each requested time instance. + Default action is to write a single entry for patches/patchGroups with the + same boundary conditions. Use the -expand option to print every patch + separately. In case of multiple groups matching it will print only the + first one. + \*---------------------------------------------------------------------------*/ #include "fvCFD.H" @@ -42,12 +47,22 @@ int main(int argc, char *argv[]) timeSelector::addOptions(); # include "addRegionOption.H" + argList::addBoolOption + ( + "expand", + "Do not combine patches" + ); # include "setRootCase.H" # include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); + const bool expand = args.optionFound("expand"); + + # include "createNamedMesh.H" + const polyBoundaryMesh& bm = mesh.boundaryMesh(); + forAll(timeDirs, timeI) { @@ -55,6 +70,14 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; + // Update the mesh if changed + if (mesh.readUpdate() == polyMesh::TOPO_PATCH_CHANGE) + { + Info<< "Detected changed patches. Recreating patch group table." + << endl; + } + + const IOobjectList fieldObjs(mesh, runTime.timeName()); const wordList objNames = fieldObjs.names(); @@ -88,16 +111,87 @@ int main(int argc, char *argv[]) Info<< endl; - const polyBoundaryMesh& bm = mesh.boundaryMesh(); - forAll(bm, patchI) + + if (expand) { - Info<< bm[patchI].type() << ": " << bm[patchI].name() << nl; - outputFieldList(vsf, patchI); - outputFieldList(vvf, patchI); - outputFieldList(vsptf, patchI); - outputFieldList(vsytf, patchI); - outputFieldList(vtf, patchI); - Info<< endl; + // Print each patch separately + + forAll(bm, patchI) + { + Info<< bm[patchI].type() << "\t: " << bm[patchI].name() << nl; + outputFieldList(vsf, patchI); + outputFieldList(vvf, patchI); + outputFieldList(vsptf, patchI); + outputFieldList(vsytf, patchI); + outputFieldList(vtf, patchI); + Info<< endl; + } + } + else + { + // Collect for each patch the bc type per field. Merge similar + // patches. + + // Per 'group', the map from fieldname to patchfield type + DynamicList > fieldToTypes(bm.size()); + // Per 'group' the patches + DynamicList > groupToPatches(bm.size()); + forAll(bm, patchI) + { + HashTable fieldToType; + collectFieldList(vsf, patchI, fieldToType); + collectFieldList(vvf, patchI, fieldToType); + collectFieldList(vsptf, patchI, fieldToType); + collectFieldList(vsytf, patchI, fieldToType); + collectFieldList(vtf, patchI, fieldToType); + + label groupI = findIndex(fieldToTypes, fieldToType); + if (groupI == -1) + { + DynamicList