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;
    }

applications/utilities/mesh/manipulation/topoSet/topoSet.C

@@ -251,8 +251,8 @@ int main(int argc, char *argv[])
              || action == topoSetSource::CLEAR
             )
             {
-                currentSet = topoSet::New(setType, mesh, setName, 10000);
+                currentSet = topoSet::New(setType, mesh, setName, 16384);
-                Info<< "Created " << currentSet().type() << " "
+                Info<< "Created " << currentSet().type() << ' '
                     << setName << endl;
             }
             else if (action == topoSetSource::REMOVE)
@@ -268,7 +268,7 @@ int main(int argc, char *argv[])
                     setName,
                     IOobject::MUST_READ
                 );
-                Info<< "Read set " << currentSet().type() << " "
+                Info<< "Read set " << currentSet().type() << ' '
                     << setName << " with size "
                     << returnReduce(currentSet().size(), sumOp<label>())
                     << endl;
@@ -283,14 +283,14 @@ int main(int argc, char *argv[])
                 case topoSetSource::ADD:
                 case topoSetSource::SUBTRACT:
                 {
-                    const word sourceName(dict.get<word>("source"));
+                    const word sourceType(dict.get<word>("source"));
 
-                    Info<< "    Applying source " << sourceName << endl;
+                    Info<< "    Applying source " << sourceType << endl;
                     autoPtr<topoSetSource> source = topoSetSource::New
                     (
-                        sourceName,
+                        sourceType,
                         mesh,
-                        dict.subDict("sourceInfo")
+                        dict.optionalSubDict("sourceInfo")
                     );
 
                     source().applyToSet(action, currentSet());
@@ -308,14 +308,14 @@ int main(int argc, char *argv[])
 
                 case topoSetSource::SUBSET:
                 {
-                    const word sourceName(dict.get<word>("source"));
+                    const word sourceType(dict.get<word>("source"));
 
-                    Info<< "    Applying source " << sourceName << endl;
+                    Info<< "    Applying source " << sourceType << endl;
                     autoPtr<topoSetSource> source = topoSetSource::New
                     (
-                        sourceName,
+                        sourceType,
                         mesh,
-                        dict.subDict("sourceInfo")
+                        dict.optionalSubDict("sourceInfo")
                     );
 
                     // Backup current set.
@@ -385,7 +385,7 @@ int main(int argc, char *argv[])
             if (currentSet.valid())
             {
                 Info<< "    "
-                    << currentSet().type() << " "
+                    << currentSet().type() << ' '
                     << currentSet().name() << " now size "
                     << returnReduce(currentSet().size(), sumOp<label>())
                     << endl;

tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/topoSetDict

@@ -21,22 +21,16 @@ actions
         type    cellSet;
         action  new;
         source  regionToCell;
-        sourceInfo
-        {
         insidePoints ((0.001 0.001 0.001));
     }
-    }
 
     {
         name    c1;
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c0;
     }
-    }
 
     {
         name    c1;
@@ -51,22 +45,16 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c1;
     }
-    }
 
     {
         name    box;
         type    cellSet;
         action  subset;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.4 0.4 -100)(0.6 0.6 100);
     }
-    }
 
     {
         name    box;

tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/topoSetDict

@@ -21,22 +21,16 @@ actions
         type    cellSet;
         action  new;
         source  regionToCell;
-        sourceInfo
-        {
         insidePoints ((-1.999 0 -1.999));
     }
-    }
 
     {
         name    c1;
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c0;
     }
-    }
 
     {
         name    c1;

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict

@@ -22,56 +22,41 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (1 1 0.99) (2 2 1);
     }
-    }
 
     {
         name    blockedCellsSet;
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (2.4 2.4 0) (3 3 1);
     }
-    }
 
     {
         name    blockedCellsSet;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0 0 0) (0.6 0.6 1);
     }
-    }
 
     {
         name    blockedFacesSet;
         type    faceSet;
         action  add;
         source  cellToFace;
-        sourceInfo
-        {
         set     blockedCellsSet;
         option  all;
     }
-    }
 
     {
         name    coupledFacesSet;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (1.0 1.99 0) (2.0 2.09 0.6);
     }
-    }
 
 );
 

tutorials/combustion/fireFoam/LES/compartmentFire/system/topoSetDict

@@ -22,219 +22,159 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.201 -0.001 -0.201)(-0.199 0.031 0.201);
     }
-    }
 
     {
         name    slot_bottom;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet slot_bottom;
     }
-    }
     {
         name    slot_top;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.201 0.369 -0.201)(-0.199 0.401 0.201);
     }
-    }
 
     {
         name    slot_top;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet slot_top;
     }
-    }
 
     {
         name    inletFace;
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   inlet;
     }
-    }
 
     {
         name    compartment_fire;
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.201 -0.001 -0.201)(0.201 0.401 0.201);
     }
-    }
 
     {
         name    compartment_fire;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     compartment_fire;
     }
-    }
 
     {
         name    internalWallPanel;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.2001 0.0301 -0.2001)(-0.1999 0.3701 0.2001);
     }
-    }
 
     {
         name    internalWallPanel;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet internalWallPanel;
     }
-    }
 
     {
         name    wallFaces_back;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.2001 -0.0001 -0.2001)(0.2001 0.4001 -0.1999);
     }
-    }
 
     {
         name    wallFaces_front;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.2001 -0.0001 0.1999)(0.2001 0.4001 0.2001);
     }
-    }
 
     {
         name    wallFaces_top;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.2001 0.3999 -0.2001)(0.2001 0.4001 0.2001);
     }
-    }
 
     {
         name    wallFaces_side;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (0.1999 -0.0001 -0.2001)(0.2001 0.4001 0.2001);
     }
-    }
 
     {
         name    wallPanel;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet wallFaces_back;
     }
-    }
 
     {
         name    wallPanel;
         type    faceZoneSet;
         action  add;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet wallFaces_front;
     }
