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

@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionsToCell;
sourceInfo
{
insidePoints ((0.001 0.001 0.001));
}
insidePoints ((0.001 0.001 0.001));
}
{
@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set c0;
}
set c0;
}
{
@ -49,11 +43,8 @@ actions
type cellSet;
action new;
source regionsToCell;
sourceInfo
{
insidePoints ((0.0116 0.00151 0.001));//((0.0076 0.00151 0.001));
set c1;
}
insidePoints ((0.0116 0.00151 0.001));//((0.0076 0.00151 0.001));
set c1;
}
{
@ -61,10 +52,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
sourceInfo
{
set c2;
}
set c2;
}
// Select box to remove from region 1 and 2
@ -74,10 +62,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set c1;
}
set c1;
}
{
@ -85,10 +70,7 @@ actions
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set c2;
}
set c2;
}
{
@ -96,15 +78,12 @@ actions
type cellSet;
action subset;
source boxToCell;
sourceInfo
{
boxes
(
(0.0025 0.0045 -100)(0.0075 0.0055 100)
//(0.0085 0.0025 -100)(0.0095 0.0075 100)
(0.0125 0.0025 -100)(0.0135 0.0075 100)
);
}
boxes
(
(0.0025 0.0045 -100)(0.0075 0.0055 100)
//(0.0085 0.0025 -100)(0.0095 0.0075 100)
(0.0125 0.0025 -100)(0.0135 0.0075 100)
);
}
{

View File

@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionToCell;
sourceInfo
{
insidePoints ((-1.999 0 -1.999));
}
insidePoints ((-1.999 0 -1.999));
}
{
@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set c0;
}
set c0;
}
{