ENH: support multiple zones for topo set sources (#1060)

- uses the keywords 'zones' and 'zone' to avoid potential conflicts
  with a named topoSet action, but accepts 'name' for compatibility.
This commit is contained in:
Mark Olesen
2018-10-29 12:54:30 +00:00
parent 26f6f4257a
commit c2e58dca64
25 changed files with 195 additions and 158 deletions

View File

@ -25,7 +25,7 @@ actions
source zoneToCell;
sourceInfo
{
name cylinder;
zone cylinder;
}
}
{

View File

@ -25,17 +25,7 @@ actions
source zoneToCell;
sourceInfo
{
name cylinder;
}
}
{
name rotorCells;
type cellSet;
action add;
source zoneToCell;
sourceInfo
{
name innerCylinder;
zones (cylinder innerCylinder);
}
}
{

View File

@ -46,13 +46,15 @@ FoamFile
// // Cells in cell zone
// source zoneToCell;
// {
// name ".*Zone"; // Name of cellZone, regular expressions allowed
// zones (".*Zone"); // Name of cellZones, regular expressions allowed
// zone ".*Zone"; // Name of cellZone, regular expressions allowed
// }
//
// // Cells on master or slave side of faceZone
// source faceZoneToCell;
// {
// name ".*Zone"; // Name of faceZone, regular expressions allowed
// zones (".*Zone"); // Name of faceZones, regular expressions allowed
// zone ".*Zone"; // Name of faceZone, regular expressions allowed
// option master; // master/slave
// }
//
@ -190,7 +192,7 @@ FoamFile
// // All faces of faceZone
// source zoneToFace;
// {
// name ".*Zone1"; // Name of faceZone, regular expressions allowed
// zone ".*Zone1"; // Name of faceZone, regular expressions allowed
// }
//
// // Faces with face centre within box
@ -240,7 +242,7 @@ FoamFile
// // All points in pointzone
// source zoneToPoint;
// {
// name ".*Zone"; // name of pointZone, regular expressions allowed
// zone ".*Zone"; // name of pointZone, regular expressions allowed
// }
//
// // Points nearest to coordinates

View File

@ -27,7 +27,7 @@ actions
source zoneToCell;
sourceInfo
{
name topBlock;
zone topBlock;
}
}
@ -39,7 +39,7 @@ actions
source zoneToCell;
sourceInfo
{
name centralBlock;
zone centralBlock;
}
}
@ -51,7 +51,7 @@ actions
source zoneToCell;
sourceInfo
{
name bottomBlock;
zone bottomBlock;
}
}

View File

@ -24,7 +24,7 @@ actions
source zoneToCell;
sourceInfo
{
name rotor;
zone rotor;
}
}
);

View File

@ -24,7 +24,7 @@ actions
source zoneToCell;
sourceInfo
{
name rotor;
zone rotor;
}
}
);

View File

@ -24,7 +24,7 @@ actions
source zoneToCell;
sourceInfo
{
name rotor;
zone rotor;
}
}
);

View File

@ -24,7 +24,7 @@ actions
source zoneToCell;
sourceInfo
{
name rotor;
zone rotor;
}
}
);

View File

@ -17,14 +17,14 @@ FoamFile
actions
(
{
name bgr0; // all around bgr
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
name background;
}
name bgr0; // all around bgr
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone background;
}
}
{
name hullBox0; // all around bgr
@ -33,7 +33,7 @@ actions
source zoneToCell;
sourceInfo
{
name hullBox;
zone hullBox;
}
}
{
@ -43,7 +43,7 @@ actions
source zoneToCell;
sourceInfo
{
name propeller;
zone propeller;
}
}
{
@ -53,7 +53,7 @@ actions
source zoneToCell;
sourceInfo
{
name rudder;
zone rudder;
}
}

View File

@ -17,14 +17,14 @@ FoamFile
actions
(
{
name bgr0; // all around bgr
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
name background;
}
name bgr0; // all around bgr
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone background;
}
}
{
name hullBox0; // all around hull
@ -33,7 +33,7 @@ actions
source zoneToCell;
sourceInfo
{
name hullBox;
zone hullBox;
}
}
{
@ -43,7 +43,7 @@ actions
source zoneToCell;
sourceInfo
{
name propeller;
zone propeller;
}
}
{
@ -53,7 +53,7 @@ actions
source zoneToCell;
sourceInfo
{
name rudder;
zone rudder;
}
}

View File

@ -17,14 +17,14 @@ FoamFile
actions
(
{
name bgr0; // all around bgr
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
name background;
}
name bgr0; // all around bgr
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone background;
}
}
{
name hullBox0; // all around hull
@ -33,7 +33,7 @@ actions
source zoneToCell;
sourceInfo
{
name hullBox;
zone hullBox;
}
}
{
@ -43,7 +43,7 @@ actions
source zoneToCell;
sourceInfo
{
name propeller;
zone propeller;
}
}
{
@ -53,7 +53,7 @@ actions
source zoneToCell;
sourceInfo
{
name rudder;
zone rudder;
}
}

View File

@ -24,7 +24,7 @@ actions
source zoneToCell;
sourceInfo
{
name rotor;
zone rotor;
}
}
);

View File

@ -24,7 +24,7 @@ actions
source zoneToCell;
sourceInfo
{
name rotor;
zone rotor;
}
}
);

View File

@ -24,7 +24,7 @@ actions
source zoneToCell;
sourceInfo
{
name rotor;
zone rotor;
}
}
);