-    }
 
     {
         name    wallPanel;
         type    faceZoneSet;
         action  add;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet wallFaces_top;
     }
-    }
 
     {
         name    wallPanel;
         type    faceZoneSet;
         action  add;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet wallFaces_side;
     }
-    }
 
     {
         name    baseFace;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.2001 -0.001 -0.2001)(0.2001 0.001 0.2001);
     }
-    }
 
     {
         name    wallPanel;
         type    faceZoneSet;
         action  add;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet baseFace;
     }
-    }
 
     {
         name    wallPanel;
         type    faceZoneSet;
         action  subtract;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet inletFace;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/filmRegion/topoSetDict

@@ -22,11 +22,8 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-1 -0.00001 -0.00001) (1 1.00001 0.00001);
     }
-    }
 
 
     {
@@ -34,33 +31,24 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-1 0.99999 -0.00001) (1 1.00001 2.00001);
     }
-    }
 
     {
         name    f2;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-1 -0.00001 1.99999) (1 1.00001 2.00001);
     }
-    }
 
     {
         name    f3;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-1 -0.00001 -0.00001) (1 0.00001 2.00001);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/system/topoSetDict

@@ -22,11 +22,8 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.1 -2.1 -0.1)(0.201 2.51 0.01);
     }
-    }
 
 
     {
@@ -34,22 +31,16 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   coupledWallTmp;
     }
-    }
 
     {
         name    coupledWall;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet coupledWall;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/cRefine.topoSetDict

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.15 0.0 -0.3)(0.15 2.4 0.3);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/f.topoSetDict

@@ -22,44 +22,31 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.151 0 -0.3)(-0.14999 2.4 0.3);
     }
-    }
     {
         name    fRight;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (0.14999 0 -0.3)(0.151 2.4 0.3);
     }
-    }
 
     {
         name    fRight_zone;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet fRight;
     }
-    }
 
     {
         name    fLeft_zone;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet fLeft;
     }
-    }
-
 );
 
 

tutorials/combustion/fireFoam/LES/oppositeBurningPanels/system/fBurner.topoSetDict

@@ -22,11 +22,8 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.15 -0.001 -0.30) (0.15 0.001 0.30);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/LES/simplePMMApanel/system/topoSetDict

@@ -22,22 +22,16 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   coupledPatch;
     }
-    }
 
     {
         name    panel;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet coupledPatch;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/LES/smallPoolFire2D/system/topoSetDict

@@ -22,11 +22,8 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/combustion/fireFoam/LES/smallPoolFire3D/system/topoSetDict

@@ -22,11 +22,8 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.1 -0.001 -0.1)(0.1 0.005 0.1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/topoSetDict

@@ -21,22 +21,16 @@ actions
         type    cellSet;
         action  new;
         source  regionsToCell;
-        sourceInfo
-        {
         insidePoints ((0.001 0.001 0.001));
     }
-    }
 
     {
         name    c1;
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c0;
     }
-    }
 
     {
         name    c1;
@@ -49,23 +43,17 @@ actions
         type    cellSet;
         action  new;
         source  regionsToCell;
-        sourceInfo
-        {
         insidePoints ((0.0116 0.00151 0.001));//((0.0076 0.00151 0.001));
         set     c1;
     }
-    }
 
     {
         name    c1;
         type    cellSet;
         action  subtract;
         source  cellToCell;
-        sourceInfo
-        {
         set     c2;
     }
-    }
 
     // Select box to remove from region 1 and 2
 
@@ -74,30 +62,22 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c1;
     }
-    }
 
     {
         name    box;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     c2;
     }
-    }
 
     {
         name    box;
         type    cellSet;
         action  subset;
         source  boxToCell;
-        sourceInfo
-        {
         boxes
         (
             (0.0025 0.0045 -100)(0.0075 0.0055 100)
@@ -105,7 +85,6 @@ actions
             (0.0125 0.0025 -100)(0.0135 0.0075 100)
         );
     }
-    }
 
     {
         name    box;

tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/topoSetDict

@@ -21,22 +21,16 @@ actions
         type    cellSet;
         action  new;
         source  regionToCell;
-        sourceInfo
-        {
         insidePoints ((-1.999 0 -1.999));
     }
-    }
 
     {
         name    c1;
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c0;
     }
-    }
 
     {
         name    c1;

tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/system/topoSetDict

@@ -23,31 +23,22 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.01001 0 -100 )(0.01001 0.00999 100);
     }
-    }
     {
         name    heaterCellSet;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
     }
-    }
     {
         name    heater;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     heaterCellSet;
     }
-    }
 
     // leftSolid
     {
@@ -55,21 +46,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0 -100 )(-0.01001 0.00999 100);
     }
-    }
     {
         name    leftSolid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     leftSolidCellSet;
     }
-    }
 
     // rightSolid
     {
@@ -77,21 +62,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.01001 0 -100 )(100 0.00999 100);
     }
-    }
     {
         name    rightSolid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     rightSolidCellSet;
     }
-    }
 
     // topAir
     {
@@ -99,21 +78,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0.00999 -100 )(100 100 100);
     }
-    }
     {
         name    topAir;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     topAirCellSet;
     }
-    }
 
 
     // bottomWater is all the other cells
@@ -122,41 +95,29 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     heaterCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     leftSolidCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     rightSolidCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     topAirCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
@@ -167,11 +128,8 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     bottomWaterCellSet;
     }
-    }
 );
 
 

tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/topoSetDict

@@ -24,11 +24,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (15.5  15.5 0)(24.5 24.5 9);
     }
-    }
 
     // floor
     {
@@ -36,22 +33,16 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0  0 -2)(41 41 0);
     }
-    }
 
     {
         name    floor;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     floor;
     }
-    }
 
     //air
     {
@@ -65,21 +56,15 @@ actions
         type    cellSet;
         action  subtract;
         source  cellToCell;
-        sourceInfo
-        {
         set     floor;
     }
-    }
 
     {
         name    air;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
+        set     solid;           // cellSet
-        {
-            set solid;           // name of cellSet
-        }
     }
 
     {
@@ -87,11 +72,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (17  17 0)(23 23 7.5);
     }
