Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openfoam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
openfoam
Commits
a2d54204
Commit
a2d54204
authored
12 years ago
by
mattijs
Browse files
Options
Downloads
Patches
Plain Diff
ENH: patchSummary: patchGroup support
parent
d838af50
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
applications/utilities/miscellaneous/patchSummary/patchSummary.C
+108
-38
108 additions, 38 deletions
...tions/utilities/miscellaneous/patchSummary/patchSummary.C
with
108 additions
and
38 deletions
applications/utilities/miscellaneous/patchSummary/patchSummary.C
+
108
−
38
View file @
a2d54204
...
@@ -28,6 +28,11 @@ Description
...
@@ -28,6 +28,11 @@ Description
Writes fields and boundary condition info for each patch at each requested
Writes fields and boundary condition info for each patch at each requested
time instance.
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"
#include
"fvCFD.H"
...
@@ -37,6 +42,60 @@ Description
...
@@ -37,6 +42,60 @@ 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
[])
int
main
(
int
argc
,
char
*
argv
[])
{
{
timeSelector
::
addOptions
();
timeSelector
::
addOptions
();
...
@@ -44,18 +103,20 @@ int main(int argc, char *argv[])
...
@@ -44,18 +103,20 @@ int main(int argc, char *argv[])
# include "addRegionOption.H"
# include "addRegionOption.H"
argList
::
addBoolOption
argList
::
addBoolOption
(
(
"
collate
"
,
"
expand
"
,
"
Combine similar
patches"
"
Do not combine
patches"
);
);
# include "setRootCase.H"
# include "setRootCase.H"
# include "createTime.H"
# include "createTime.H"
instantList
timeDirs
=
timeSelector
::
select0
(
runTime
,
args
);
instantList
timeDirs
=
timeSelector
::
select0
(
runTime
,
args
);
const
bool
collate
=
args
.
optionFound
(
"
collate
"
);
const
bool
expand
=
args
.
optionFound
(
"
expand
"
);
# include "createNamedMesh.H"
# include "createNamedMesh.H"
const
polyBoundaryMesh
&
bm
=
mesh
.
boundaryMesh
();
forAll
(
timeDirs
,
timeI
)
forAll
(
timeDirs
,
timeI
)
{
{
...
@@ -63,6 +124,14 @@ int main(int argc, char *argv[])
...
@@ -63,6 +124,14 @@ int main(int argc, char *argv[])
Info
<<
"Time = "
<<
runTime
.
timeName
()
<<
nl
<<
endl
;
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
IOobjectList
fieldObjs
(
mesh
,
runTime
.
timeName
());
const
wordList
objNames
=
fieldObjs
.
names
();
const
wordList
objNames
=
fieldObjs
.
names
();
...
@@ -96,13 +165,32 @@ int main(int argc, char *argv[])
...
@@ -96,13 +165,32 @@ int main(int argc, char *argv[])
Info
<<
endl
;
Info
<<
endl
;
const
polyBoundaryMesh
&
bm
=
mesh
.
boundaryMesh
();
DynamicList
<
HashTable
<
word
>
>
fieldToTypes
(
bm
.
size
());
if
(
expand
)
DynamicList
<
DynamicList
<
label
>
>
groupToPatches
(
bm
.
size
());
{
forAll
(
bm
,
patchI
)
// Print each patch separately
forAll
(
bm
,
patchI
)
{
Info
<<
bm
[
patchI
].
type
()
<<
": "
<<
bm
[
patchI
].
name
()
<<
nl
;
outputFieldList
<
scalar
>
(
vsf
,
patchI
);
outputFieldList
<
vector
>
(
vvf
,
patchI
);
outputFieldList
<
sphericalTensor
>
(
vsptf
,
patchI
);
outputFieldList
<
symmTensor
>
(
vsytf
,
patchI
);
outputFieldList
<
tensor
>
(
vtf
,
patchI
);
Info
<<
endl
;
}
}
else
{
{
if
(
collate
)
// Collect for each patch the bc type per field. Merge similar
// patches.
// Per 'group', the map from fieldname to patchfield type
DynamicList
<
HashTable
<
word
>
>
fieldToTypes
(
bm
.
size
());
// Per 'group' the patches
DynamicList
<
DynamicList
<
label
>
>
groupToPatches
(
bm
.
size
());
forAll
(
bm
,
patchI
)
{
{
HashTable
<
word
>
fieldToType
;
HashTable
<
word
>
fieldToType
;
collectFieldList
<
scalar
>
(
vsf
,
patchI
,
fieldToType
);
collectFieldList
<
scalar
>
(
vsf
,
patchI
,
fieldToType
);
...
@@ -124,46 +212,28 @@ int main(int argc, char *argv[])
...
@@ -124,46 +212,28 @@ int main(int argc, char *argv[])
groupToPatches
[
groupI
].
append
(
patchI
);
groupToPatches
[
groupI
].
append
(
patchI
);
}
}
}
}
else
{
Info
<<
bm
[
patchI
].
type
()
<<
": "
<<
bm
[
patchI
].
name
()
<<
nl
;
outputFieldList
<
scalar
>
(
vsf
,
patchI
);
outputFieldList
<
vector
>
(
vvf
,
patchI
);
outputFieldList
<
sphericalTensor
>
(
vsptf
,
patchI
);
outputFieldList
<
symmTensor
>
(
vsytf
,
patchI
);
outputFieldList
<
tensor
>
(
vtf
,
patchI
);
Info
<<
endl
;
}
}
bool
hasGroups
=
false
;
forAll
(
groupToPatches
,
groupI
)
{
const
DynamicList
<
label
>&
patchIDs
=
groupToPatches
[
groupI
];
if
(
patchIDs
.
size
()
>
1
)
{
hasGroups
=
true
;
break
;
}
}
if
(
hasGroups
)
{
Info
<<
"Collated:"
<<
endl
;
forAll
(
groupToPatches
,
groupI
)
forAll
(
groupToPatches
,
groupI
)
{
{
const
DynamicList
<
label
>&
patchIDs
=
groupToPatches
[
groupI
];
const
DynamicList
<
label
>&
patchIDs
=
groupToPatches
[
groupI
];
if
(
patchIDs
.
size
()
>
1
)
if
(
patchIDs
.
size
()
>
1
)
{
{
Info
<<
'('
<<
bm
[
patchIDs
[
0
]].
name
();
// Check if part of a group
for
(
label
i
=
1
;
i
<
patchIDs
.
size
();
i
++
)
wordList
patchOrGroup
(
matchGroupOrPatch
(
bm
,
patchIDs
).
sortedToc
()
);
//Info<< patchOrGroup << endl;
Info
<<
patchOrGroup
[
0
];
for
(
label
i
=
1
;
i
<
patchOrGroup
.
size
();
i
++
)
{
{
Info
<<
' '
<<
bm
[
patch
IDs
[
i
]].
name
()
;
Info
<<
' '
<<
patch
OrGroup
[
i
]
;
}
}
Info
<<
')'
<<
endl
;
Info
<<
endl
;
outputFieldList
<
scalar
>
(
vsf
,
patchIDs
[
0
]);
outputFieldList
<
scalar
>
(
vsf
,
patchIDs
[
0
]);
outputFieldList
<
vector
>
(
vvf
,
patchIDs
[
0
]);
outputFieldList
<
vector
>
(
vvf
,
patchIDs
[
0
]);
outputFieldList
<
sphericalTensor
>
(
vsptf
,
patchIDs
[
0
]);
outputFieldList
<
sphericalTensor
>
(
vsptf
,
patchIDs
[
0
]);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment