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 regionToCell;
sourceInfo
{
insidePoints ((-4.999 0 -3.999));
}
insidePoints ((-4.999 0 -3.999));
}
{
@ -32,10 +29,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set c0;
}
set c0;
}
{

View File

@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source regionToCell;
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;
}
{
@ -51,10 +45,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set c1;
}
set c1;
}
{
@ -62,10 +53,7 @@ actions
type cellSet;
action subset;
source boxToCell;
sourceInfo
{
box (0.0025 0.0045 -100)(0.0075 0.0055 100);
}
box (0.0025 0.0045 -100)(0.0075 0.0055 100);
}
{

View File

@ -21,10 +21,10 @@ actions
type cellSet;
action new;
source regionsToCell;
sourceInfo
{
insidePoints ((0.001 0.001 0.001));
}
insidePoints
(
(0.001 0.001 0.001)
);
}
{
@ -32,10 +32,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set c0;
}
set c0;
}
{
@ -49,11 +46,11 @@ actions
type cellSet;
action new;
source regionsToCell;
sourceInfo
{
insidePoints ((0.0076 0.00151 0.001));
set c1;
}
set c1;
insidePoints
(
(0.0076 0.00151 0.001)
);
}
{
@ -61,10 +58,7 @@ actions
type cellSet;
action subtract;
source cellToCell;
sourceInfo
{
set c2;
}
set c2;
}
// Select box to remove from region 1 and 2
@ -74,10 +68,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set c1;
}
set c1;
}
{
@ -85,10 +76,7 @@ actions
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set c2;
}
set c2;
}
{
@ -96,15 +84,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.0104 0.0025 -100)(0.0115 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.0104 0.0025 -100)(0.0115 0.0075 100)
);
}
{

View File

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

View File

@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (0.099 -0.006 0.004)(0.101 0.006 0.016);
}
box (0.099 -0.006 0.004)(0.101 0.006 0.016);
}
{
@ -33,10 +30,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-10 -10 -10)(0.1 10 10);
}
box (-10 -10 -10)(0.1 10 10);
}
{
@ -44,11 +38,8 @@ actions
type faceZoneSet;
action new;
source setsToFaceZone;
sourceInfo
{
faceSet cyclicFacesFaceSet;
cellSet cyclicFacesSlaveCells;
}
faceSet cyclicFacesFaceSet;
cellSet cyclicFacesSlaveCells;
}
{
@ -56,10 +47,7 @@ actions
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (0.099 -10 -10)(0.101 10 10);
}
box (0.099 -10 -10)(0.101 10 10);
}
{
@ -67,10 +55,7 @@ actions
type faceSet;
action subtract;
source boxToFace;
sourceInfo
{
box (0.099 -0.006 0.004)(0.101 0.006 0.016);
}
box (0.099 -0.006 0.004)(0.101 0.006 0.016);
}
{
@ -78,10 +63,7 @@ actions
type faceZoneSet;
action new;
source setToFaceZone;
sourceInfo
{
faceSet baffleFaceSet;
}
faceSet baffleFaceSet;
}
);

View File

@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (-0.84 -0.31 -0.01)(-0.82 0.31 0.06);
}
box (-0.84 -0.31 -0.01)(-0.82 0.31 0.06);
}
);

View File

@ -25,20 +25,14 @@ actions
type faceSet;
action new;
source patchToFace;
sourceInfo
{
patch couple1;
}
patch couple1;
}
{
name couple1Faces;
type faceZoneSet;
action new;
source setToFaceZone;
sourceInfo
{
faceSet couple1FaceSet;
}
faceSet couple1FaceSet;
}
// Create faceZone for patch couple2
@ -47,20 +41,14 @@ actions
type faceSet;
action new;
source patchToFace;
sourceInfo
{
patch couple2;
}
patch couple2;
}
{
name couple2Faces;
type faceZoneSet;
action new;
source setToFaceZone;
sourceInfo
{
faceSet couple2FaceSet;
}
faceSet couple2FaceSet;
}
// Create cellZone for moving cells in inlet channel
@ -69,20 +57,14 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-100 -100 -100) (1.0001 100 100);
}
box (-100 -100 -100) (1.0001 100 100);
}
{
name inletChannel;
type cellZoneSet;
action new;
source setToCellZone;
sourceInfo
{
set inletChannelCellSet;
}
set inletChannelCellSet;
}
);