-    }
 
     //- Define again solid
     {
@@ -99,32 +81,23 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (15.5  15.5 0)(24.5 24.5 9);
     }
-    }
 
     {
         name    solid;
         type    cellSet;
         action  subtract;
         source  cellToCell;
-        sourceInfo
-        {
         set     cavity;
     }
-    }
 
     {
         name    solid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
+        set     solid;           // cellSet
-        {
-            set solid;           // name of cellSet
-        }
     }
 );
 

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topoSetDict

@@ -23,31 +23,22 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.01001 0 -100)(0.01001 0.00999 100);
     }
-    }
     {
         name    heaterCellSet;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
     }
-    }
     {
         name    heater;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     heaterCellSet;
     }
-    }
 
     // leftSolid
     {
@@ -55,21 +46,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0 -100 )(-0.01001 0.00999 100);
     }
-    }
     {
         name    leftSolid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     leftSolidCellSet;
     }
-    }
 
     // rightSolid
     {
@@ -77,21 +62,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.01001 0 -100 )(100 0.00999 100);
     }
-    }
     {
         name    rightSolid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     rightSolidCellSet;
     }
-    }
 
     // topAir
     {
@@ -99,21 +78,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0.00999 -100 )(100 100 100);
     }
-    }
     {
         name    topAir;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     topAirCellSet;
     }
-    }
 
 
     // bottomWater is all the other cells
@@ -122,41 +95,29 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     heaterCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     leftSolidCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     rightSolidCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     topAirCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
@@ -167,11 +128,8 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     bottomWaterCellSet;
     }
-    }
 );
 
 

tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict

@@ -21,11 +21,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.01 0.1 -0.01) (0.02 0.11 0.01);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDict

@@ -23,31 +23,22 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 -100) (100 0.1 0.25);
     }
-    }
     {
         name    c0;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 0.45) (100 0.1 100);
     }
-    }
     {
         name    c0;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0.05 0.33) (100 0.1 0.38);
     }
-    }
     {
         name    c0;
         type    cellSet;

tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/topoSetDictRegister

@@ -22,46 +22,34 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.126 0.08665  0.2565) (0.02 0.090665 0.446);
     }
-    }
 
     {
         name    f1Zone;
         type    faceZoneSet;
         action  new;
         source  setAndNormalToFaceZone;
-        sourceInfo
-        {
         faceSet f1;
         normal  (0 1 0);
     }
-    }
 
     {
         name    c1;
         type    cellZoneSet;
         action  new;
         source  faceToCell;
-        sourceInfo
-        {
         set     f1Zone;
         option  neighbour;
     }
-    }
 
     {
         name    c1Zone;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     c1;
     }
-    }
 );
 
 

tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/topoSetDict

@@ -23,31 +23,22 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 -100) (100 0.1 0.25);
     }
-    }
     {
         name    c0;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 0.45) (100 0.1 100);
     }
-    }
     {
         name    c0;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0.05 0.33) (100 0.1 0.38);
     }
-    }
     {
         name    c0;
         type    cellSet;

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/topoSetDict

@@ -23,31 +23,22 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 -100) (100 0.1 0.25);
     }
-    }
     {
         name    c0;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 0.45) (100 0.1 100);
     }
-    }
     {
         name    c0;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0.05 0.33) (100 0.1 0.38);
     }
-    }
     {
         name    c0;
         type    cellSet;

tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/system/topoSetDict

@@ -23,31 +23,22 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.01001 0 -100 )(0.01001 0.00999 100);
     }
-    }
     {
         name    heaterCellSet;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
     }
-    }
     {
         name    heater;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     heaterCellSet;
     }
-    }
 
     // leftSolid
     {
@@ -55,21 +46,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0 -100)(-0.01001 0.00999 100);
     }
-    }
     {
         name    leftSolid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     leftSolidCellSet;
     }
-    }
 
     // rightSolid
     {
@@ -77,21 +62,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.01001 0 -100 )(100 0.00999 100);
     }
-    }
     {
         name    rightSolid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     rightSolidCellSet;
     }
-    }
 
     // topAir
     {
@@ -99,21 +78,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0.00999 -100 )(100 100 100);
     }
-    }
     {
         name    topAir;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     topAirCellSet;
     }
-    }
 
 
     // bottomWater is all the other cells
@@ -122,41 +95,29 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     heaterCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     leftSolidCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     rightSolidCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     topAirCellSet;
     }
-    }
     {
         name    bottomWaterCellSet;
         type    cellSet;
@@ -167,11 +128,8 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     bottomWaterCellSet;
     }
-    }
 );
 
 

tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1

@@ -23,97 +23,70 @@ actions
         type    cellSet;
         action  new;
         source  zoneToCell;
-        sourceInfo
-        {
         zone    cylinder;
     }
-    }
     {
         name    rotorFaces;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     rotorCells;
         option  all;
     }
-    }
     {
         name    rotorFaces;
         type    faceSet;
         action  subset;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-100 -100 0.1) (100 100 0.15);
     }
-    }
 
     {
         name    rotorBladesFaceSet;
         type    faceSet;
         action  new;
         source  faceToFace;
-        sourceInfo
-        {
         set     rotorFaces;
     }
-    }
 
     {
         name    rotorBladesFaceSet;
         type    faceSet;
         action  subset;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-100 0.249 -100) (100 0.251 100);
     }
-    }
 
     {
         name    rotorBlades2;
         type    faceSet;
         action  new;
         source  faceToFace;
-        sourceInfo
-        {
         set     rotorFaces;
     }
-    }
 
     {
         name    rotorBlades2;
         type    faceSet;
         action  subset;
         source  boxToFace;
-        sourceInfo
-        {
         box     (0.249 -100 -100) (0.251 100 100);
     }
-    }
 
     {
         name    rotorBladesFaceSet;
         type    faceSet;
         action  add;
         source  faceToFace;
-        sourceInfo
-        {
         set     rotorBlades2;
     }
-    }
     {
         name    rotorBlades;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet rotorBladesFaceSet;
     }
