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,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-100 -100 -0.2)(100 100 100);
}
box (-100 -100 -0.2)(100 100 100);
}
{
@ -33,11 +30,8 @@ actions
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set z;
option all;
}
set z;
option all;
}
{
@ -51,11 +45,8 @@ actions
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set z;
option all;
}
set z;
option all;
}
// ~~~~~~~~~~~~~~~~ //
@ -65,10 +56,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-0.32 -100 -100)(100 100 100);
}
box (-0.32 -100 -100)(100 100 100);
}
{
@ -76,11 +64,8 @@ actions
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set x;
option all;
}
set x;
option all;
}
{
@ -94,11 +79,8 @@ actions
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set x;
option all;
}
set x;
option all;
}
// ~~~~~~~~~~~~~~~~ //
@ -108,11 +90,8 @@ actions
type cellSet;
action new;
source sphereToCell;
sourceInfo
{
origin (-0.3 -0.3 -0.3);
radius 0.4;
}
origin (-0.3 -0.3 -0.3);
radius 0.4;
}
{
@ -120,11 +99,8 @@ actions
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set sp;
option all;
}
set sp;
option all;
}
{
@ -138,11 +114,8 @@ actions
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set sp;
option all;
}
set sp;
option all;
}
);

View File

@ -139,8 +139,8 @@ FoamFile
// source fieldToCell;
// {
// field U; // Note: uses mag(U) since volVectorField
// min 0.1;
// max 0.5;
// min 0.1;
// max 0.5;
// }
//
// // Mesh region (non-face connected part of (subset of)mesh)
@ -204,7 +204,7 @@ FoamFile
// // Faces with normal to within certain angle aligned with vector.
// source normalToFace;
// {
// normal (0 0 1); // Vector
// normal (0 0 1); // Vector
// cos 0.01; // Tolerance (max cos of angle)
// }
//
@ -222,15 +222,15 @@ FoamFile
// // Select based on cellSet
// source cellToPoint;
// {
// set c0;
// option all; // all points of cell
// set c0;
// option all; // all points of cell
// }
//
// // Select based on faceSet
// source faceToPoint;
// {
// set f0; // name of faceSet
// option all; // all points of face
// set f0; // name of faceSet
// option all; // all points of face
// }
//
// // Select by explicitly providing point labels
@ -304,7 +304,7 @@ actions
name background;
type cellSet;
action new;
source surfaceToCell;
source surfaceToCell;
sourceInfo
{
file "constant/triSurface/flange.obj";

View File

@ -26,10 +26,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-100 -100 $zSlice)(100 100 100);
}
box (-100 -100 $zSlice)(100 100 100);
}
{
@ -37,11 +34,8 @@ actions
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set z;
option all;
}
set z;
option all;
}
{
@ -55,11 +49,8 @@ actions
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set z;
option all;
}
set z;
option all;
}
// ~~~~~~~~~~~~~~~~ //
@ -69,10 +60,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-100 $ySlice -100)(100 100 100);
}
box (-100 $ySlice -100)(100 100 100);
}
{
@ -80,11 +68,8 @@ actions
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set y;
option all;
}
set y;
option all;
}
{
@ -98,11 +83,8 @@ actions
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set y;
option all;
}
set y;
option all;
}
// ~~~~~~~~~~~~~~~~ //
@ -112,10 +94,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box ($xSlice -100 -100)(100 100 100);
}
box ($xSlice -100 -100)(100 100 100);
}
{
@ -123,11 +102,8 @@ actions
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set x;
option all;
}
set x;
option all;
}
{
@ -141,11 +117,8 @@ actions
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set x;
option all;
}
set x;
option all;
}
);

View File

@ -22,10 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-100 -100 0)(100 100 100);
}
box (-100 -100 0)(100 100 100);
}
{
@ -33,11 +30,8 @@ actions
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set z;
option all;
}
set z;
option all;
}
{
@ -51,11 +45,8 @@ actions
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set z;
option all;
}
set z;
option all;
}
// ~~~~~~~~~~~~~~~~ //
@ -65,10 +56,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-100 0.1 -100)(100 100 100);
}
box (-100 0.1 -100)(100 100 100);
}
{
@ -76,11 +64,8 @@ actions
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set y;
option all;
}
set y;
option all;
}
{
@ -94,11 +79,8 @@ actions
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set y;
option all;
}
set y;
option all;
}
// ~~~~~~~~~~~~~~~~ //
@ -108,10 +90,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (0.3 -100 -100)(100 100 100);
}
box (0.3 -100 -100)(100 100 100);
}
{
@ -119,11 +98,8 @@ actions
type faceSet;
action new;
source cellToFace;
sourceInfo
{
set x;
option all;
}
set x;
option all;
}
{
@ -137,11 +113,8 @@ actions
type faceSet;
action subset;
source cellToFace;
sourceInfo
{
set x;
option all;
}
set x;
option all;
}
);