diff --git a/etc/caseDicts/annotated/topoSetDict b/etc/caseDicts/annotated/topoSetDict index 461d94bc82..22792d3f6b 100644 --- a/etc/caseDicts/annotated/topoSetDict +++ b/etc/caseDicts/annotated/topoSetDict @@ -106,18 +106,12 @@ set c1; // cellSet from cell zone source zoneToCell; -sourceInfo -{ - name ".*Zone"; // Name of cellZone, regular expressions allowed -} +zone ".*Zone"; // Name of cellZone, regular expressions allowed // cellSet from cells on master or slave side of faceZone source faceZoneToCell; -sourceInfo -{ - name ".*Zone"; // Name of faceZone, regular expressions allowed - option master; // master/slave -} +zone ".*Zone"; // Name of faceZone, regular expressions allowed +option master; // master/slave // cellSet from faceSet source faceToCell; @@ -213,8 +207,8 @@ option all; // All faces of cells source pointToFace; 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 +// option all // Faces with all points in pointSet +// option edge // Faces with two consecutive points in pointSet // faceSet specified by labels source labelToFace; @@ -222,21 +216,15 @@ value (12 13 56); // labels of faces // faceSet from patches source patchToFace; -sourceInfo -{ - name ".*Wall"; // Name of patch or patch group, - // (regular expressions allowed) -} +patch ".*Wall"; // Name of patch or patch group, + // (regular expressions allowed) // faceSet from the boundary source boundaryToFace; // faceSet from a faceZone source zoneToFace; -sourceInfo -{ - name ".*Zone1"; // Name of faceZone, regular expressions allowed -} +zone ".*Zone1"; // Name of faceZone, regular expressions allowed // faceSet inside a rectangular bounding box or boxes source boxToFace; @@ -273,10 +261,7 @@ value (12 13 56); // labels of points // pointSet from pointZone source zoneToPoint; -sourceInfo -{ - name ".*Zone"; // name of pointZone, regular expressions allowed -} +zone ".*Zone"; // name of pointZone, regular expressions allowed // pointSet nearest to positions source nearestToPoint; diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C index d349cc7cc6..da4adb668b 100644 --- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C +++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "cellToCell.H" -#include "polyMesh.H" #include "cellSet.H" #include "addToRunTimeSelectionTable.H" diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H index 2036294098..4fe19c5d14 100644 --- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H +++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H @@ -52,10 +52,10 @@ class cellToCell { // Private Data - //- Name of set to use word setName_; + public: //- Runtime type information @@ -94,7 +94,6 @@ public: const topoSetSource::setAction action, topoSet& ) const; - }; diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C index fd427e5b63..5edbe2e176 100644 --- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C +++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C @@ -118,7 +118,7 @@ Foam::faceZoneToCell::faceZoneToCell ) : topoSetSource(mesh), - zoneName_(dict.lookup("name")), + zoneName_(dict.lookupBackwardsCompatible({"zone", "name"})), option_(faceActionNames_.read(dict.lookup("option"))) {} diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C index 59c3fb556c..30a26f82c7 100644 --- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C +++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C @@ -96,7 +96,12 @@ Foam::zoneToCell::zoneToCell ) : topoSetSource(mesh), - zoneName_(dict.lookup("name")) + zoneName_ + ( + dict.dictName() == "sourceInfo" + ? dict.lookupBackwardsCompatible({"zone", "name"}) + : dict.lookup("zone") + ) {} diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C index 2a05a654a3..2d5bd8e186 100644 --- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C +++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C @@ -97,7 +97,12 @@ Foam::patchToFace::patchToFace ) : topoSetSource(mesh), - patchName_(dict.lookup("name")) + patchName_ + ( + dict.dictName() == "sourceInfo" + ? dict.lookupBackwardsCompatible({"patch", "name"}) + : dict.lookup("patch") + ) {} diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C index 732c3761db..d2a0d44909 100644 --- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C +++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C @@ -96,7 +96,12 @@ Foam::zoneToFace::zoneToFace ) : topoSetSource(mesh), - zoneName_(dict.lookup("name")) + zoneName_ + ( + dict.dictName() == "sourceInfo" + ? dict.lookupBackwardsCompatible({"zone", "name"}) + : dict.lookup("zone") + ) {} diff --git a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C index ad7b77e1e4..fe75f67129 100644 --- a/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C +++ b/src/meshTools/sets/faceZoneSources/searchableSurfaceToFaceZone/searchableSurfaceToFaceZone.C @@ -209,7 +209,11 @@ Foam::searchableSurfaceToFaceZone::searchableSurfaceToFaceZone word(dict.lookup("surface")), IOobject ( - dict.lookupOrDefault("name", mesh.objectRegistry::db().name()), + dict.lookupOrDefault + ( + "file", + mesh.objectRegistry::db().name() + ), mesh.time().constant(), searchableSurface::geometryDir(mesh.time()), mesh.objectRegistry::db(), diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C index 5031ea8c9a..20c9325e3a 100644 --- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C +++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C @@ -97,7 +97,12 @@ Foam::zoneToPoint::zoneToPoint ) : topoSetSource(mesh), - zoneName_(dict.lookup("name")) + zoneName_ + ( + dict.dictName() == "sourceInfo" + ? dict.lookupBackwardsCompatible({"zone", "name"}) + : dict.lookup("zone") + ) {} diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict index 2e106ef176..147c1be01b 100644 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name filmWalls; - } + patch filmWalls; } { name wallFilmFaces; diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict.wallFilmRegion b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict.wallFilmRegion index 2a3dcf3b93..47204ad0dd 100644 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict.wallFilmRegion +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict.wallFilmRegion @@ -21,10 +21,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name wallFilm; - } + patch wallFilm; } { name wallFilmFaces; diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet index bd769a567b..0c1af23c5c 100644 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet @@ -21,10 +21,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name filmWalls; - } + patch filmWalls; } { name wallFilmFaces; diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict index 78908d0b6d..96d2dc0e3e 100644 --- a/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict @@ -21,7 +21,7 @@ actions type faceSet; action new; source patchToFace; - name walls; + patch walls; } { name walls; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1 b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1 index 22d55c6afe..4623e42642 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1 +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1 @@ -22,10 +22,7 @@ actions type cellSet; action new; source zoneToCell; - sourceInfo - { - name cylinder; - } + zone cylinder; } { name rotorFaces; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2 b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2 index d664f7f0d8..e6ed9b0b42 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2 +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2 @@ -22,20 +22,14 @@ actions type cellSet; action new; source zoneToCell; - sourceInfo - { - name cylinder; - } + zone cylinder; } { name rotorCells; type cellSet; action add; source zoneToCell; - sourceInfo - { - name innerCylinder; - } + zone innerCylinder; } { name rotorCells; diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict index 82c19c613b..e74463476d 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/system/topoSetDict @@ -24,10 +24,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name couple1; - } + patch couple1; } { name couple1Faces; @@ -43,10 +40,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name couple2; - } + patch couple2; } { name couple2Faces; diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict index 67c0f3abcc..f765716154 100644 --- a/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict +++ b/tutorials/incompressible/simpleFoam/pipeCyclic/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name "side1"; - } + patch "side1"; } { name f0; @@ -48,10 +45,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name "walls"; - } + patch "walls"; } { name c0; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict index 2e106ef176..147c1be01b 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/cylinder/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name filmWalls; - } + patch filmWalls; } { name wallFilmFaces; diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict index 30a1f8a691..751d670a4c 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict @@ -21,10 +21,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name plate; - } + patch plate; } { diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict index 1c1e9fc4b6..a4112f2125 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict @@ -35,10 +35,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name freeSurface; - } + patch freeSurface; } { diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom index 6425429af5..a915bc3f01 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom @@ -21,10 +21,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name floatingObject; - } + patch floatingObject; } { diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict index 1c1e9fc4b6..a4112f2125 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict @@ -35,10 +35,7 @@ actions type faceSet; action new; source patchToFace; - sourceInfo - { - name freeSurface; - } + patch freeSurface; } {