-    }
 );
 
 

tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2

@@ -23,31 +23,22 @@ actions
         type    cellSet;
         action  new;
         source  zoneToCell;
-        sourceInfo
-        {
         zones   (cylinder innerCylinder);
     }
-    }
     {
         name    rotorCells;
         type    cellSet;
         action  subset;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 0.1) (100 100 0.15);
     }
-    }
     {
         name    rotor;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     rotorCells;
     }
-    }
 );
 
 

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict

@@ -23,31 +23,22 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.01001 0 -100 )(0.01001 0.00999 100);
     }
-    }
     {
         name    heaterCellSet;
         type    cellSet;
         action  add;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.01001 -100 -0.01001)(0.01001 0.00999 0.01001);
     }
-    }
     {
         name    heater;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     heaterCellSet;
     }
-    }
 
     // leftSolid
     {
@@ -55,21 +46,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0 -100)(-0.01001 0.00999 100);
     }
-    }
     {
         name    leftSolid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     leftSolidCellSet;
     }
-    }
 
     // rightSolid
     {
@@ -77,21 +62,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.01001 0 -100 )(100 0.00999 100);
     }
-    }
     {
         name    rightSolid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     rightSolidCellSet;
     }
-    }
 
     // topAir
     {
@@ -99,21 +78,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0.00999 -100 )(100 100 100);
     }
-    }
     {
         name    topAir;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     topAirCellSet;
     }
-    }
 
 
     // bottomAir is all the other cells
@@ -122,41 +95,29 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     heaterCellSet;
     }
-    }
     {
         name    bottomAirCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     leftSolidCellSet;
     }
-    }
     {
         name    bottomAirCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     rightSolidCellSet;
     }
-    }
     {
         name    bottomAirCellSet;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     topAirCellSet;
     }
-    }
     {
         name    bottomAirCellSet;
         type    cellSet;
@@ -167,11 +128,8 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     bottomAirCellSet;
     }
-    }
 );
 
 

tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/system/topoSetDict

@@ -21,22 +21,16 @@ actions
         type    cellSet;
         action  new;
         source  regionToCell;
-        sourceInfo
-        {
         insidePoints ((-4.999 0 -3.999));
     }
-    }
 
     {
         name    c1;
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c0;
     }
-    }
 
     {
         name    c1;

tutorials/incompressible/overPimpleDyMFoam/simpleRotor/system/topoSetDict

@@ -21,22 +21,16 @@ actions
         type    cellSet;
         action  new;
         source  regionToCell;
-        sourceInfo
-        {
         insidePoints ((0.001 0.001 0.001));
     }
-    }
 
     {
         name    c1;
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c0;
     }
-    }
 
     {
         name    c1;
@@ -51,22 +45,16 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c1;
     }
-    }
 
     {
         name    box;
         type    cellSet;
         action  subset;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.0025 0.0045 -100)(0.0075 0.0055 100);
     }
-    }
 
     {
         name    box;

tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/topoSetDict

@@ -21,10 +21,10 @@ actions
         type    cellSet;
         action  new;
         source  regionsToCell;
-        sourceInfo
+        insidePoints
-        {
+        (
-            insidePoints ((0.001 0.001 0.001));
+            (0.001 0.001 0.001)
-        }
+        );
     }
 
     {
@@ -32,11 +32,8 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c0;
     }
-    }
 
     {
         name    c1;
@@ -49,11 +46,11 @@ actions
         type    cellSet;
         action  new;
         source  regionsToCell;
-        sourceInfo
-        {
-            insidePoints ((0.0076 0.00151 0.001));
         set     c1;
-        }
+        insidePoints
+        (
+            (0.0076 0.00151 0.001)
+        );
     }
 
     {
@@ -61,11 +58,8 @@ actions
         type    cellSet;
         action  subtract;
         source  cellToCell;
-        sourceInfo
-        {
         set     c2;
     }
-    }
 
     // Select box to remove from region 1 and 2
 
@@ -74,30 +68,22 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     c1;
     }
-    }
 
     {
         name    box;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     c2;
     }
-    }
 
     {
         name    box;
         type    cellSet;
         action  subset;
         source  boxToCell;
-        sourceInfo
-        {
         boxes
         (
             (0.0025 0.0045 -100)(0.0075 0.0055 100)
@@ -105,7 +91,6 @@ actions
             // (0.0104 0.0025 -100)(0.0115 0.0075 100)
         );
     }
-    }
 
     {
         name    box;

tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/topoSetDict

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

tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict

@@ -22,67 +22,49 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (0.099 -0.006 0.004)(0.101 0.006 0.016);
     }
-    }
 
     {
         name    cyclicFacesSlaveCells;
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-10 -10 -10)(0.1 10 10);
     }
-    }
 
     {
         name    cyclicFaces;
         type    faceZoneSet;
         action  new;
         source  setsToFaceZone;
-        sourceInfo
-        {
         faceSet cyclicFacesFaceSet;
         cellSet cyclicFacesSlaveCells;
     }
-    }
 
     {
         name    baffleFaceSet;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (0.099 -10 -10)(0.101 10 10);
     }
-    }
 
     {
         name    baffleFaceSet;
         type    faceSet;
         action  subtract;
         source  boxToFace;
-        sourceInfo
-        {
         box     (0.099 -0.006 0.004)(0.101 0.006 0.016);
     }
-    }
 
     {
         name    baffleFaces;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet baffleFaceSet;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict

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

tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict

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

tutorials/incompressible/pimpleFoam/RAS/propeller/system/createInletOutletSets.topoSetDict

@@ -22,57 +22,42 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   outerCylinder;
     }
