ENH: make sourceInfo sub-dictionary optional for topoSet (#1060)

- helps reduce clutter in the topoSetDict files.

  Caveats when using this.

  The older specification styles using "name" will conflict with the
  set name. Eg,

    {
        name    f0
        type    faceSet;
        action  add;
        source  patchToFace;
        sourceInfo
        {
            name   inlet;
        }
    }

    would flattened to the following
    {
        name    f0
        type    faceSet;
        action  add;
        source  patchToFace;
        name   inlet;
    }
    which overwrites the "name" used for the faceSet.

    The solution is to use the updated syntax:

    {
        name    f0
        type    faceSet;
        action  add;
        source  patchToFace;
        patch   inlet;
    }
This commit is contained in:
Mark Olesen
2018-11-07 10:33:36 +01:00
parent 6090faedef
commit 5f556ffb4a
120 changed files with 612 additions and 1851 deletions

View File

@ -24,10 +24,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (15.5 15.5 0)(24.5 24.5 9);
}
box (15.5 15.5 0)(24.5 24.5 9);
}
// floor
@ -36,21 +33,15 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (0 0 -2)(41 41 0);
}
box (0 0 -2)(41 41 0);
}
{
{
name floor;
type cellZoneSet;
action new;
source setToCellZone;
sourceInfo
{
set floor;
}
set floor;
}
//air
@ -65,10 +56,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
sourceInfo
{
set floor;
}
set floor;
}
{
@ -76,10 +64,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
sourceInfo
{
set solid; // name of cellSet
}
set solid; // cellSet
}
{
@ -87,10 +72,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (17 17 0)(23 23 7.5);
}
box (17 17 0)(23 23 7.5);
}
//- Define again solid
@ -99,10 +81,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (15.5 15.5 0)(24.5 24.5 9);
}
box (15.5 15.5 0)(24.5 24.5 9);
}
{
@ -110,10 +89,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
sourceInfo
{
set cavity;
}
set cavity;
}
{
@ -121,10 +97,7 @@ actions
type cellZoneSet;
action new;
source setToCellZone;
sourceInfo
{
set solid; // name of cellSet
}
set solid; // cellSet
}
);