topoSet: Rationalised the name keyword for zones and patches

For a set to zone conversion the name of the zone is now specified with the
'zone' keyword.

For a patch to set conversion the name of the patch is now specified with the
'patch' keyword.

Backward-compatibility is supported for both these changes.

Additionally the file name of a searchableSurface file is specified with the
'file' keyword.  This should be 'surface' but that keyword is currently and
confusingly used for the surface type rather than name and this cannot be
changed conveniently while maintaining backward compatibility.

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;

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;

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;

tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict

@@ -21,7 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        name walls;
+        patch   walls;
     }
     {
         name    walls;

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;

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;

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;

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;

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;

tutorials/multiphase/compressibleInterFoam/laminar/plateFilm/system/topoSetDict

@@ -21,10 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
-            name plate;
-        }
+        patch   plate;
     }
 
     {

tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict

@@ -35,10 +35,7 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
-            name   freeSurface;
-        }
+        patch   freeSurface;
     }
 
     {

tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom

@@ -21,10 +21,7 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
-            name   floatingObject;
-        }
+        patch   floatingObject;
     }
 
     {

tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/topoSetDict

@@ -35,10 +35,7 @@ actions
         type    faceSet;
         action  new;
         source  patchToFace;
-        sourceInfo
-        {
-            name   freeSurface;
-        }
+        patch   freeSurface;
     }
 
     {