-    }
 
     {
         name    outletFaces;
         type    faceSet;
         action  new;
         source  faceToFace;
-        sourceInfo
-        {
         set     boundaryFaces;
     }
-    }
 
     {
         name    inletFaces;
         type    faceSet;
         action  new;
         source  faceToFace;
-        sourceInfo
-        {
         set     boundaryFaces;
     }
-    }
 
     {
         name    outletFaces;
         type    faceSet;
         action  subset;
         source  normalToFace;
-        sourceInfo
+        normal  (0 -1 0);
-        {
-            normal  (0 -1 0);   // Vector
         cos     0.3;    // Tolerance (max cos of angle)
     }
-    }
 
     {
         name    inletFaces;
         type    faceSet;
         action  subset;
         source  normalToFace;
-        sourceInfo
+        normal  (0 1 0);
-        {
-            normal  (0 1 0);    // Vector
         cos     0.3;    // Tolerance (max cos of angle)
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict

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

tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict

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

tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict

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

tutorials/incompressible/simpleFoam/simpleCar/system/topoSetDict

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

tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict

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

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict

@@ -23,12 +23,9 @@ actions
         action new;
 
         source  sphereToCell;
-        sourceInfo
-        {
         origin  (0.125 0.375 0.05);
         radius  0.005;
     }
-    }
 );
 
 

tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict

@@ -22,21 +22,15 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   filmWalls;
     }
-    }
     {
         name    wallFilmFaces;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet wallFilmFaceSet;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict

@@ -23,63 +23,44 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (1.5 -10 -10) (2 10 10);
     }
-    }
     {
         name    filter;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     filterCellSet;
     }
-    }
-
 
     {
         name    leftFluidCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-10 -10 -10) (1.5 10 10);
     }
-    }
     {
         name    leftFluid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     leftFluidCellSet;
     }
-    }
     {
         name    rightFluidCellSet;
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (2 -1 -1) (10 10 10);
     }
-    }
     {
         name    rightFluid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     rightFluidCellSet;
     }
-    }
 
 
     // cycLeft
@@ -88,34 +69,25 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     filterCellSet;
         option  all;
     }
-    }
     {
         name    cycLeftFaceSet;
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     leftFluidCellSet;
         option  all;
     }
-    }
     // Create faceZone from cycLeft
     {
         name    cycLeft;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet cycLeftFaceSet;
     }
-    }
 
     // cycRight
     {
@@ -123,34 +95,25 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     filterCellSet;
         option  all;
     }
-    }
     {
         name    cycRightFaceSet;
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     rightFluidCellSet;
         option  all;
     }
-    }
     // Create faceZone from cycRight
     {
         name    cycRight;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet cycRightFaceSet;
     }
-    }
 );
 
 

tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict

@@ -32,41 +32,29 @@ actions
         type    cellSet;
         action  subtract;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.4 0.1 0.1) (0.6 0.3 0.3);
     }
-    }
     {
         name    c0;
         type    cellSet;
         action  subtract;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.4 0.1 0.4) (0.6 0.3 0.6);
     }
-    }
     {
         name    c0;
         type    cellSet;
         action  subtract;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.4 0.4 0.1) (0.6 0.6 0.3);
     }
-    }
     {
         name    c0;
         type    cellSet;
         action  subtract;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.4 0.4 0.4) (0.6 0.6 0.6);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet

@@ -22,21 +22,15 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   filmWalls;
     }
-    }
     {
         name    wallFilmFaces;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet wallFilmFaceSet;
     }
-    }
 );
 
 

tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet

@@ -22,21 +22,15 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   filmWalls;
     }
-    }
     {
         name    wallFilmFaces;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet wallFilmFaceSet;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet

@@ -22,41 +22,29 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.00001 -0.00001 -1) (0.10001 0.00001 1);
     }
-    }
     {
         name    sideFaces2;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (0.09999 -0.00001 -1) (0.10001 0.05001 1);
     }
-    }
     {
         name    sideFaces3;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.00001  0.04999 -1) (1.00001 0.05001 1);
     }
-    }
     {
         name    sideFaces4;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.00001 -0.00001 -1) (0.00001 0.05001 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/foamyHexMesh/blob/system/topoSetDict

@@ -22,23 +22,17 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 -0.2)(100 100 100);
     }
-    }
 
     {
         name    zf;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     z;
         option all;
     }
-    }
 
     {
         name    z;
@@ -51,12 +45,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     z;
         option  all;
     }
-    }
 
     // ~~~~~~~~~~~~~~~~ //
 
@@ -65,23 +56,17 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.32 -100 -100)(100 100 100);
     }
-    }
 
     {
         name    xf;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     x;
         option  all;
     }
-    }
 
     {
         name    x;
@@ -94,12 +79,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     x;
         option  all;
     }
-    }
 
     // ~~~~~~~~~~~~~~~~ //
 
@@ -108,24 +90,18 @@ actions
         type    cellSet;
         action  new;
         source  sphereToCell;
-        sourceInfo
-        {
         origin  (-0.3 -0.3 -0.3);
         radius  0.4;
     }
-    }
 
     {
         name    spf;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     sp;
         option  all;
     }
-    }
 
     {
         name    sp;
@@ -138,12 +114,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     sp;
         option  all;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices

@@ -26,23 +26,17 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 $zSlice)(100 100 100);
     }
-    }
 
     {
         name    zf;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     z;
         option  all;
     }
-    }
 
     {
         name    z;
@@ -55,12 +49,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     z;
         option  all;
     }
-    }
 
     // ~~~~~~~~~~~~~~~~ //
 
@@ -69,23 +60,17 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 $ySlice -100)(100 100 100);
     }
-    }
 
     {
         name    yf;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     y;
         option  all;
     }
-    }
 
     {
         name    y;
@@ -98,12 +83,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     y;
         option  all;
     }
-    }
 
     // ~~~~~~~~~~~~~~~~ //
 
