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

@ -22,13 +22,10 @@ actions
type cellSet;
action new;
source regionToCell;
sourceInfo
{
insidePoints
(
(0.99 0.99 0.99)
);
}
insidePoints
(
(0.99 0.99 0.99)
);
}
{
@ -36,10 +33,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-1 -1 -1)(0.5 0.5 0.5);
}
box (-1 -1 -1)(0.5 0.5 0.5);
}
{
@ -47,10 +41,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set corner;
}
set corner;
}
{
@ -58,10 +49,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
sourceInfo
{
set outer;
}
set outer;
}
{
@ -69,10 +57,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
sourceInfo
{
set corner;
}
set corner;
}
{
@ -86,20 +71,14 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set outer;
}
set outer;
}
{
name final;
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set inner;
}
set inner;
}
);

View File

@ -19,10 +19,7 @@ newFromPatch
type faceSet;
action new;
source patchToFace;
sourceInfo
{
patch outer;
}
patch outer;
}
subsetNormal
@ -30,10 +27,7 @@ subsetNormal
type faceSet;
action subset;
source normalToFace;
sourceInfo
{
cos 0.1;
}
cos 0.1;
}
actions
@ -47,10 +41,7 @@ actions
{
name outerx;
$subsetNormal;
sourceInfo
{
normal (-1 0 0);
}
normal (-1 0 0);
}
// outery
@ -62,10 +53,7 @@ actions
{
name outery;
$subsetNormal;
sourceInfo
{
normal (0 -1 0);
}
normal (0 -1 0);
}
// outerz
@ -77,10 +65,7 @@ actions
{
name outerz;
$subsetNormal;
sourceInfo
{
normal (0 0 -1);
}
normal (0 0 -1);
}
);