zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: make sourceInfo sub-dictionary optional for topoSet (#1060)

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

57
tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull
View File

@ -21,40 +21,28 @@ actions
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone background;
}
zone background;
}
{
name hullBox0; // all around bgr
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone hullBox;
}
zone hullBox;
}
{
name propeller0; // all around bgr
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone propeller;
}
zone propeller;
}
{
name rudder0; // all around bgr
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone rudder;
}
zone rudder;
}
{
@ -62,25 +50,18 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set hullBox0;
}
set hullBox0;
}
{
name box; // hole in mesh
type cellSet;
action subset;
source boxToCell;
sourceInfo
{
boxes
(
(0.05 -0.082 -0.1)(0.52 0.052 0.1) //hullBox
);
}
boxes
(
(0.05 -0.082 -0.1)(0.52 0.052 0.1) //hullBox
);
}
{
@ -93,40 +74,28 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set box;
}
set box;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set propeller0;
}
set propeller0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set rudder0;
}
set rudder0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set bgr0;
}
set bgr0;
}
);

54
tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller
View File

@ -21,40 +21,28 @@ actions
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone background;
}
zone background;
}
{
name hullBox0; // all around hull
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone hullBox;
}
zone hullBox;
}
{
name propeller0; // all around propeller
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone propeller;
}
zone propeller;
}
{
name rudder0; // all around rudder
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone rudder;
}
zone rudder;
}
{
@ -62,10 +50,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set propeller0;
}
set propeller0;
}
@ -74,13 +59,10 @@ actions
type cellSet;
action subset;
source boxToCell;
sourceInfo
{
boxes
(
boxes
(
(-0.0199 -0.0499 -0.0499)( -0.00998 0.0499 0.0499) //propeller
);
}
);
}
{
@ -93,40 +75,28 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set box;
}
set box;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set rudder0;
}
set rudder0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set hullBox0;
}
set hullBox0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set bgr0;
}
set bgr0;
}
);

11
tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine
View File

@ -21,13 +21,10 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
boxes
(
(-0.2 -0.2 -0.2)(0.0 0.2 0.2) //hullBox
);
}
boxes
(
(-0.2 -0.2 -0.2)(0.0 0.2 0.2) //hullBox
);
}
);

54
tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder
View File

@ -21,40 +21,28 @@ actions
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone background;
}
zone background;
}
{
name hullBox0; // all around hull
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone hullBox;
}
zone hullBox;
}
{
name propeller0; // all around propeller
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone propeller;
}
zone propeller;
}
{
name rudder0; // all around rudder
type cellSet;
action new;
source zoneToCell;
sourceInfo
{
zone rudder;
}
zone rudder;
}
{
@ -62,10 +50,7 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set rudder0;
}
set rudder0;
}
@ -74,13 +59,10 @@ actions
type cellSet;
action subset;
source boxToCell;
sourceInfo
{
boxes
(
boxes
(
(-0.10 -0.0749 -0.00499)(-0.050 0.0749 0.00499) //rudder
);
}
);
}
{
@ -93,40 +75,28 @@ actions
type cellSet;
action new;
source cellToCell;
sourceInfo
{
set box;
}
set box;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set propeller0;
}
set propeller0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set hullBox0;
}
set hullBox0;
}
{
name keepBox; //all cells
type cellSet;
action add;
source cellToCell;
sourceInfo
{
set bgr0;
}
set bgr0;
}
);

10
tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict
View File

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

5
tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict
View File

@ -21,10 +21,7 @@ actions
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (0.38 0.38 0.2) (0.62 0.62 0.6);
}
box (0.38 0.38 0.2) (0.62 0.62 0.6);
}
{

45
tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict
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));
set c1;
}
insidePoints ((0.0116 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,14 +78,11 @@ actions
type cellSet;
action subset;
source boxToCell;
sourceInfo
{
boxes
(
(0.0025 0.0045 -100)(0.0075 0.0055 100)
(0.0125 0.0025 -100)(0.0135 0.0075 100)
);
}
boxes
(
(0.0025 0.0045 -100)(0.0075 0.0055 100)
(0.0125 0.0025 -100)(0.0135 0.0075 100)
);
}
{