@@ -112,23 +94,17 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     ($xSlice -100 -100)(100 100 100);
     }
-    }
 
     {
         name    xf;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     x;
         option  all;
     }
-    }
 
     {
         name    x;
@@ -141,12 +117,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     x;
         option  all;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict

@@ -22,23 +22,17 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 -100 0)(100 100 100);
     }
-    }
 
     {
         name    zf;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     z;
         option  all;
     }
-    }
 
     {
         name    z;
@@ -51,12 +45,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     z;
         option  all;
     }
-    }
 
     // ~~~~~~~~~~~~~~~~ //
 
@@ -65,23 +56,17 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0.1 -100)(100 100 100);
     }
-    }
 
     {
         name    yf;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     y;
         option  all;
     }
-    }
 
     {
         name    y;
@@ -94,12 +79,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     y;
         option  all;
     }
-    }
 
     // ~~~~~~~~~~~~~~~~ //
 
@@ -108,23 +90,17 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.3 -100 -100)(100 100 100);
     }
-    }
 
     {
         name    xf;
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     x;
         option  all;
     }
-    }
 
     {
         name    x;
@@ -137,12 +113,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     x;
         option  all;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/parallel/filter/system/topoSetDict

@@ -23,21 +23,15 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (1.5 -10 -10) (2 10 10);
     }
-    }
     {
         name    filter;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     filterCells;
     }
-    }
 
 
     {
@@ -45,41 +39,29 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-10 -10 -10) (1.5 10 10);
     }
-    }
     {
         name    leftFluid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     leftFluidCells;
     }
-    }
     {
         name    rightFluidCells;
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (2 -1 -1) (10 10 10);
     }
-    }
     {
         name    rightFluid;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     rightFluidCells;
     }
-    }
 
 
     // cycLeft
@@ -88,34 +70,25 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     filterCells;
         option  all;
     }
-    }
     {
         name    cycLeftFaces;
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     leftFluidCells;
         option  all;
     }
-    }
     // Create faceZone from cycLeft
     {
         name    cycLeft;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet cycLeftFaces;    // name of faceSet
     }
-    }
 
     // cycRight
     {
@@ -123,34 +96,25 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     filterCells;
         option  all;
     }
-    }
     {
         name    cycRightFaces;
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     rightFluidCells;
         option  all;
     }
-    }
     // Create faceZone from cycRight
     {
         name    cycRight;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet cycRightFaces;   // name of faceSet
     }
-    }
 
 );
 

tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1

@@ -22,13 +22,10 @@ actions
         type    cellSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
-        {
         field   radiusFieldXY;
         min     13.36;
         max     18.47;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2

@@ -22,13 +22,10 @@ actions
         type    cellSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
-        {
         field   radiusFieldXY;
-          min         7.00;
+        min     7.0;
         max     18.47;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3

@@ -22,13 +22,10 @@ actions
         type    cellSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
-        {
         field   radiusFieldXY;
         min     3.67;
         max     18.47;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1

@@ -22,13 +22,10 @@ actions
         type    cellSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
-        {
         field   radiusFieldXY;
-          min         0.0;
+        min     0;
         max     0.64;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2

@@ -22,13 +22,10 @@ actions
         type    cellSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
-        {
         field   radiusFieldXY;
-          min         0.0;
+        min     0;
         max     1.03;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3

@@ -22,13 +22,10 @@ actions
         type    cellSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
-        {
         field   radiusFieldXY;
-          min         0.0;
+        min     0;
         max     1.94;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4

@@ -22,13 +22,10 @@ actions
         type    cellSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
-        {
         field   radiusFieldXY;
-          min         0.0;
+        min     0;
         max     3.67;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5

@@ -22,12 +22,9 @@ actions
         type    cellSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
-        {
         field   radiusFieldXY;
-          min         0.0;
+        min     0;
-          max         7.00;
+        max     7.0;
-        }
     }
 );
 

tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6

@@ -22,13 +22,10 @@ actions
         type    cellSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
-        {
         field   radiusFieldXY;
-          min         0.0;
+        min     0;
         max     13.36;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/topoSetDict

@@ -23,32 +23,23 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100e-3 -100e-3 -100e-3) (2e-3 100e-3 100e-3);
     }
-    }
     {
         name    A;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (1.999e-3 -100e-3 -100e-3) (2.001e-3 100e-3 100e-3);
     }
-    }
     {
         name    A;
         type    faceZoneSet;
         action  new;
         source  setsToFaceZone;
-        sourceInfo
-        {
         faceSet A;      // name of faceSet
         cellSet leftA;  // name of cellSet of slave side
     }
-    }
 
 
     // FaceZone B
@@ -57,32 +48,23 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100e-3 -100e-3 -100e-3) (8e-3 100e-3 100e-3);
     }
-    }
     {
         name    B;
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (7.999e-3 -100e-3 -100e-3) (8.001e-3 100e-3 100e-3);
     }
-    }
     {
         name    B;
         type    faceZoneSet;
         action  new;
         source  setsToFaceZone;
-        sourceInfo
-        {
         faceSet B;      // name of faceSet
         cellSet leftB;  // name of cellSet of slave side
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict

@@ -22,58 +22,43 @@ actions
         type    cellSet;
         action  new;
         source  regionToCell;
-        sourceInfo
-        {
         insidePoints
         (
             (0.99 0.99 0.99)
         );
     }
-    }
 
     {
         name    corner;
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-1 -1 -1)(0.5 0.5 0.5);
     }
-    }
 
     {
         name    inner;
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     corner;
     }
-    }
 
     {
         name    inner;
         type    cellSet;
         action  subtract;
         source  cellToCell;
-        sourceInfo
-        {
         set     outer;
     }
-    }
 
     {
         name    outer;
         type    cellSet;
         action  subtract;
         source  cellToCell;
-        sourceInfo
-        {
         set     corner;
     }
-    }
 
     {
         name    corner;
@@ -86,21 +71,15 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     outer;
     }
