ENH: topoSetSource::SUBTRACT enum action (#1060)

- old 'DELETE' enum was easily confused with 'REMOVE', which removes
  the set, not the elements from the set.

- provide corresponding subtractSet() method

STYLE: HashSet set/unset instead of insert/erase methods in topoSetSource

- simplifies switching to/from bitSet storage
This commit is contained in:
Mark Olesen
2018-10-30 15:09:44 +00:00
parent 9b638f9a71
commit 7325e3ac7d
79 changed files with 288 additions and 283 deletions

View File

@ -228,19 +228,13 @@ actions
{
name wallPanel;
type faceZoneSet;
action delete;
action subtract;
source setToFaceZone;
sourceInfo
{
faceSet inletFace;
}
}
);
// ************************************************************************* //

View File

@ -59,7 +59,7 @@ actions
{
name c1;
type cellSet;
action delete;
action subtract;
source cellToCell;
sourceInfo
{

View File

@ -63,7 +63,7 @@ actions
{
name solid;
type cellSet;
action delete;
action subtract;
source cellToCell;
sourceInfo
{
@ -108,7 +108,7 @@ actions
{
name solid;
type cellSet;
action delete;
action subtract;
source cellToCell;
sourceInfo
{

View File

@ -59,7 +59,7 @@ actions
{
name c1;
type cellSet;
action delete;
action subtract;
source cellToCell;
sourceInfo
{

View File

@ -65,7 +65,7 @@ actions
{
name baffleFaceSet;
type faceSet;
action delete;
action subtract;
source boxToFace;
sourceInfo
{

View File

@ -63,7 +63,7 @@ actions
{
name c0;
type cellSet;
action delete;
action subtract;
source faceToCell;
sourceInfo
{

View File

@ -1,6 +1,6 @@
cellSet c0 new
cellSet c0 invert
cellSet c0 delete boxToCell (0.4 0.1 0.1) (0.6 0.3 0.3)
cellSet c0 delete boxToCell (0.4 0.1 0.4) (0.6 0.3 0.6)
cellSet c0 delete boxToCell (0.4 0.4 0.1) (0.6 0.6 0.3)
cellSet c0 delete boxToCell (0.4 0.4 0.4) (0.6 0.6 0.6)
cellSet c0 subtract boxToCell (0.4 0.1 0.1) (0.6 0.3 0.3)
cellSet c0 subtract boxToCell (0.4 0.1 0.4) (0.6 0.3 0.6)
cellSet c0 subtract boxToCell (0.4 0.4 0.1) (0.6 0.6 0.3)
cellSet c0 subtract boxToCell (0.4 0.4 0.4) (0.6 0.6 0.6)

View File

@ -30,7 +30,7 @@ actions
{
name c0;
type cellSet;
action delete;
action subtract;
source boxToCell;
sourceInfo
{
@ -40,7 +40,7 @@ actions
{
name c0;
type cellSet;
action delete;
action subtract;
source boxToCell;
sourceInfo
{
@ -50,7 +50,7 @@ actions
{
name c0;
type cellSet;
action delete;
action subtract;
source boxToCell;
sourceInfo
{
@ -60,7 +60,7 @@ actions
{
name c0;
type cellSet;
action delete;
action subtract;
source boxToCell;
sourceInfo
{

View File

@ -18,8 +18,8 @@ FoamFile
// Name of set to operate on
name facesToBeRemoved;
// One of (clear | new | invert | add | delete | subset | list)
action new;
// One of (add | subtract | subset | clear | new | invert | list)
action new;
// Actions to apply to pointSet. These are all the topoSetSource's ending
// in ..ToFace (see the meshTools library).

View File

@ -23,7 +23,7 @@ FoamFile
//
// // action to perform on set. Two types:
// // - require no source : clear/invert
// // - require source : new/add/delete/subset
// // - require source : add/subtract/subset/new
// action new;
//
// The source entry varies according to the type of set:

View File

@ -56,7 +56,7 @@ actions
{
name inner;
type cellSet;
action delete;
action subtract;
source cellToCell;
sourceInfo
{
@ -67,7 +67,7 @@ actions
{
name outer;
type cellSet;
action delete;
action subtract;
source cellToCell;
sourceInfo
{

View File

@ -263,7 +263,7 @@ actions
{
name topBlockCells;
type cellSet;
action delete;
action subtract;
source cellToCell;
sourceInfo
{

View File

@ -1,3 +1,3 @@
cellSet c0 new
cellSet c0 invert
cellSet c0 delete boxToCell (0.375 0.375 0) (0.625 0.625 0.25)
cellSet c0 subtract boxToCell (0.375 0.375 0) (0.625 0.625 0.25)

View File

@ -30,7 +30,7 @@ actions
{
name c0;
type cellSet;
action delete;
action subtract;
source boxToCell;
sourceInfo
{

View File

@ -30,7 +30,7 @@ actions
{
name c0;
type cellSet;
action delete;
action subtract;
source boxToCell;
sourceInfo
{

View File

@ -59,7 +59,7 @@ actions
{
name c1;
type cellSet;
action delete;
action subtract;
source cellToCell;
sourceInfo
{