View File

@ -22,10 +22,7 @@ actions
type faceSet;
action new;
source patchToFace;
sourceInfo
{
patch outerCylinder;
}
patch outerCylinder;
}
{
@ -33,10 +30,7 @@ actions
type faceSet;
action new;
source faceToFace;
sourceInfo
{
set boundaryFaces;
}
set boundaryFaces;
}
{
@ -44,10 +38,7 @@ actions
type faceSet;
action new;
source faceToFace;
sourceInfo
{
set boundaryFaces;
}
set boundaryFaces;
}
{
@ -55,11 +46,8 @@ actions
type faceSet;
action subset;
source normalToFace;
sourceInfo
{
normal (0 -1 0); // Vector
cos 0.3; // Tolerance (max cos of angle)
}
normal (0 -1 0);
cos 0.3; // Tolerance (max cos of angle)
}
{
@ -67,11 +55,8 @@ actions
type faceSet;
action subset;
source normalToFace;
sourceInfo
{
normal (0 1 0); // Vector
cos 0.3; // Tolerance (max cos of angle)
}
normal (0 1 0);
cos 0.3; // Tolerance (max cos of angle)
}
);

View File

@ -25,10 +25,7 @@ actions
type faceSet;
action new;
source patchToFace;
sourceInfo
{
patch "AMI.*";
}
patch "AMI.*";
}
);

View File

@ -23,20 +23,14 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-0.5 -0.5 -1) (0.5 0.5 1);
}
box (-0.5 -0.5 -1) (0.5 0.5 1);
}
{
name porousBlockage;
type cellZoneSet;
action new;
source setToCellZone;
sourceInfo
{
set porousBlockageCellSet;
}
set porousBlockageCellSet;
}
);

View File

@ -22,31 +22,22 @@ actions
type faceSet;
action new;
source patchToFace;
sourceInfo
{
patch side1;
}
patch side1;
}
{
name f0;
type faceSet;
action subset;
source boxToFace;
sourceInfo
{
box (0 -100 -100)(100 -0.2 100);
}
box (0 -100 -100)(100 -0.2 100);
}
{
name c0;
type cellSet;
action new;
source faceToCell;
sourceInfo
{
set f0;
option any;
}
set f0;
option any;
}
@ -55,21 +46,15 @@ actions
type faceSet;
action new;
source patchToFace;
sourceInfo
{
patch walls;
}
patch walls;
}
{
name c0;
type cellSet;
action subtract;
source faceToCell;
sourceInfo
{
set walls;
option any;
}
set walls;
option any;
}
);

View File

@ -22,20 +22,14 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (2.05 0.4 -1) (2.1 0.85 1);
}
box (2.05 0.4 -1) (2.1 0.85 1);
}
{
name porousZone;
type cellZoneSet;
action new;
source setToCellZone;
sourceInfo
{
set porousCells;
}
set porousCells;
}
);

View File

@ -23,20 +23,14 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (581850.5 4785805 1061) (581850.8 4785815 1071);
}
box (581850.5 4785805 1061) (581850.8 4785815 1071);
}
{
name actuationDisk1;
type cellZoneSet;
action new;
source setToCellZone;
sourceInfo
{
set actuationDisk1CellSet;
}
set actuationDisk1CellSet;
}
// actuationDisk2
@ -45,20 +39,14 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (581754 4785658 1065) (581754.4 4785668 1075);
}
box (581754 4785658 1065) (581754.4 4785668 1075);
}
{
name actuationDisk2;
type cellZoneSet;
action new;
source setToCellZone;
sourceInfo
{
set actuationDisk2CellSet;
}
set actuationDisk2CellSet;
}
);