-    }
     {
         name    final;
         type    cellSet;
         action  add;
         source  cellToCell;
-        sourceInfo
-        {
         set     inner;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/mesh/stitchMesh/simple-cube1/system/topoSetDict.patches

@@ -19,22 +19,16 @@ newFromPatch
     type    faceSet;
     action  new;
     source  patchToFace;
-    sourceInfo
-    {
     patch   outer;
 }
-}
 
 subsetNormal
 {
     type    faceSet;
     action  subset;
     source  normalToFace;
-    sourceInfo
-    {
     cos     0.1;
 }
-}
 
 actions
 (
@@ -47,11 +41,8 @@ actions
     {
         name  outerx;
         $subsetNormal;
-        sourceInfo
-        {
         normal (-1 0 0);
     }
-    }
 
     // outery
     {
@@ -62,11 +53,8 @@ actions
     {
         name  outery;
         $subsetNormal;
-        sourceInfo
-        {
         normal (0 -1 0);
     }
-    }
 
     // outerz
     {
@@ -77,11 +65,8 @@ actions
     {
         name  outerz;
         $subsetNormal;
-        sourceInfo
-        {
         normal (0 0 -1);
     }
-    }
 
 );
 

tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict

@@ -22,22 +22,16 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (-0.01 -0.01 -0.03)(0.01 0.01 0.001);
     }
-    }
 
     {
         name    inletZone;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet inlet;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.004 -0.001 -1) (0.012 0.001 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.0045 -0.00075 -1) (0.0095 0.00075 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.00475 -0.000375 -1) (0.009 0.000375 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.004 -0.001 -1) (0.012 0.001 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.0045 -0.00075 -1) (0.0095 0.00075 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.00475 -0.000375 -1) (0.009 0.000375 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.004 -0.001 -1) (0.012 0.001 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.0045 -0.00075 -1) (0.0095 0.00075 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.00475 -0.000375 -1) (0.009 0.000375 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/system/topoSetDict

@@ -25,11 +25,8 @@ actions
         type    cellSet;
         action  new;
         source  zoneToCell;
-        sourceInfo
-        {
         zone    topBlock;
     }
-    }
 
     // Create cellSet centralBlock from cellZone centralBlock created by blockMesh
     {
@@ -37,11 +34,8 @@ actions
         type    cellSet;
         action  new;
         source  zoneToCell;
-        sourceInfo
-        {
         zone    centralBlock;
     }
-    }
 
     // Create cellSet bottomBlock from cellZone bottomBlock created by blockMesh
     {
@@ -49,11 +43,8 @@ actions
         type    cellSet;
         action  new;
         source  zoneToCell;
-        sourceInfo
-        {
         zone    bottomBlock;
     }
-    }
 
 
     // 2. Get the faces at the top patch
@@ -64,11 +55,8 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   top;
     }
-    }
 
     // Only keep those that border the top block topBlock
     {
@@ -76,12 +64,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     topBlockCells;
         option  all;
     }
-    }
 
     // Convert top from faceSet to faceZone
     {
@@ -89,12 +74,9 @@ actions
         type    faceZoneSet;
         action  new;
         source  setAndNormalToFaceZone;
-        sourceInfo
-        {
         faceSet top;
         normal  (0 -1 0);
     }
-    }
 
 
     // 3. Get the faces on the border of cellZones topBlock and centralBlock
@@ -105,12 +87,9 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     topBlockCells;
         option  all;
     }
-    }
 
     // Get the faces that border topBlock and centralBlock
     {
@@ -118,12 +97,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     centralBlockCells;
         option  all;
     }
-    }
 
     // Convert topBlockFaces from faceSet to faceZone
     {
@@ -131,12 +107,9 @@ actions
         type    faceZoneSet;
         action  new;
         source  setsToFaceZone;
-        sourceInfo
-        {
         faceSet centralTopFaces;
         cellSet topBlockCells;
     }
-    }
 
 
     // 4. Get all the faces on the border of cellZones centralBlock and
@@ -148,12 +121,9 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     bottomBlockCells;
         option  all;
     }
-    }
 
     // Get the faces that border centralBlock and bottomBlock
     {
@@ -161,12 +131,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     centralBlockCells;
         option  all;
     }
-    }
 
     // Convert centralBottomFaces from faceSet to faceZone
     {
@@ -174,12 +141,9 @@ actions
         type    faceZoneSet;
         action  new;
         source  setsToFaceZone;
-        sourceInfo
-        {
         faceSet centralBottomFaces;
         cellSet centralBlockCells;
     }
-    }
 
 
     // 5. Get the faces at bottom patch
@@ -190,11 +154,8 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   bottom;
     }
-    }
 
     // Only keep those that border the bottom block bottomBlockCells
     {
@@ -202,12 +163,9 @@ actions
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     bottomBlockCells;
         option  all;
     }
-    }
 
     // Convert bottom from faceSet to faceZone
     {
@@ -215,12 +173,9 @@ actions
         type    faceZoneSet;
         action  new;
         source  setAndNormalToFaceZone;
-        sourceInfo
-        {
         faceSet bottom;
         normal  (0 1 0);
     }
-    }
 
 
     // AJH New - create additional face zones to enable solid body motion
@@ -233,31 +188,22 @@ actions
         type    cellSet;
         action  new;
         source  cellToCell;
-        sourceInfo
-        {
         set     topBlockCells;
     }
-    }
     {
         name    LARTopCells;
         type    cellSet;
         action  subset;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-100 0.95 -100)(100 100 100);
     }
-    }
     {
         name    LARTopCells;
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     LARTopCells;
     }
