From 15a27fee87a76dcd1a1dd64ebd72d0ce31af3cf3 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 27 Jul 2021 14:07:37 +0100 Subject: [PATCH] topoSet: the sourceInfo sub-dictionary of the topoSetDict actions is now optional and only needed if there is a name clash between entries in the source specification and the set specification, e.g. "name": { name rotorCells; type cellSet; action new; source zoneToCell; sourceInfo { name cylinder; } } --- .../mesh/manipulation/topoSet/topoSet.C | 14 +- etc/caseDicts/annotated/topoSetDict | 327 ++++++------------ .../manipulation/refineRegion/topoSetDict | 5 +- .../patchFluxToFace/patchFluxToFace.H | 18 +- .../isothermalGrowth/system/topoSetDict | 16 +- .../postProcessing/channel/system/topoSetDict | 10 +- .../system/topoSetDict | 27 +- .../Lagrangian/cylinder/system/topoSetDict | 5 +- .../Lagrangian/hotBoxes/system/topoSetDict | 20 +- .../system/topoSetDict.wallFilmRegion | 5 +- .../system/wallFilmRegion.topoSet | 5 +- .../Lagrangian/splashPanel/system/topoSetDict | 10 +- .../RAS/smallPoolFire2D/system/topoSetDict | 5 +- .../RAS/smallPoolFire3D/system/topoSetDict | 5 +- .../Lagrangian/filter/system/topoSetDict | 68 +--- .../simplifiedSiwek/system/topoSetDict | 7 +- .../comfortHotRoom/system/topoSetDict | 10 +- .../coolingCylinder2D/system/topoSetDict | 14 +- .../coolingSphere/system/topoSetDict | 9 +- .../heatExchanger/system/air/topoSetDict.1 | 42 +-- .../heatExchanger/system/air/topoSetDict.2 | 10 +- .../reverseBurner/system/gas/topoSetDict | 5 +- .../RAS/TJunction/system/topoSetDict | 14 +- .../RAS/TJunctionFan/system/topoSetDict | 32 +- .../RAS/elipsekkLOmega/system/topoSetDict | 5 +- .../oscillatingInletACMI2D/system/topoSetDict | 20 +- .../mixerVesselAMI2D/system/topoSetDict | 5 +- .../laminar/porousBlockage/system/topoSetDict | 14 +- .../simpleFoam/pipeCyclic/system/topoSetDict | 19 +- .../turbineSiting/system/topoSetDict | 20 +- .../mesh/foamyHexMesh/blob/system/topoSetDict | 59 +--- .../flange/system/topoSetDict-background | 17 +- .../flange/system/topoSetDict-slices | 57 +-- .../simpleShapes/system/topoSetDict | 57 +-- .../refineFieldDirs/system/topoSetDict.range1 | 9 +- .../refineFieldDirs/system/topoSetDict.range2 | 9 +- .../refineFieldDirs/system/topoSetDict.range3 | 9 +- .../refineFieldDirs/system/topoSetDict.tier1 | 9 +- .../refineFieldDirs/system/topoSetDict.tier2 | 9 +- .../refineFieldDirs/system/topoSetDict.tier3 | 9 +- .../refineFieldDirs/system/topoSetDict.tier4 | 9 +- .../refineFieldDirs/system/topoSetDict.tier5 | 9 +- .../refineFieldDirs/system/topoSetDict.tier6 | 9 +- .../LES/throttle/system/topoSetDict.1 | 5 +- .../LES/throttle/system/topoSetDict.2 | 5 +- .../LES/throttle/system/topoSetDict.3 | 5 +- .../LES/throttle3D/system/topoSetDict.1 | 5 +- .../LES/throttle3D/system/topoSetDict.2 | 5 +- .../LES/throttle3D/system/topoSetDict.3 | 5 +- .../RAS/throttle/system/topoSetDict.1 | 5 +- .../RAS/throttle/system/topoSetDict.2 | 5 +- .../RAS/throttle/system/topoSetDict.3 | 5 +- .../laminar/cylinder/system/topoSetDict | 5 +- .../laminar/plateFilm/system/topoSetDict | 5 +- .../LES/nozzleFlow2D/system/topoSetDict.1 | 5 +- .../LES/nozzleFlow2D/system/topoSetDict.2 | 5 +- .../interFoam/RAS/DTCHull/system/topoSetDict | 30 +- .../RAS/DTCHullMoving/system/topoSetDict | 30 +- .../RAS/DTCHullWave/system/topoSetDict | 30 +- .../damBreakPorousBaffle/system/topoSetDict | 17 +- .../RAS/floatingObject/system/topoSetDict | 5 +- .../RAS/planingHullW3/system/topoSetDict.1 | 35 +- .../RAS/planingHullW3/system/topoSetDict.2 | 20 +- .../damBreakWithObstacle/system/topoSetDict | 5 +- .../laminar/wave/system/topoSetDict1 | 5 +- .../laminar/wave/system/topoSetDict2 | 5 +- .../laminar/wave/system/topoSetDict3 | 5 +- .../laminar/wave/system/topoSetDict4 | 5 +- .../laminar/wave/system/topoSetDict5 | 5 +- .../laminar/wave/system/topoSetDict6 | 5 +- .../RAS/bubblePipe/system/topoSetDict | 32 +- .../system/topoSetDict | 49 +-- .../system/topoSetDict | 48 +-- .../titaniaSynthesis/system/topoSetDict | 14 +- .../system/topoSetDict | 14 +- .../movingOscillatingBox/system/topoSetDict | 15 +- .../system/topoSetDict-selectBottom | 7 +- .../oscillatingBox/system/topoSetDict | 15 +- 78 files changed, 401 insertions(+), 1097 deletions(-) diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C index d077a1a817..2b9c06b1b6 100644 --- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C +++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C @@ -25,7 +25,9 @@ Application topoSet Description - Operates on cellSets/faceSets/pointSets through a dictionary. + Executes the sequence of topoSet actions specified in the topoSetDict. + +Usage \*---------------------------------------------------------------------------*/ @@ -216,9 +218,9 @@ int main(int argc, char *argv[]) // Read set construct info from dictionary PtrList actions(topoSetDict.lookup("actions")); - forAll(timeDirs, timeI) + forAll(timeDirs, timei) { - runTime.setTime(timeDirs[timeI], timeI); + runTime.setTime(timeDirs[timei], timei); Info<< "Time = " << runTime.timeName() << endl; // Optionally re-read mesh @@ -233,7 +235,6 @@ int main(int argc, char *argv[]) const word actionName(dict.lookup("action")); const word setType(dict.lookup("type")); - topoSetSource::setAction action = topoSetSource::toAction ( actionName @@ -270,7 +271,6 @@ int main(int argc, char *argv[]) } - // Handle special actions (clear, invert) locally, rest through // sources. switch (action) @@ -285,7 +285,7 @@ int main(int argc, char *argv[]) ( dict.lookup("source"), mesh, - dict.subDict("sourceInfo") + dict.optionalSubDict("sourceInfo") ); source().applyToSet(action, currentSet()); @@ -304,7 +304,7 @@ int main(int argc, char *argv[]) ( dict.lookup("source"), mesh, - dict.subDict("sourceInfo") + dict.optionalSubDict("sourceInfo") ); // Backup current set. diff --git a/etc/caseDicts/annotated/topoSetDict b/etc/caseDicts/annotated/topoSetDict index ac2de85feb..461d94bc82 100644 --- a/etc/caseDicts/annotated/topoSetDict +++ b/etc/caseDicts/annotated/topoSetDict @@ -24,10 +24,7 @@ actions type cellSet; name c0; source labelToCell; - sourceInfo - { - value (12 13 56); - } + value (12 13 56); } // Get all faces in cellSet @@ -36,11 +33,8 @@ actions type faceSet; name f0; source cellToFace; - sourceInfo - { - set c0; - option all; - } + set c0; + option all; } // Determine inverse cellSet @@ -49,10 +43,7 @@ actions type cellSet; name c1; source cellToCell; - sourceInfo - { - set c0; - } + set c0; } { name c1; @@ -66,11 +57,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set c1; - option all; - } + set c1; + option all; } @@ -80,10 +68,7 @@ actions type cellZoneSet; name c0; source boxToCell; - sourceInfo - { - box (0.04 0 0)(0.06 100 100); - } + box (0.04 0 0)(0.06 100 100); } ); @@ -113,17 +98,11 @@ type cellSet; // cellSet from cell labels source labelToCell; -sourceInfo -{ - value (12 13 56); // labels of cells -} +value (12 13 56); // labels of cells // copy of a cellSet source cellToCell; -sourceInfo -{ - set c1; -} +set c1; // cellSet from cell zone source zoneToCell; @@ -142,152 +121,104 @@ sourceInfo // cellSet from faceSet source faceToCell; -sourceInfo -{ - set f0; // Name of faceSet +set f0; // Name of faceSet - // option neighbour; // cell with neighbour in faceSet - // option owner; // ,, owner - option any; // cell with any face in faceSet - // option all; // cell with all faces in faceSet -} +// option neighbour; // cell with neighbour in faceSet +// option owner; // ,, owner +option any; // cell with any face in faceSet +// option all; // cell with all faces in faceSet // cellSet from pointSet source pointToCell; -sourceInfo -{ - set p0; - option any; // cell with any point in pointSet - // option edge; // cell with an edge with both points in pointSet -} +set p0; +option any; // cell with any point in pointSet +// option edge; // cell with an edge with both points in pointSet // cellSet baed on shape of cells source shapeToCell; -sourceInfo -{ - type hex; // hex/wedge/prism/pyr/tet/tetWedge/splitHex -} +type hex; // hex/wedge/prism/pyr/tet/tetWedge/splitHex // cellSet inside a rectangular bounding box or boxes source boxToCell; -sourceInfo -{ - box (0 0 0) (1 1 1); - // boxes ((0 0 0) (1 1 1) (10 10 10)(11 11 11)); -} +box (0 0 0) (1 1 1); +// boxes ((0 0 0) (1 1 1) (10 10 10)(11 11 11)); // cellSet inside rotated box source rotatedBoxToCell; -sourceInfo -{ - origin (0.2 0.2 -10); - i (0.2 0.2 0); - j (-0.2 0.2 0); - k (10 10 10); -} +origin (0.2 0.2 -10); +i (0.2 0.2 0); +j (-0.2 0.2 0); +k (10 10 10); // cellSet within a cylinder source cylinderToCell; -sourceInfo -{ - point1 (0.2 0.2 -10); // start point on cylinder axis - point2 (0.2 0.2 0); // end point on cylinder axis - radius 5.0; -} +point1 (0.2 0.2 -10); // start point on cylinder axis +point2 (0.2 0.2 0); // end point on cylinder axis +radius 5.0; // cellSet within a sphere source sphereToCell; -sourceInfo -{ - centre (0.2 0.2 -10); - radius 5.0; -} +centre (0.2 0.2 -10); +radius 5.0; // cellSet nearest to point locations source nearestToCell; -sourceInfo -{ - points ((0 0 0) (1 1 1)(2 2 2)); -} +points ((0 0 0) (1 1 1)(2 2 2)); // Select based on surface source surfaceToCell; -sourceInfo -{ - file "surface.stl"; - useSurfaceOrientation false; // use closed surface inside/outside - // test (ignores includeCut, - // outsidePoints) - outsidePoints ((-99 -99 -59)); // definition of outside - includeCut false; // cells cut by surface - includeInside false; // cells not on outside of surf - includeOutside false; // cells on outside of surf - nearDistance -1; // cells with centre near surf - // (set to -1 if not used) - curvature 0.9; // cells within nearDistance - // and near surf curvature - // (set to -100 if not used) -} +file "surface.stl"; +useSurfaceOrientation false; // use closed surface inside/outside + // test (ignores includeCut, + // outsidePoints) +outsidePoints ((-99 -99 -59)); // definition of outside +includeCut false; // cells cut by surface +includeInside false; // cells not on outside of surf +includeOutside false; // cells on outside of surf +nearDistance -1; // cells with centre near surf + // (set to -1 if not used) +curvature 0.9; // cells within nearDistance + // and near surf curvature + // (set to -100 if not used) // cellSet by field values within a range source fieldToCell; -sourceInfo -{ - fieldName U; // Note: uses mag(U) since volVectorField - min 0.1; - max 0.5; -} +fieldName U; // Note: uses mag(U) since volVectorField +min 0.1; +max 0.5; // cellSet based on a mesh region (non-face connected part of (subset of)mesh) source regionToCell; -sourceInfo -{ - set c0; // optional name of cellSet giving mesh subset - insidePoints ((1 2 3)); // points inside region to select - nErode 0; // optional number of layers to erode - // selection -} +set c0; // optional name of cellSet giving mesh subset +insidePoints ((1 2 3)); // points inside region to select +nErode 0; // optional number of layers to erode + // selection // cellSet based on a total volume beneath a plane with specified normal source targetVolumeToCell; -sourceInfo -{ - volume 2e-05; - normal (0 1 0); // usually in direction of gravity -} +volume 2e-05; +normal (0 1 0); // usually in direction of gravity // copy of a faceSet source faceToFace; -sourceInfo -{ - set f1; -} +set f1; // faceSet from a cellSet source cellToFace; -sourceInfo -{ - set c0; - option all; // All faces of cells - // option both; // Only faces whose owner&neighbour are in cellSet -} +set c0; +option all; // All faces of cells +// option both; // Only faces whose owner&neighbour are in cellSet // faceSet from a pointSet source pointToFace; -sourceInfo -{ - set p0; - option any; // Faces using any point in pointSet - // option all // Faces with all points in pointSet - // option edge // Faces with two consecutive points in pointSet -} +set p0; +option any; // Faces using any point in pointSet +// option all // Faces with all points in pointSet +// option edge // Faces with two consecutive points in pointSet // faceSet specified by labels source labelToFace; -sourceInfo -{ - value (12 13 56); // labels of faces -} +value (12 13 56); // labels of faces // faceSet from patches source patchToFace; @@ -299,9 +230,6 @@ sourceInfo // faceSet from the boundary source boundaryToFace; -sourceInfo -{ -} // faceSet from a faceZone source zoneToFace; @@ -312,57 +240,36 @@ sourceInfo // faceSet inside a rectangular bounding box or boxes source boxToFace; -sourceInfo -{ - box (0 0 0) (1 1 1); - // boxes ((0 0 0) (1 1 1) (10 10 10)(11 11 11)); -} +box (0 0 0) (1 1 1); +// boxes ((0 0 0) (1 1 1) (10 10 10)(11 11 11)); // faceSet with normal orientation within a tolerance source normalToFace; -sourceInfo -{ - normal (0 0 1); // Vector - cos 0.01; // Tolerance (max cos of angle) -} +normal (0 0 1); // Vector +cos 0.01; // Tolerance (max cos of angle) // faceSet from existing faceSet, nearest to given position source regionToFace; -sourceInfo -{ - set f0; - nearPoint (0.1 0.1 0.005); -} +set f0; +nearPoint (0.1 0.1 0.005); // copy a pointSet source pointToPoint; -sourceInfo -{ - set p1; -} +set p1; // pointSet from a cellSet source cellToPoint; -sourceInfo -{ - set c0; - option all; // all points of cell -} +set c0; +option all; // all points of cell // pointSet from a faceSet source faceToPoint; -sourceInfo -{ - set f0; // name of faceSet - option all; // all points of face -} +set f0; // name of faceSet +option all; // all points of face // pointSet specified by labels source labelToPoint; -sourceInfo -{ - value (12 13 56); // labels of points -} +value (12 13 56); // labels of points // pointSet from pointZone source zoneToPoint; @@ -373,95 +280,65 @@ sourceInfo // pointSet nearest to positions source nearestToPoint; -sourceInfo -{ - points ((0 0 0) (1 1 1)); -} +points ((0 0 0) (1 1 1)); // pointSet inside a rectangular bounding box or boxes source boxToPoint; -sourceInfo -{ - box (0 0 0) (1 1 1); - // boxes ((0 0 0) (1 1 1) (10 10 10)(11 11 11)); -} +box (0 0 0) (1 1 1); +// boxes ((0 0 0) (1 1 1) (10 10 10)(11 11 11)); // pointSet, based on surface source surfaceToPoint; -sourceInfo -{ - file "surface.stl"; - nearDistance 0.1; // points near to surface - includeInside false; // points on inside of surface - // (requires closed surface with consistent - // normals) - includeOutside false; // ,, outside ,, -} +file "surface.stl"; +nearDistance 0.1; // points near to surface +includeInside false; // points on inside of surface + // (requires closed surface with consistent + // normals) +includeOutside false; // ,, outside ,, // pointSet based on distance to a patch or patches source patchDistanceToCell; -sourceInfo -{ - patch ".*Wall"; // Patch name - // patches (".*Wall" atmosphere); // List of patch names - distance 0.1; // Distance below which to - // include cells -} +patch ".*Wall"; // Patch name +// patches (".*Wall" atmosphere); // List of patch names +distance 0.1; // Distance below which to + // include cells // cellZoneSet reads cellZone and writes both cellZone and cellSet // cellZone can be generated from existing cellSet by source setToCellZone; -sourceInfo -{ - set c0; // name of cellSet -} +set c0; // name of cellSet // faceZoneSet manipulates both cellZone and cellSet // faceZone can be generated from existing faceSet by source setToFaceZone; -sourceInfo -{ - faceSet f0; // name of faceSet -} +faceSet f0; // name of faceSet // faceZone from faceSet, using cellSet to determine orientation source setsToFaceZone; -sourceInfo -{ - faceSet f0; // name of faceSet - cellSet c0; // name of cellSet of slave side - flip false; // optional: flip the faceZone (so now the cellSet - // is the master side) -} +faceSet f0; // name of faceSet +cellSet c0; // name of cellSet of slave side +flip false; // optional: flip the faceZone (so now the cellSet + // is the master side) //faceZone from surface with orientation from normals on surface source searchableSurfaceToFaceZone; -sourceInfo -{ - surface searchableSphere; - centre (0.05 0.05 0.005); - radius 0.025; - // name sphere.stl; // Optional name if surface triSurfaceMesh -} +surface searchableSphere; +centre (0.05 0.05 0.005); +radius 0.025; +// name sphere.stl; // Optional name if surface triSurfaceMesh // faceZone from a plane source planeToFaceZone; -sourceInfo -{ - point (0 0 4); - normal (1 0 0.2); - include all; // Take all faces (default) - // include closest; // Take the closest contiguous region of - // faces to the plane point -} +point (0 0 4); +normal (1 0 0.2); +include all; // Take all faces (default) +// include closest; // Take the closest contiguous region of + // faces to the plane point // pointZoneSet manipulates both cellZone and cellSet // pointZone can be generated from existing pointSet by source setToPointZone; -sourceInfo -{ - set p0; // name of pointSet -} +set p0; // name of pointSet */ diff --git a/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict b/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict index 7017457ea8..bfb0680ad1 100644 --- a/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict +++ b/etc/caseDicts/mesh/manipulation/refineRegion/topoSetDict @@ -20,10 +20,7 @@ actions type cellSet; name c0; source boxToCell; - sourceInfo - { - box (-1 -1 -1) (1 1 1); // Edit box bounds as required - } + box (-1 -1 -1) (1 1 1); // Edit box bounds as required } ); diff --git a/src/meshTools/sets/faceSources/patchFluxToFace/patchFluxToFace.H b/src/meshTools/sets/faceSources/patchFluxToFace/patchFluxToFace.H index 3af61e6651..73d9f1cceb 100644 --- a/src/meshTools/sets/faceSources/patchFluxToFace/patchFluxToFace.H +++ b/src/meshTools/sets/faceSources/patchFluxToFace/patchFluxToFace.H @@ -38,12 +38,9 @@ Usage type faceSet; name inflow; source patchFluxToFace; - sourceInfo - { - field phi; - patch outlet; - inflow true; - } + field phi; + patch outlet; + inflow true; } { @@ -51,12 +48,9 @@ Usage type faceSet; name outflow; source patchFluxToFace; - sourceInfo - { - field phi; - patch outlet; - inflow false; - } + field phi; + patch outlet; + inflow false; } ); \endverbatim diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict index 7f8a1e601e..6f9ebc7849 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict @@ -21,13 +21,10 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - boxes - ( - (0 0.04 0) (0.1 0.05 0.1) - ); - } + boxes + ( + (0 0.04 0) (0.1 0.05 0.1) + ); } { @@ -35,10 +32,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set injection; - } + set injection; } ); diff --git a/test/postProcessing/channel/system/topoSetDict b/test/postProcessing/channel/system/topoSetDict index 33c1e15a82..9b635a3e58 100644 --- a/test/postProcessing/channel/system/topoSetDict +++ b/test/postProcessing/channel/system/topoSetDict @@ -21,20 +21,14 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name inlet; - } + name inlet; } { name f0; type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - set f0; - } + set f0; } ); diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict index 4c2c9b5c6e..349dc866f7 100644 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (1 1 0.99) (2 2 1); - } + box (1 1 0.99) (2 2 1); } { @@ -32,10 +29,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (2.4 2.4 0) (3 3 1); - } + box (2.4 2.4 0) (3 3 1); } { @@ -43,10 +37,7 @@ actions type cellSet; action add; source boxToCell; - sourceInfo - { - box (0 0 0) (0.6 0.6 1); - } + box (0 0 0) (0.6 0.6 1); } { @@ -54,11 +45,8 @@ actions type faceSet; action add; source cellToFace; - sourceInfo - { - set blockedCellsSet; - option all; - } + set blockedCellsSet; + option all; } { @@ -66,10 +54,7 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (1.0 1.99 0) (2.0 2.09 0.6); - } + box (1.0 1.99 0) (2.0 2.09 0.6); } ); diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict index 9990dca5ba..2e106ef176 100644 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict @@ -31,10 +31,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet wallFilmFaceSet; - } + faceSet wallFilmFaceSet; } ); diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict index a28864c9e6..493fc4e551 100644 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict @@ -31,40 +31,28 @@ actions type cellSet; action delete; source boxToCell; - sourceInfo - { - box (0.4 0.1 0.1) (0.6 0.3 0.3); - } + box (0.4 0.1 0.1) (0.6 0.3 0.3); } { name c0; type cellSet; action delete; source boxToCell; - sourceInfo - { - box (0.4 0.1 0.4) (0.6 0.3 0.6); - } + box (0.4 0.1 0.4) (0.6 0.3 0.6); } { name c0; type cellSet; action delete; source boxToCell; - sourceInfo - { - box (0.4 0.4 0.1) (0.6 0.6 0.3); - } + box (0.4 0.4 0.1) (0.6 0.6 0.3); } { name c0; type cellSet; action delete; source boxToCell; - sourceInfo - { - box (0.4 0.4 0.4) (0.6 0.6 0.6); - } + box (0.4 0.4 0.4) (0.6 0.6 0.6); } ); diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict.wallFilmRegion b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict.wallFilmRegion index ddb00b86ab..2a3dcf3b93 100644 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict.wallFilmRegion +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict.wallFilmRegion @@ -31,10 +31,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet wallFilmFaceSet; - } + faceSet wallFilmFaceSet; } ); diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet index f3bd8ab063..bd769a567b 100644 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet @@ -31,10 +31,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet wallFilmFaceSet; - } + faceSet wallFilmFaceSet; } ); diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict index bcdaf93f09..78908d0b6d 100644 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict @@ -21,20 +21,14 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name walls; - } + name walls; } { name walls; type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet walls; - } + faceSet walls; } ); diff --git a/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire2D/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire2D/system/topoSetDict index 967bb1bd74..ae680eaffc 100644 --- a/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire2D/system/topoSetDict +++ b/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire2D/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1); - } + box (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1); } ); diff --git a/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire3D/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire3D/system/topoSetDict index 7fe65e3596..838b7bd92f 100644 --- a/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire3D/system/topoSetDict +++ b/tutorials/combustion/buoyantReactingFoam/RAS/smallPoolFire3D/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (-0.1 -0.001 -0.1)(0.1 0.005 0.1); - } + box (-0.1 -0.001 -0.1)(0.1 0.005 0.1); } ); diff --git a/tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict index 8ca627518c..3daa20c3b5 100644 --- a/tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict @@ -22,20 +22,14 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (1.5 -10 -10) (2 10 10); - } + box (1.5 -10 -10) (2 10 10); } { name filter; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set filterCellSet; - } + set filterCellSet; } @@ -44,40 +38,28 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-10 -10 -10) (1.5 10 10); - } + box (-10 -10 -10) (1.5 10 10); } { name leftFluid; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set leftFluidCellSet; - } + set leftFluidCellSet; } { name rightFluidCellSet; type cellSet; action new; source boxToCell; - sourceInfo - { - box (2 -1 -1) (10 10 10); - } + box (2 -1 -1) (10 10 10); } { name rightFluid; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set rightFluidCellSet; - } + set rightFluidCellSet; } @@ -87,22 +69,16 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set filterCellSet; - option all; - } + set filterCellSet; + option all; } { name cycLeftFaceSet; type faceSet; action subset; source cellToFace; - sourceInfo - { - set leftFluidCellSet; - option all; - } + set leftFluidCellSet; + option all; } // Create faceZone from cycLeft { @@ -110,10 +86,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet cycLeftFaceSet; - } + faceSet cycLeftFaceSet; } // cycRight @@ -122,22 +95,16 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set filterCellSet; - option all; - } + set filterCellSet; + option all; } { name cycRightFaceSet; type faceSet; action subset; source cellToFace; - sourceInfo - { - set rightFluidCellSet; - option all; - } + set rightFluidCellSet; + option all; } // Create faceZone from cycRight { @@ -145,10 +112,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet cycRightFaceSet; - } + faceSet cycRightFaceSet; } ); diff --git a/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict index 00e48a410f..fb971e79e2 100644 --- a/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict @@ -22,11 +22,8 @@ actions action new; source sphereToCell; - sourceInfo - { - centre (0.125 0.375 0.05); - radius 0.005; - } + centre (0.125 0.375 0.05); + radius 0.005; } ); diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict index d2a7896afd..968e15742d 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict @@ -20,20 +20,14 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (-0.001 0.25 1.1)(0.001 0.75 1.3); - } + box (-0.001 0.25 1.1)(0.001 0.75 1.3); } { name outlet; type faceSet; action new; source boxToFace; - sourceInfo - { - box (1.75 2.999 0.3)(2.25 3.001 0.5); - } + box (1.75 2.999 0.3)(2.25 3.001 0.5); } ); diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/topoSetDict index db8b425f29..cf104edf3b 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/topoSetDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/topoSetDict @@ -23,22 +23,18 @@ actions type cellSet; action new; source cylinderToCell; - sourceInfo - { - point1 (0 0 -100); - point2 (0 0 100); - centre (0 0 0); - radius $cylinderRadius; - } + point1 (0 0 -100); + point2 (0 0 100); + centre (0 0 0); + radius $cylinderRadius; } { name solid; type cellZoneSet; action new; source setToCellZone; - sourceInfo { set cs; } + set cs; } - ); // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict index 93ec73fd10..d6691e310b 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/system/topoSetDict @@ -23,18 +23,15 @@ actions type cellSet; action new; source sphereToCell; - sourceInfo - { - centre (0 0 0); - radius $!geometry/sphere/radius; - } + centre (0 0 0); + radius $!geometry/sphere/radius; } { name solid; type cellZoneSet; action new; source setToCellZone; - sourceInfo { set cs; } + set cs; } ); diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1 b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1 index d9d1c46035..22d55c6afe 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1 +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1 @@ -32,21 +32,15 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set rotorCells; - option all; - } + set rotorCells; + option all; } { name rotorFaces; type faceSet; action subset; source boxToFace; - sourceInfo - { - box (-100 -100 0.1) (100 100 0.15); - } + box (-100 -100 0.1) (100 100 0.15); } { @@ -54,10 +48,7 @@ actions type faceSet; action new; source faceToFace; - sourceInfo - { - set rotorFaces; - } + set rotorFaces; } { @@ -65,10 +56,7 @@ actions type faceSet; action subset; source boxToFace; - sourceInfo - { - box (-100 0.249 -100) (100 0.251 100); - } + box (-100 0.249 -100) (100 0.251 100); } { @@ -76,10 +64,7 @@ actions type faceSet; action new; source faceToFace; - sourceInfo - { - set rotorFaces; - } + set rotorFaces; } { @@ -87,10 +72,7 @@ actions type faceSet; action subset; source boxToFace; - sourceInfo - { - box (0.249 -100 -100) (0.251 100 100); - } + box (0.249 -100 -100) (0.251 100 100); } { @@ -98,20 +80,14 @@ actions type faceSet; action add; source faceToFace; - sourceInfo - { - set rotorBlades2; - } + set rotorBlades2; } { name rotorBlades; type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet rotorBladesFaceSet; - } + faceSet rotorBladesFaceSet; } ); diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2 b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2 index 44bd8e5937..d664f7f0d8 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2 +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2 @@ -42,20 +42,14 @@ actions type cellSet; action subset; source boxToCell; - sourceInfo - { - box (-100 -100 0.1) (100 100 0.15); - } + box (-100 -100 0.1) (100 100 0.15); } { name rotor; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set rotorCells; - } + set rotorCells; } ); diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict index 9da81a01e0..34f7fdb25a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/gas/topoSetDict @@ -20,10 +20,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.01 0.1 -0.01) (0.02 0.11 0.01); - } + box (0.01 0.1 -0.01) (0.02 0.11 0.01); } ); diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/topoSetDict index 30abf13cc6..e0469f260b 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/topoSetDict +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/topoSetDict @@ -21,22 +21,16 @@ actions type faceZoneSet; action new; source searchableSurfaceToFaceZone; - sourceInfo - { - surface triSurfaceMesh; - name "surface1.obj"; - } + surface triSurfaceMesh; + file "surface1.obj"; } { name fz2; type faceZoneSet; action new; source searchableSurfaceToFaceZone; - sourceInfo - { - surface triSurfaceMesh; - name "surface2.obj"; - } + surface triSurfaceMesh; + file "surface2.obj"; } ); diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict index ad681b5b56..00193cdb18 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (0.099 -0.006 0.004)(0.101 0.006 0.016); - } + box (0.099 -0.006 0.004)(0.101 0.006 0.016); } { @@ -32,10 +29,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-10 -10 -10)(0.1 10 10); - } + box (-10 -10 -10)(0.1 10 10); } { @@ -43,11 +37,8 @@ actions type faceZoneSet; action new; source setsToFaceZone; - sourceInfo - { - faceSet cyclicFacesFaceSet; - cellSet cyclicFacesSlaveCells; - } + faceSet cyclicFacesFaceSet; + cellSet cyclicFacesSlaveCells; } { @@ -55,10 +46,7 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (0.099 -10 -10)(0.101 10 10); - } + box (0.099 -10 -10)(0.101 10 10); } { @@ -66,10 +54,7 @@ actions type faceSet; action delete; source boxToFace; - sourceInfo - { - box (0.099 -0.006 0.004)(0.101 0.006 0.016); - } + box (0.099 -0.006 0.004)(0.101 0.006 0.016); } { @@ -77,10 +62,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet baffleFaceSet; - } + faceSet baffleFaceSet; } ); diff --git a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict index a6d3bf6955..48be43fadf 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict +++ b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (-0.84 -0.31 -0.01)(-0.82 0.31 0.06); - } + box (-0.84 -0.31 -0.01)(-0.82 0.31 0.06); } ); diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict index 35fc8f9bd4..82c19c613b 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict @@ -34,10 +34,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet couple1FaceSet; - } + faceSet couple1FaceSet; } // Create faceZone for patch couple2 @@ -56,10 +53,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet couple2FaceSet; - } + faceSet couple2FaceSet; } // Create cellZone for moving cells in inlet channel @@ -68,20 +62,14 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-100 -100 -100) (1.0001 100 100); - } + box (-100 -100 -100) (1.0001 100 100); } { name inletChannel; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set inletChannelCellSet; - } + set inletChannelCellSet; } ); diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict index c2a2b2a368..c5e75e4ce3 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict +++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/topoSetDict @@ -24,10 +24,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name "AMI.*"; - } + name "AMI.*"; } ); diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict index a9c078855f..b3731009dc 100644 --- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict +++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/system/topoSetDict @@ -16,26 +16,22 @@ FoamFile actions ( - // porousBlockage + // Create porousBlockage cellSet { name porousBlockageCellSet; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-0.5 -0.5 -1) (0.5 0.5 1); - } + box (-0.5 -0.5 -1) (0.5 0.5 1); } + + // Convert porousBlockage cellSet into a cellZone { name porousBlockage; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set porousBlockageCellSet; - } + set porousBlockageCellSet; } ); diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict index ad00773898..67c0f3abcc 100644 --- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict +++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict @@ -31,21 +31,15 @@ actions type faceSet; action subset; source boxToFace; - sourceInfo - { - box (0 -100 -100)(100 -0.2 100); - } + box (0 -100 -100)(100 -0.2 100); } { name c0; type cellSet; action new; source faceToCell; - sourceInfo - { - set f0; - option any; - } + set f0; + option any; } @@ -64,11 +58,8 @@ actions type cellSet; action delete; source faceToCell; - sourceInfo - { - set walls; - option any; - } + set walls; + option any; } ); diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict index 3100f2b154..cd0d6a17ee 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict +++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/topoSetDict @@ -22,20 +22,14 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (581850.5 4785805 1061) (581850.8 4785815 1071); - } + box (581850.5 4785805 1061) (581850.8 4785815 1071); } { name actuationDisk1; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set actuationDisk1CellSet; - } + set actuationDisk1CellSet; } // actuationDisk2 @@ -44,20 +38,14 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (581754 4785658 1065) (581754.4 4785668 1075); - } + box (581754 4785658 1065) (581754.4 4785668 1075); } { name actuationDisk2; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set actuationDisk2CellSet; - } + set actuationDisk2CellSet; } ); diff --git a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict index 465a428c25..04b87cacb4 100644 --- a/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict +++ b/tutorials/mesh/foamyHexMesh/blob/system/topoSetDict @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-100 -100 -0.2)(100 100 100); - } + box (-100 -100 -0.2)(100 100 100); } { @@ -32,11 +29,8 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set z; - option all; - } + set z; + option all; } { @@ -50,11 +44,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set z; - option all; - } + set z; + option all; } // ~~~~~~~~~~~~~~~~ // @@ -64,10 +55,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-0.32 -100 -100)(100 100 100); - } + box (-0.32 -100 -100)(100 100 100); } { @@ -75,11 +63,8 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set x; - option all; - } + set x; + option all; } { @@ -93,11 +78,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set x; - option all; - } + set x; + option all; } // ~~~~~~~~~~~~~~~~ // @@ -107,11 +89,8 @@ actions type cellSet; action new; source sphereToCell; - sourceInfo - { - centre (-0.3 -0.3 -0.3); - radius 0.4; - } + centre (-0.3 -0.3 -0.3); + radius 0.4; } { @@ -119,11 +98,8 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set sp; - option all; - } + set sp; + option all; } { @@ -137,11 +113,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set sp; - option all; - } + set sp; + option all; } ); diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background index e0c2ec4bb2..9a0b88c5aa 100644 --- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background +++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background @@ -20,16 +20,13 @@ actions type cellSet; action new; source surfaceToCell; - sourceInfo - { - file "constant/geometry/flange.obj"; - outsidePoints ((-0.026 -0.0275 -0.0235)); - includeCut true; - includeInside true; - includeOutside false; - nearDistance -1; - curvature -100; - } + file "constant/geometry/flange.obj"; + outsidePoints ((-0.026 -0.0275 -0.0235)); + includeCut true; + includeInside true; + includeOutside false; + nearDistance -1; + curvature -100; } ); diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices index c8adc66f0a..849072691c 100644 --- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices +++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-slices @@ -25,10 +25,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-100 -100 $zSlice)(100 100 100); - } + box (-100 -100 $zSlice)(100 100 100); } { @@ -36,11 +33,8 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set z; - option all; - } + set z; + option all; } { @@ -54,11 +48,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set z; - option all; - } + set z; + option all; } // ~~~~~~~~~~~~~~~~ // @@ -68,10 +59,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-100 $ySlice -100)(100 100 100); - } + box (-100 $ySlice -100)(100 100 100); } { @@ -79,11 +67,8 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set y; - option all; - } + set y; + option all; } { @@ -97,11 +82,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set y; - option all; - } + set y; + option all; } // ~~~~~~~~~~~~~~~~ // @@ -111,10 +93,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box ($xSlice -100 -100)(100 100 100); - } + box ($xSlice -100 -100)(100 100 100); } { @@ -122,11 +101,8 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set x; - option all; - } + set x; + option all; } { @@ -140,11 +116,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set x; - option all; - } + set x; + option all; } ); diff --git a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict index ed5b870b5c..dcfd4a16f2 100644 --- a/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict +++ b/tutorials/mesh/foamyHexMesh/simpleShapes/system/topoSetDict @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-100 -100 0)(100 100 100); - } + box (-100 -100 0)(100 100 100); } { @@ -32,11 +29,8 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set z; - option all; - } + set z; + option all; } { @@ -50,11 +44,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set z; - option all; - } + set z; + option all; } // ~~~~~~~~~~~~~~~~ // @@ -64,10 +55,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-100 0.1 -100)(100 100 100); - } + box (-100 0.1 -100)(100 100 100); } { @@ -75,11 +63,8 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set y; - option all; - } + set y; + option all; } { @@ -93,11 +78,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set y; - option all; - } + set y; + option all; } // ~~~~~~~~~~~~~~~~ // @@ -107,10 +89,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.3 -100 -100)(100 100 100); - } + box (0.3 -100 -100)(100 100 100); } { @@ -118,11 +97,8 @@ actions type faceSet; action new; source cellToFace; - sourceInfo - { - set x; - option all; - } + set x; + option all; } { @@ -136,11 +112,8 @@ actions type faceSet; action subset; source cellToFace; - sourceInfo - { - set x; - option all; - } + set x; + option all; } ); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1 index c6b166487c..399887cfc7 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1 @@ -21,12 +21,9 @@ actions type cellSet; action new; source fieldToCell; - sourceInfo - { - field radiusFieldXY; - min 13.36; - max 18.47; - } + field radiusFieldXY; + min 13.36; + max 18.47; } ); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2 index 33a7d9692f..472c682375 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2 @@ -21,12 +21,9 @@ actions type cellSet; action new; source fieldToCell; - sourceInfo - { - field radiusFieldXY; - min 7.00; - max 18.47; - } + field radiusFieldXY; + min 7.00; + max 18.47; } ); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3 index 4817c95736..251c6bdfb4 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3 @@ -21,12 +21,9 @@ actions type cellSet; action new; source fieldToCell; - sourceInfo - { - field radiusFieldXY; - min 3.67; - max 18.47; - } + field radiusFieldXY; + min 3.67; + max 18.47; } ); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1 index ebc207dd44..108cf66d68 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1 @@ -21,12 +21,9 @@ actions type cellSet; action new; source fieldToCell; - sourceInfo - { - field radiusFieldXY; - min 0.0; - max 0.64; - } + field radiusFieldXY; + min 0.0; + max 0.64; } ); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2 index 6aca3a28a8..0bf6fbb454 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2 @@ -21,12 +21,9 @@ actions type cellSet; action new; source fieldToCell; - sourceInfo - { - field radiusFieldXY; - min 0.0; - max 1.03; - } + field radiusFieldXY; + min 0.0; + max 1.03; } ); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3 index 918cfd9b1c..f7878f0a16 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3 @@ -21,12 +21,9 @@ actions type cellSet; action new; source fieldToCell; - sourceInfo - { - field radiusFieldXY; - min 0.0; - max 1.94; - } + field radiusFieldXY; + min 0.0; + max 1.94; } ); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4 index 0758371919..fb1217c105 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4 @@ -21,12 +21,9 @@ actions type cellSet; action new; source fieldToCell; - sourceInfo - { - field radiusFieldXY; - min 0.0; - max 3.67; - } + field radiusFieldXY; + min 0.0; + max 3.67; } ); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5 index 62ef6e9cb6..fd6b7dc826 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5 @@ -21,12 +21,9 @@ actions type cellSet; action new; source fieldToCell; - sourceInfo - { - field radiusFieldXY; - min 0.0; - max 7.00; - } + field radiusFieldXY; + min 0.0; + max 7.00; } ); diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6 index ce9c7ec58e..76075c6848 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6 @@ -21,12 +21,9 @@ actions type cellSet; action new; source fieldToCell; - sourceInfo - { - field radiusFieldXY; - min 0.0; - max 13.36; - } + field radiusFieldXY; + min 0.0; + max 13.36; } ); diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 index bd5d83e850..5ca8f8161f 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.004 -0.001 -1) (0.012 0.001 1); - } + box (0.004 -0.001 -1) (0.012 0.001 1); } ); diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 index 57c9aab1e2..fe203a1e4c 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.0045 -0.00075 -1) (0.0095 0.00075 1); - } + box (0.0045 -0.00075 -1) (0.0095 0.00075 1); } ); diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 index f380feb44d..b251471501 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.00475 -0.000375 -1) (0.009 0.000375 1); - } + box (0.00475 -0.000375 -1) (0.009 0.000375 1); } ); diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 index bd5d83e850..5ca8f8161f 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.004 -0.001 -1) (0.012 0.001 1); - } + box (0.004 -0.001 -1) (0.012 0.001 1); } ); diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 index 57c9aab1e2..fe203a1e4c 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.0045 -0.00075 -1) (0.0095 0.00075 1); - } + box (0.0045 -0.00075 -1) (0.0095 0.00075 1); } ); diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 index f380feb44d..b251471501 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.00475 -0.000375 -1) (0.009 0.000375 1); - } + box (0.00475 -0.000375 -1) (0.009 0.000375 1); } ); diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 index bd5d83e850..5ca8f8161f 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.004 -0.001 -1) (0.012 0.001 1); - } + box (0.004 -0.001 -1) (0.012 0.001 1); } ); diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 index 57c9aab1e2..fe203a1e4c 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.0045 -0.00075 -1) (0.0095 0.00075 1); - } + box (0.0045 -0.00075 -1) (0.0095 0.00075 1); } ); diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 index f380feb44d..b251471501 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.00475 -0.000375 -1) (0.009 0.000375 1); - } + box (0.00475 -0.000375 -1) (0.009 0.000375 1); } ); diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict index 9990dca5ba..2e106ef176 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict @@ -31,10 +31,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet wallFilmFaceSet; - } + faceSet wallFilmFaceSet; } ); diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict index 2c21e4d013..30a1f8a691 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict @@ -32,10 +32,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet plateFaceSet; - } + faceSet plateFaceSet; } ); diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 index fcaa1eba93..7df9c02390 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0 0 -2e-05) (0.0036 0.0008 4e-05); - } + box (0 0 -2e-05) (0.0036 0.0008 4e-05); } ); diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 index 8d86851e36..31d9d2e67c 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0 0 -2e-05) (0.0036 0.0003 2e-05); - } + box (0 0 -2e-05) (0.0036 0.0003 2e-05); } ); diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict index 0e2cb5c999..2dccaa15b8 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict @@ -21,60 +21,42 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-10 -6 -3) (10 0 3); - } + box (-10 -6 -3) (10 0 3); } { name c2; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-5 -3 -2.5) (9 0 2); - } + box (-5 -3 -2.5) (9 0 2); } { name c3; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-3 -1.5 -1) (8 0 1.5); - } + box (-3 -1.5 -1) (8 0 1.5); } { name c4; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-2 -1 -0.6) (7 0 1); - } + box (-2 -1 -0.6) (7 0 1); } { name c5; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1 -0.6 -0.3) (6.5 0 0.8); - } + box (-1 -0.6 -0.3) (6.5 0 0.8); } { name c6; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-0.5 -0.55 -0.15) (6.25 0 0.65); - } + box (-0.5 -0.55 -0.15) (6.25 0 0.65); } ); diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict index 0e2cb5c999..2dccaa15b8 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict @@ -21,60 +21,42 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-10 -6 -3) (10 0 3); - } + box (-10 -6 -3) (10 0 3); } { name c2; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-5 -3 -2.5) (9 0 2); - } + box (-5 -3 -2.5) (9 0 2); } { name c3; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-3 -1.5 -1) (8 0 1.5); - } + box (-3 -1.5 -1) (8 0 1.5); } { name c4; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-2 -1 -0.6) (7 0 1); - } + box (-2 -1 -0.6) (7 0 1); } { name c5; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1 -0.6 -0.3) (6.5 0 0.8); - } + box (-1 -0.6 -0.3) (6.5 0 0.8); } { name c6; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-0.5 -0.55 -0.15) (6.25 0 0.65); - } + box (-0.5 -0.55 -0.15) (6.25 0 0.65); } ); diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict index fe7cd6fdf7..eaf16bf087 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict @@ -21,60 +21,42 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-10 -6 -3) (16 0 3); - } + box (-10 -6 -3) (16 0 3); } { name c2; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-5 -3 -2.5) (16 0 2); - } + box (-5 -3 -2.5) (16 0 2); } { name c3; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-3 -1.5 -1) (16 0 1.5); - } + box (-3 -1.5 -1) (16 0 1.5); } { name c4; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-2 -1 -0.6) (16 0 1); - } + box (-2 -1 -0.6) (16 0 1); } { name c5; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1 -0.6 -0.3) (6.5 0 0.8); - } + box (-1 -0.6 -0.3) (6.5 0 0.8); } { name c6; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-0.5 -0.55 -0.15) (6.25 0 0.65); - } + box (-0.5 -0.55 -0.15) (6.25 0 0.65); } ); diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict index 2f381c72f6..1bac05730e 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (0.3015 0.0493 -1) (0.3069 0.2077 1); - } + box (0.3015 0.0493 -1) (0.3069 0.2077 1); } { @@ -32,10 +29,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1 0 -1) (0.305 0.31 1); - } + box (-1 0 -1) (0.305 0.31 1); } { @@ -43,11 +37,8 @@ actions type faceZoneSet; action new; source setsToFaceZone; - sourceInfo - { - faceSet cyclicFacesFaceSet; - cellSet cyclicFacesSlaveCells; - } + faceSet cyclicFacesFaceSet; + cellSet cyclicFacesSlaveCells; } ); diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict index be2f4734c6..bf495e9a42 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.35 0.35 0.1) (0.65 0.55 0.6); - } + box (0.35 0.35 0.1) (0.65 0.55 0.6); } { diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/topoSetDict.1 index dff9b9cca0..c9175c200b 100644 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/topoSetDict.1 +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/topoSetDict.1 @@ -21,60 +21,42 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-4.0 -3.0 -2) (4.0 0 3.0); - } + box (-4.0 -3.0 -2) (4.0 0 3.0); } { name c2; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-3.0 -2.0 -1.4) (3.5 0 1.7); - } + box (-3.0 -2.0 -1.4) (3.5 0 1.7); } { name c3; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-2.5 -0.8 -0.6) (3.0 0 0.8); - } + box (-2.5 -0.8 -0.6) (3.0 0 0.8); } { name c4; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-2.0 -0.6 -0.4) (2.5 0 0.5); - } + box (-2.0 -0.6 -0.4) (2.5 0 0.5); } { name c5; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1.0 -0.4 -0.2) (2.2 0.0 0.4); - } + box (-1.0 -0.4 -0.2) (2.2 0.0 0.4); } { name c6; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-0.8 -0.4 -0.1) (2.1 0.0 0.35); - } + box (-0.8 -0.4 -0.1) (2.1 0.0 0.35); } { @@ -82,10 +64,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-0.2 -0.25 -0.05) (2.05 0.0 0.3); - } + box (-0.2 -0.25 -0.05) (2.05 0.0 0.3); } ); diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/topoSetDict.2 index 09b7933acf..af522aa685 100644 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/topoSetDict.2 +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/topoSetDict.2 @@ -21,40 +21,28 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-4.0 -3.0 -2) (4.0 0 3.0); - } + box (-4.0 -3.0 -2) (4.0 0 3.0); } { name c2; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-3.0 -2.0 -1.4) (3.5 0 1.7); - } + box (-3.0 -2.0 -1.4) (3.5 0 1.7); } { name c3; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-2.5 -0.8 -0.6) (3.0 0 1.1); - } + box (-2.5 -0.8 -0.6) (3.0 0 1.1); } { name c4; type cellSet; action new; source boxToCell; - sourceInfo - { - box (-2.0 -0.6 -0.4) (2.5 0 0.7); - } + box (-2.0 -0.6 -0.4) (2.5 0 0.7); } ); diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict index 75753bf9e4..87558ffe90 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict @@ -31,10 +31,7 @@ actions type cellSet; action delete; source boxToCell; - sourceInfo - { - box (0.375 0.375 0) (0.625 0.625 0.25); - } + box (0.375 0.375 0) (0.625 0.625 0.25); } ); diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict1 b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict1 index e4ef59c8b1..f82bfe35a4 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict1 +++ b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict1 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1e6 -40 -1e6) (1300 40 1e6); - } + box (-1e6 -40 -1e6) (1300 40 1e6); } ); diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict2 b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict2 index 9d39b5766c..9e8a817dc4 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict2 +++ b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict2 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1e6 -30 -1e6) (1200 30 1e6); - } + box (-1e6 -30 -1e6) (1200 30 1e6); } ); diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict3 b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict3 index 81c8153000..4615dccb2d 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict3 +++ b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict3 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1e6 -40 -1e6) (1e6 40 1e6); - } + box (-1e6 -40 -1e6) (1e6 40 1e6); } ); diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict4 b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict4 index 5c9b10ed9d..a0f6e75325 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict4 +++ b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict4 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1e6 -30 -1e6) (1e6 30 1e6); - } + box (-1e6 -30 -1e6) (1e6 30 1e6); } ); diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict5 b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict5 index 167a1c9cc5..a8889e795e 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict5 +++ b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict5 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1e6 -20 -1e6) (1e6 20 1e6); - } + box (-1e6 -20 -1e6) (1e6 20 1e6); } ); diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict6 b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict6 index e0a2fdcb3a..6afd5b06ea 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict6 +++ b/tutorials/multiphase/interFoam/laminar/wave/system/topoSetDict6 @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-1e6 -10 -1e6) (1e6 10 1e6); - } + box (-1e6 -10 -1e6) (1e6 10 1e6); } ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/topoSetDict index e6e5d2fd93..2f670b9b1d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/topoSetDict +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/topoSetDict @@ -20,13 +20,10 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - boxes - ( - (0 -1 0.0) (0.005 1 0.01) - ); - } + boxes + ( + (0 -1 0.0) (0.005 1 0.01) + ); } { @@ -34,10 +31,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set injection; - } + set injection; } { @@ -45,13 +39,10 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - boxes - ( - (0 -1 0.89) (0.025 1 0.9) - ); - } + boxes + ( + (0 -1 0.89) (0.025 1 0.9) + ); } { @@ -59,10 +50,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set outlet; - } + set outlet; } ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/topoSetDict index f2cb6c44dc..a1c7cc49d2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/topoSetDict +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/topoSetDict @@ -20,13 +20,10 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - boxes - ( - (3.48 -0.1 -0.1) (3.5 0.1 0.1) - ); - } + boxes + ( + (3.48 -0.1 -0.1) (3.5 0.1 0.1) + ); } { @@ -34,10 +31,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set x349; - } + set x349; } { @@ -45,13 +39,10 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - boxes - ( - (3.48 0.0093 -0.1) (3.5 0.1 0.1) - ); - } + boxes + ( + (3.48 0.0093 -0.1) (3.5 0.1 0.1) + ); } { @@ -59,10 +50,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set x349_wall; - } + set x349_wall; } { @@ -70,13 +58,10 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - boxes - ( - (3.48 0.0 -0.1) (3.5 0.005 0.1) - ); - } + boxes + ( + (3.48 0.0 -0.1) (3.5 0.005 0.1) + ); } { @@ -84,12 +69,8 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set x349_bulk; - } + set x349_bulk; } - ); // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/topoSetDict index f2cb6c44dc..7678967d4d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/topoSetDict +++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/topoSetDict @@ -20,13 +20,10 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - boxes - ( - (3.48 -0.1 -0.1) (3.5 0.1 0.1) - ); - } + boxes + ( + (3.48 -0.1 -0.1) (3.5 0.1 0.1) + ); } { @@ -34,10 +31,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set x349; - } + set x349; } { @@ -45,13 +39,10 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - boxes - ( - (3.48 0.0093 -0.1) (3.5 0.1 0.1) - ); - } + boxes + ( + (3.48 0.0093 -0.1) (3.5 0.1 0.1) + ); } { @@ -59,10 +50,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set x349_wall; - } + set x349_wall; } { @@ -70,13 +58,10 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - boxes - ( - (3.48 0.0 -0.1) (3.5 0.005 0.1) - ); - } + boxes + ( + (3.48 0.0 -0.1) (3.5 0.005 0.1) + ); } { @@ -84,10 +69,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set x349_bulk; - } + set x349_bulk; } ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/topoSetDict index a98f67eaf5..58238b51d9 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/topoSetDict +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/topoSetDict @@ -20,12 +20,9 @@ actions type cellSet; action new; source cylinderToCell; - sourceInfo - { - point1 (0.435 0 0); - point2 (0.44 0 0); - radius 0.015875; - } + point1 (0.435 0 0); + point2 (0.44 0 0); + radius 0.015875; } { @@ -33,10 +30,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set outlet; - } + set outlet; } ); diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/topoSetDict index a98f67eaf5..58238b51d9 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/topoSetDict +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/topoSetDict @@ -20,12 +20,9 @@ actions type cellSet; action new; source cylinderToCell; - sourceInfo - { - point1 (0.435 0 0); - point2 (0.44 0 0); - radius 0.015875; - } + point1 (0.435 0 0); + point2 (0.44 0 0); + radius 0.015875; } { @@ -33,10 +30,7 @@ actions type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set outlet; - } + set outlet; } ); diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict index 0f7461489e..1c1e9fc4b6 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.1 0.8 -100) (0.4 100 100); - } + box (0.1 0.8 -100) (0.4 100 100); } { @@ -49,10 +46,7 @@ actions type faceSet; action subset; source boxToFace; - sourceInfo - { - box (-100 0.9 -100) (0.2 100 100); - } + box (-100 0.9 -100) (0.2 100 100); } { @@ -60,10 +54,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet f0FaceSet; - } + faceSet f0FaceSet; } ); diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom index 172ae7bdb7..6425429af5 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom @@ -32,11 +32,8 @@ actions type faceSet; action subset; source normalToFace; - sourceInfo - { - normal (0 1 0); // Vector - cos 0.01; // Tolerance (max cos of angle) - } + normal (0 1 0); // Vector + cos 0.01; // Tolerance (max cos of angle) } ); diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict index 0f7461489e..1c1e9fc4b6 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict @@ -21,10 +21,7 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.1 0.8 -100) (0.4 100 100); - } + box (0.1 0.8 -100) (0.4 100 100); } { @@ -49,10 +46,7 @@ actions type faceSet; action subset; source boxToFace; - sourceInfo - { - box (-100 0.9 -100) (0.2 100 100); - } + box (-100 0.9 -100) (0.2 100 100); } { @@ -60,10 +54,7 @@ actions type faceZoneSet; action new; source setToFaceZone; - sourceInfo - { - faceSet f0FaceSet; - } + faceSet f0FaceSet; } );