-    }
 
     // upate old topBlock cellZone
     {
@@ -265,11 +211,8 @@ actions
         type    cellSet;
         action  subtract;
         source  cellToCell;
-        sourceInfo
-        {
         set     LARTopCells;
     }
-    }
     {
         name    topBlock;
         type    cellZoneSet;
@@ -280,11 +223,8 @@ actions
         type    cellZoneSet;
         action  new;
         source  setToCellZone;
-        sourceInfo
-        {
         set     topBlockCells;
     }
-    }
 
     // generate face zone between LARTopCells and topBlockCells cellSets
     {
@@ -292,34 +232,25 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
-        {
         set     LARTopCells;
         option  all;
     }
-    }
     {
         name    LARTopFaces;
         type    faceSet;
         action  subset;
         source  cellToFace;
-        sourceInfo
-        {
         set     topBlockCells;
         option  all;
     }
-    }
     {
         name    LARTopFaces;
         type    faceZoneSet;
         action  new;
         source  setsToFaceZone;
-        sourceInfo
-        {
         faceSet LARTopFaces;
         cellSet topBlockCells;
     }
-    }
 );
 
 

tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  zoneToCell;
-        sourceInfo
-        {
         zone    rotor;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0 0 -2e-05) (0.0036 0.0008 4e-05);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0 0 -2e-05) (0.0036 0.0003 2e-05);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-10 -6 -3) (10 0 3);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-5 -3 -2.5) (9 0 2);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-3 -1.5 -1) (8 0 1.5);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-2 -1 -0.6) (7 0 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-1 -0.6 -0.3) (6.5 0 0.8);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-0.5 -0.55 -0.15) (6.25 0 0.65);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-10 -6 -3) (10 0 3);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-5 -3 -2.5) (9 0 2);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-3 -1.5 -1) (8 0 1.5);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-2 -1 -0.6) (7 0 1);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-1 -0.6 -0.3) (6.5 0 0.8);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6

@@ -22,11 +22,9 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
+
-        {
         box     (-0.5 -0.55 -0.15) (6.25 0 0.65);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict

@@ -22,34 +22,26 @@ actions
         type    faceSet;
         action  new;
         source  boxToFace;
-        sourceInfo
-        {
         box     (0.3015 0.0493 -1) (0.3069 0.2077 1);
     }
-    }
 
     {
         name    cyclicFacesSlaveCells;
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (-1 0 -1) (0.305 0.31 1);
     }
-    }
 
     {
         name    cyclicZoneFaces;
         type    faceZoneSet;
         action  new;
         source  setsToFaceZone;
-        sourceInfo
+
-        {
         faceSet cyclicFacesFaceSet;
         cellSet cyclicFacesSlaveCells;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.35 0.35 0.1) (0.65 0.55 0.6);
     }
-    }
 
     {
         name    c0;

tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict

@@ -32,11 +32,8 @@ actions
         type    cellSet;
         action  subtract;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.375 0.375 0) (0.625 0.625 0.25);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict

@@ -22,11 +22,8 @@ actions
         type    cellSet;
         action  new;
         source  zoneToCell;
-        sourceInfo
-        {
         zone    rotor;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage

@@ -22,15 +22,13 @@ actions
         type    cellSet;
         action  new;
         // source  boxToCell;
-        source  cylinderToCell;
-        sourceInfo
-        {
         // box     (0.015 0.010 0.015) (0.035 0.015 0.035);
+
+        source  cylinderToCell;
         p1      (0.025 0.02 0.025);
         p2      (0.025 0.022 0.025);
         radius  0.01;
     }
-    }
     {
         name    blockage;
         type    cellSet;

tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector

@@ -22,22 +22,16 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
         patch   sides;
     }
-    }
 
     {
         name    collector;
         type    faceZoneSet;
         action  new;
         source  setToFaceZone;
-        sourceInfo
-        {
         faceSet f0;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch

@@ -22,13 +22,11 @@ actions
         type    cellSet;
         action  new;
         source  cylinderToCell;
-        sourceInfo
+
-        {
         p1      (0.025 1 0.025);
         p2      (0.025 0.049 0.025);
         radius  0.0015;
     }
-    }
 
     // Get all faces in cellSet and assign to injectorFaces
     {
@@ -36,12 +34,10 @@ actions
         type    faceSet;
         action  new;
         source  cellToFace;
-        sourceInfo
+
-        {
         set     c0;
         option  all;
     }
-    }
 
     // Keep in injectorFaces all faces in boundary faces
     {
@@ -49,9 +45,6 @@ actions
         type    faceSet;
         action  subset;
         source  boundaryToFace;
-        sourceInfo
-        {
-        }
     }
 );
 

tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/system/topoSetDict

@@ -21,13 +21,11 @@ actions
         type    cellZoneSet;
         action  new;
         source  fieldToCell;
-        sourceInfo
+
-        {
         field   MangrovesIndex;
         min     0.5;
         max     1.5;
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict

@@ -32,11 +32,8 @@ actions
         type    cellSet;
         action  subtract;
         source  boxToCell;
-        sourceInfo
-        {
         box     (0.375 0.375 0) (0.625 0.625 0.25);
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict

@@ -22,16 +22,13 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         boxes
         (
-                (.1 -1e10 0.08) (.9 1e10 0.2)
+            (0.1 -1e10 0.08) (0.9 1e10 0.2)
-                (.75 -1e10 0.2) (.92 1e10 0.9)
+            (0.75 -1e10 0.2) (0.92 1e10 0.9)
-                (.1 -1e10 0.2) (.25 1e10 0.7)
+            (0.1 -1e10 0.2) (0.25 1e10 0.7)
         );
     }
-    }
 );
 
 // ************************************************************************* //

tutorials/multiphase/interIsoFoam/discInReversedVortexFlow/system/topoSetDict2

@@ -22,14 +22,11 @@ actions
         type    cellSet;
         action  new;
         source  boxToCell;
-        sourceInfo
-        {
         boxes
         (
-                (.4 -1e10 0.09) (.7 1e10 0.15)
+            (0.4 -1e10 0.09) (0.7 1e10 0.15)
         );
     }
-    }
 );
 
 // ************************************************************************* //