diff --git a/etc/caseDicts/annotated/createBafflesDict b/etc/caseDicts/annotated/createBafflesDict index 4db7e08c68..4580da46c8 100644 --- a/etc/caseDicts/annotated/createBafflesDict +++ b/etc/caseDicts/annotated/createBafflesDict @@ -89,7 +89,7 @@ baffles { //- Select faces and orientation through a searchableSurface type searchableSurface; - surface searchablePlate; + surface plate; origin (0.099 -0.006 0.004); span (0 0.012 0.012); diff --git a/etc/caseDicts/annotated/snappyHexMeshDict b/etc/caseDicts/annotated/snappyHexMeshDict index 5903d9a792..7a5f88f5d5 100644 --- a/etc/caseDicts/annotated/snappyHexMeshDict +++ b/etc/caseDicts/annotated/snappyHexMeshDict @@ -39,8 +39,7 @@ addLayers false; // keepPatches true; -// Geometry. Definition of all surfaces. All surfaces are of class -// searchableSurface. +// Geometry. All surfaces are of class searchableSurface. // Surfaces are used // - to specify refinement for any mesh cell intersecting it // - to specify refinement for any mesh cell inside/outside/near @@ -49,17 +48,17 @@ geometry { box1x1x1 { - type searchableBox; - min (1.5 1 -0.5); - max (3.5 2 0.5); + type box; + min (1.5 1 -0.5); + max (3.5 2 0.5); } // Shell for directional refinement wakeBox { - type searchableBox; - min (1.5 1 -0.5); - max (3.5 2 0.5); + type box; + min (1.5 1 -0.5); + max (3.5 2 0.5); } sphere.stl @@ -86,7 +85,7 @@ geometry sphere2 { - type searchableSphere; + type sphere; centre (1.5 1.5 1.5); radius 1.03; } diff --git a/etc/caseDicts/annotated/topoSetSourcesDict b/etc/caseDicts/annotated/topoSetSourcesDict index 4fd8fea73f..ef464d7778 100644 --- a/etc/caseDicts/annotated/topoSetSourcesDict +++ b/etc/caseDicts/annotated/topoSetSourcesDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -46,28 +46,16 @@ cellSet_doc } - //- Cells with centre within cylinder or cylinder annulus + //- Cells with centres within cylinder or cylinder annulus { source cylinderToCell; - p1 (0.2 0.2 -10); // start point on cylinder axis - p2 (0.2 0.2 0); // end point on cylinder axis + point1 (0.2 0.2 -10); // beg point on cylinder axis + point2 (0.2 0.2 0); // end point on cylinder axis radius 5.0; // optional innerRadius 1.0; } - - //- Cells with centre within cylinder annulus - // Can also simply use cylinderToCell - { - source cylinderAnnulusToCell; - p1 (0.2 0.2 -10); // start point on cylinder axis - p2 (0.2 0.2 0); // end point on cylinder axis - outerRadius 5.0; - innerRadius 1.0; - } - - //- Select based on faceSet { source faceToCell; @@ -87,24 +75,19 @@ cellSet_doc { source faceZoneToCell; zones (".*Zone"); // Names of faceZones, word or regex - // OR zone ".*Zone"; // Name of faceZone, word or regex - option master; // master/slave + // or + zone ".*Zone"; // Name of faceZone, word or regex - //- Compat - // sourceInfo - // { - // name ".*Zone"; - // option master; - // } + option master; // master/slave } //- values of field within certain range { source fieldToCell; - field U; // Note: uses mag(U) since volVectorField - min 0.1; - max 0.5; + field U; // Note: uses mag(U) since volVectorField + min 0.1; + max 0.5; } @@ -170,13 +153,11 @@ cellSet_doc } - //- Select cells with centres within a searchableSurface + //- Select cells with centres within a (closed!) searchableSurface { - source searchableSurfaceToCell; - surfaceType triSurfaceMesh; // The surface type - surfaceName blob.obj; // Name for the IOobject - // or - surface triSurfaceMesh; // Same as surface type + source searchableSurfaceToCell; + surfaceType triSurfaceMesh; // Type of surface + surfaceName blob.obj; // Name for surface object } @@ -192,6 +173,7 @@ cellSet_doc source sphereToCell; origin (0.2 0.2 -10); radius 5.0; + // optional innerRadius 1.0; } @@ -233,13 +215,8 @@ cellSet_doc { source zoneToCell; zones (".*Zone"); // Names of cellZones, word or regex - // OR zone ".*Zone"; // Name of cellZone, word or regex - - //- Compat - // sourceInfo - // { - // name ".*Zone"; - // } + // or + zone ".*Zone"; // Name of cellZone, word or regex } //- Cells attached to the outside of the input cellSet @@ -278,33 +255,22 @@ faceSet_doc // or set c0; // Name of cellSet - option all; // All faces of cells - //option both; // Only faces with owner+neighbour in cellSet + option all; // All faces of cells + //option both; // Only faces with owner+neighbour in cellSet } - //- Faces with centre within cylinder or cylinder annulus + //- Faces with centres within cylinder or cylinder annulus { source cylinderToFace; - p1 (0.2 0.2 -10); // start point on cylinder axis - p2 (0.2 0.2 0); // end point on cylinder axis + point1 (0.2 0.2 -10); // beg point on cylinder axis + point2 (0.2 0.2 0); // end point on cylinder axis radius 5.0; // optional innerRadius 1.0; } - //- Faces with centre within cylinder annulus - // Can also simply use cylinderToCell - { - source cylinderAnnulusToFace; - p1 (0.2 0.2 -10); // start point on cylinder axis - p2 (0.2 0.2 0); // end point on cylinder axis - outerRadius 5.0; - innerRadius 1.0; - } - - //- Copy elements from faceSet { source faceToFace; @@ -333,12 +299,6 @@ faceSet_doc patches ("patch.*"); // or patch somePatch; - - // Compat - sourceInfo - { - name ".*Wall"; // Name of patch or patch group, - } } @@ -367,11 +327,9 @@ faceSet_doc // (if surface is not closed a warning will be given and surface will // be ignored) { - source searchableSurfaceToFace; - surfaceType triSurfaceMesh; // The surface type - surfaceName blob.obj; // Name for the IOobject - // or - surface triSurfaceMesh; // Same as surface type + source searchableSurfaceToFace; + surfaceType triSurfaceMesh; // Type of surface + surfaceName blob.obj; // Name for surface object } @@ -412,13 +370,8 @@ faceSet_doc source zoneToFace; zones (".*Zone"); // Names of faceZones, word or regex - // OR zone ".*Zone"; // Name of faceZone, word or regex - - // Compat - // sourceInfo - // { - // name ".*Zone1"; - // } + // or + zone ".*Zone"; // Name of faceZone, word or regex } } @@ -452,8 +405,8 @@ pointSet_doc //- Points within cylinder or cylinder annulus { source cylinderToPoint; - p1 (0.2 0.2 -10); // start point on cylinder axis - p2 (0.2 0.2 0); // end point on cylinder axis + point1 (0.2 0.2 -10); // beg point on cylinder axis + point2 (0.2 0.2 0); // end point on cylinder axis radius 5.0; // optional innerRadius 1.0; @@ -494,13 +447,11 @@ pointSet_doc } - //- Points within a searchableSurface + //- Cell centres within a searchableSurface { - source searchableSurfaceToCell; - surfaceType triSurfaceMesh; // The surface type - surfaceName blob.obj; // Name for the IOobject - // or - surface triSurfaceMesh; // Same as surface type + source searchableSurfaceToCell; + surfaceType triSurfaceMesh; // Type of surface + surfaceName blob.obj; // Name for surface object } @@ -516,8 +467,8 @@ pointSet_doc //- Select based on surface { - source surfaceToPoint; - file "geometry.stl"; + source searchableSurfaceToPoint; + file "geometry.stl"; nearDistance 0.1; // points near to surface includeInside false; // points on inside of surface // (requires closed surface with consistent @@ -530,13 +481,8 @@ pointSet_doc { source zoneToPoint; zones (".*Zone"); // Names of pointZones, word or regex - // OR zone ".*Zone"; // Name of pointZone, word or regex - - //- Compat - // sourceInfo - // { - // name ".*Zone"; - // } + // or + zone ".*Zone"; // Name of pointZone, word or regex } } @@ -576,12 +522,9 @@ faceZoneSet_doc //- Select based on surface. Orientation from normals on surface { - source searchableSurfaceToFaceZone; - surfaceType searchableSphere; - surfaceName blob.obj; // Optional name if surface triSurfaceMesh - - // or - surface searchableSphere; // Same as 'surfaceType' + source searchableSurfaceToFaceZone; + surfaceType sphere; // Type of surface + surfaceName blob.obj; // Name for surface object // Parameters for surface origin (0.05 0.05 0.005); diff --git a/etc/controlDict b/etc/controlDict index bfe9673800..2a2b04713f 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -855,8 +855,6 @@ DebugSwitches scalarField 0; scaleSimilarity 0; scatterModel 0; - searchableBox 0; - searchableSurface 0; sequential 0; setUpdater 0; sets 0; diff --git a/etc/templates/closedVolumeRotating/system/blockMeshDict b/etc/templates/closedVolumeRotating/system/blockMeshDict index 346e967701..bd1a262f3a 100644 --- a/etc/templates/closedVolumeRotating/system/blockMeshDict +++ b/etc/templates/closedVolumeRotating/system/blockMeshDict @@ -43,7 +43,7 @@ geometry { rotatingZone { - type searchableCylinder; + type cylinder; point1 (0 0 -100); point2 (0 0 100); radius $:backgroundMesh.radIn; @@ -51,7 +51,7 @@ geometry fixed { - type searchableCylinder; + type cylinder; point1 (0 0 -100); point2 (0 0 100); radius $:backgroundMesh.radOut; diff --git a/etc/templates/inflowOutflowRotating/system/blockMeshDict b/etc/templates/inflowOutflowRotating/system/blockMeshDict index ad4973690f..65247d9812 100644 --- a/etc/templates/inflowOutflowRotating/system/blockMeshDict +++ b/etc/templates/inflowOutflowRotating/system/blockMeshDict @@ -43,7 +43,7 @@ geometry { rotatingZone { - type searchableCylinder; + type cylinder; point1 (0 0 -100); point2 (0 0 100); radius $:backgroundMesh.radIn; @@ -51,7 +51,7 @@ geometry fixed { - type searchableCylinder; + type cylinder; point1 (0 0 -100); point2 (0 0 100); radius $:backgroundMesh.radOut; diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/createBafflesDict b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/createBafflesDict index 622f22130c..47d2b749cf 100644 --- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/createBafflesDict +++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/rightFluid/createBafflesDict @@ -27,7 +27,7 @@ baffles { //- Select faces and orientation through a searchableSurface type searchableSurface; - surface searchablePlate; + surface plate; origin (0.061 -0.3 -0.3); span (0.0 0.6 0.6); diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict index cd57af0205..4fd4fbc193 100644 --- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict +++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: v2206 | +| \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -23,42 +23,34 @@ actions type cellSet; action new; source boxToCell; - sourceInfo - { - box (-0.1001 -100 -100 )(0.0 100 100); - } + + box (-0.1001 -100 -100 )(0.0 100 100); } { name leftSolid; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set heaterCellSet; - } + + set heaterCellSet; } // rightFluid { - name rightFLuidCellSet; + name rightFluidCellSet; type cellSet; action new; source boxToCell; - sourceInfo - { - box (0.00 -100 -100 )(0.1001 100 100); - } + + box (0.00 -100 -100 )(0.1001 100 100); } { name rightFluid; type cellZoneSet; action new; source setToCellZone; - sourceInfo - { - set rightFLuidCellSet; - } + + set rightFluidCellSet; } ); diff --git a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict.f1 b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict.f1 index 4cf6a8cb8f..33abff0e5b 100644 --- a/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict.f1 +++ b/tutorials/basic/chtMultiRegionFoam/2DImplicitCyclic/system/topoSetDict.f1 @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | -| \\ / A nd | Web: www.openfoam.com | +| \\ / O peration | Version: v2206 | +| \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -23,35 +23,31 @@ actions type cellSet; action new; source zoneToCell; - zones (leftSolid); - + zones (leftSolid); } - { + { name f1; type faceSet; action new; source cellToFace; option all; - sets (c1); - + sets (c1); } - { + { name c2; type cellSet; action new; source zoneToCell; - zones (rightFluid); - + zones (rightFluid); } - { + { name f2; type faceSet; action new; source cellToFace; option all; - sets (c2); - + sets (c2); } ); diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/snappyHexMeshDict b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/snappyHexMeshDict index 984f04bdde..0b35b917f7 100644 --- a/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/snappyHexMeshDict +++ b/tutorials/compressible/acousticFoam/obliqueAirJet/main/system/snappyHexMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -33,13 +33,13 @@ geometry } rbox_f { - type searchableBox; + type box; min (0.7 0 0.7); max (1.3 0.5 1.3); } rbox_c { - type searchableBox; + type box; min (0 0 0); max (2 1 2); } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict index fee1c85418..ebc3369114 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/system/topoSetDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -21,20 +21,16 @@ 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/snappyMultiRegionHeaterImplicit/system/topoSetDict.f1 b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topoSetDict.f1 index 7b197f2ecb..29308d448f 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topoSetDict.f1 +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeaterImplicit/system/topoSetDict.f1 @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | -| \\ / A nd | Web: www.openfoam.com | +| \\ / O peration | Version: v2206 | +| \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -23,7 +23,7 @@ actions type cellSet; action new; source zoneToCell; - zones (bottomAir); + zones (bottomAir); } { name f1; @@ -31,7 +31,7 @@ actions action new; source cellToFace; option all; - sets (c1); + sets (c1); } { @@ -39,7 +39,7 @@ actions type cellSet; action new; source zoneToCell; - zones (heater); + zones (heater); } { name f2; @@ -47,7 +47,7 @@ actions action new; source cellToFace; option all; - sets (c2); + sets (c2); } { @@ -55,7 +55,7 @@ actions type cellSet; action new; source zoneToCell; - zones (leftSolid); + zones (leftSolid); } { name f3; @@ -63,7 +63,7 @@ actions action new; source cellToFace; option all; - sets (c3); + sets (c3); } { @@ -71,8 +71,7 @@ actions type cellSet; action new; source zoneToCell; - zones (rightSolid); - + zones (rightSolid); } { name f4; @@ -80,7 +79,7 @@ actions action new; source cellToFace; option all; - sets (c4); + sets (c4); } { @@ -88,7 +87,7 @@ actions type cellSet; action new; source zoneToCell; - zones (topAir); + zones (topAir); } { name f5; @@ -96,8 +95,7 @@ actions action new; source cellToFace; option all; - sets (c5); - + sets (c5); } ); diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/topoSetDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/topoSetDict index a66e95b0de..bfbe55f07b 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/topoSetDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/domain0/topoSetDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -22,7 +22,7 @@ actions type cellSet; action new; source searchableSurfaceToCell; - surfaceType searchableCylinder; + surfaceType cylinder; point1 (-0.0032 0.037517 -0.058); point2 (-0.015 0.037517 -0.058); radius 0.021; diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/topoSetDict.f1 b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/topoSetDict.f1 index 249e3e89da..762918b7e1 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/topoSetDict.f1 +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/topoSetDict.f1 @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | -| \\ / A nd | Web: www.openfoam.com | +| \\ / O peration | Version: v2206 | +| \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -23,25 +23,25 @@ actions // type cellSet; // action new; // source zoneToCell; -// zones (domain0); +// zones (domain0); // // } - { + { name c1; type cellSet; action new; source faceZoneToCell;//zoneToCel; option master; - zones (domain0_to_v_CPU); + zones (domain0_to_v_CPU); } - { + { name c1; type cellSet; action add; source faceZoneToCell;//zoneToCel; option slave; - zones (domain0_to_v_CPU); + zones (domain0_to_v_CPU); } // { @@ -49,35 +49,33 @@ actions // type cellSet; // action new; // source zoneToCell; -// zones (v_CPU); +// zones (v_CPU); // // } -// { +// { // name f2; // type faceSet; // action new; // source cellToFace; // option all; -// sets (c2); -// +// sets (c2); // } // -// { +// { // name c3; // type cellSet; // action new; // source zoneToCell; -// zones (v_fins); +// zones (v_fins); // // } -// { +// { // name f3; // type faceSet; // action new; // source cellToFace; // option all; -// sets (c3); -// +// sets (c3); // } ); diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sampleCf b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sampleCf index f4db58fead..ed74cd12f2 100644 --- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sampleCf +++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sampleCf @@ -12,7 +12,7 @@ _planes type patchEdge; axis xyz; patches ( bottom ); - surfaceType searchablePlane; + surfaceType plane; planeType pointAndNormal; origin ( 0 0 1.57079632679 ); } diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/snappyHexMeshDict index 1728974957..85b9e19e32 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/snappyHexMeshDict @@ -22,7 +22,7 @@ geometry { cylinder { - type searchableCylinder; + type cylinder; point1 (0 0 -0.00375); point2 (0 0 0.00375); radius 0.06; diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/system/topoSetDict b/tutorials/incompressible/pisoFoam/RAS/cavity/system/topoSetDict index a8a3c9d63a..801eafd409 100644 --- a/tutorials/incompressible/pisoFoam/RAS/cavity/system/topoSetDict +++ b/tutorials/incompressible/pisoFoam/RAS/cavity/system/topoSetDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -92,25 +92,14 @@ actions } { - name cylinderAnnulus1; - type cellSet; - action new; - source cylinderAnnulusToCell; - p1 (0.05 0.05 0); - p2 (0.05 0.05 0.01); - outerRadius 0.06; - innerRadius 0.01; - } - - { - name cylinder1; - type cellSet; - action new; - source cylinderToCell; - p1 (0.05 0.05 0); - p2 (0.05 0.05 0.01); - radius 0.06; - innerRadius 0.01; + name cylinder1; + type cellSet; + action new; + source cylinderToCell; + point1 (0.05 0.05 0); + point2 (0.05 0.05 0.01); + radius 0.06; + innerRadius 0.01; } { @@ -315,25 +304,14 @@ actions } { - name faceCylinderAnnulus1; - type faceSet; - action new; - source cylinderAnnulusToFace; - p1 (0.05 0.05 0); - p2 (0.05 0.05 0.01); - outerRadius 0.06; - innerRadius 0.01; - } - - { - name faceCylinder1; - type faceSet; - action new; - source cylinderToFace; - p1 (0.05 0.05 0); - p2 (0.05 0.05 0.01); - radius 0.06; - innerRadius 0.01; + name faceCylinder1; + type faceSet; + action new; + source cylinderToFace; + point1 (0.05 0.05 0); + point2 (0.05 0.05 0.01); + radius 0.06; + innerRadius 0.01; } { @@ -343,7 +321,6 @@ actions source faceToFace; sets ( - faceCylinderAnnulus1 faceCylinder1 ); } @@ -484,8 +461,8 @@ actions type pointSet; action new; source cylinderToPoint; - p1 (0.05 0.05 0); - p2 (0.05 0.05 0.01); + point1 (0.05 0.05 0); + point2 (0.05 0.05 0.01); radius 0.06; innerRadius 0.01; } diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/vtkWrite b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/vtkWrite index bc6e430c7f..53defa38e3 100644 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/vtkWrite +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/vtkWrite @@ -60,8 +60,8 @@ subset { action subtract; source cylinder; - p1 (125 100 0); - p2 (125 100 100); + point1 (125 100 0); + point2 (125 100 100); radius 20; } outlet diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict index 568885f770..3298e756df 100644 --- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict +++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -21,19 +21,14 @@ actions type faceSet; action new; source boxToFace; - sourceInfo - { - box (-100 -100 -100) (1.01 1.01 1.01); - } + + box (-100 -100 -100) (1.01 1.01 1.01); } { name f0; type faceSet; action delete; source boundaryToFace; - sourceInfo - { - } } ////- Remove internal faces; do boundary faces only @@ -43,17 +38,14 @@ actions // action clear; //} - //- Add single external face + //- Add single external face (min-z) { name f0; type faceSet; action add; source boxToFace; - sourceInfo - { - // Minz face - box (-100 -100 -100) (1.01 1.01 0.01); - } + + box (-100 -100 -100) (1.01 1.01 0.01); } { @@ -61,21 +53,17 @@ actions type cellSet; action new; source nearestToCell; - sourceInfo - { - points ((0.5 0.5 0.5)); - } + + points ((0.5 0.5 0.5)); } { name f0Zone; type faceZoneSet; action new; source setsToFaceZone; - sourceInfo - { - faceSet f0; - cellSet c0; - } + + faceSet f0; + cellSet c0; } ); diff --git a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict.flip b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict.flip index b0f1cda8fb..97b1fe36f9 100644 --- a/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict.flip +++ b/tutorials/mesh/extrudeMesh/faceZoneExtrusion/system/topoSetDict.flip @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -21,16 +21,15 @@ actions type cellSet; action new; source nearestToCell; - sourceInfo - { - points ((1.5 1.5 0.5)); - } + + points ((1.5 1.5 0.5)); } { name f0; type faceSet; action new; source cellToFace; + set c0; option all; } @@ -39,11 +38,9 @@ actions type faceZoneSet; action new; source setsToFaceZone; - sourceInfo - { - faceSet f0; - cellSet c0; - } + + faceSet f0; + cellSet c0; } ); diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background index 54d95c5f1f..e278c83a20 100644 --- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background +++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -21,16 +21,14 @@ actions type cellSet; action new; source surfaceToCell; - sourceInfo - { - file "/triSurface/flange.obj"; - outsidePoints ((-0.026 -0.0275 -0.0235)); - includeCut true; - includeInside true; - includeOutside false; - nearDistance -1; - curvature -100; - } + + file "/triSurface/flange.obj"; + outsidePoints ((-0.026 -0.0275 -0.0235)); + includeCut true; + includeInside true; + includeOutside false; + nearDistance -1; + curvature -100; } ); diff --git a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/snappyHexMeshDict index a0ebcd2eeb..f97503bfa4 100644 --- a/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/snappyHexMeshDict +++ b/tutorials/mesh/snappyHexMesh/airfoilWithLayers/system/snappyHexMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -44,7 +44,7 @@ geometry { refinement1 { - type searchableBox; + type box; min (-1 -2 -1); max ( 1 2 1); } @@ -52,7 +52,7 @@ geometry // Shell for directional refinement wakeBox { - type searchableBox; + type box; min (1.5 1 -0.5); max (3.5 2 0.5); } @@ -85,7 +85,7 @@ geometry /* sphere2 { - type searchableSphere; + type sphere; centre (1.5 1.5 1.5); radius 1.03; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage index d79a5e3bab..f5d410dc82 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createBlockage @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -25,8 +25,8 @@ actions // box (0.015 0.010 0.015) (0.035 0.015 0.035); source cylinderToCell; - p1 (0.025 0.02 0.025); - p2 (0.025 0.022 0.025); + point1 (0.025 0.02 0.025); + point2 (0.025 0.022 0.025); radius 0.01; } { diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch index 2cecff003e..0a60d6001d 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -23,8 +23,8 @@ actions action new; source cylinderToCell; - p1 (0.025 1 0.025); - p2 (0.025 0.049 0.025); + point1 (0.025 1 0.025); + point2 (0.025 0.049 0.025); radius 0.0015; } diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict index bb1622e4b2..7b4ab8d34e 100644 --- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/snappyHexMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -22,7 +22,7 @@ geometry { BoxRefinement_1 { - type searchableBox ; + type box; min (-3.8 -0.8 -0.2 ); max (3.8 0.8 0.75 ); } @@ -36,7 +36,7 @@ castellatedMeshControls nCellsBetweenLevels 4; maxLoadUnbalance 0.1; allowFreeStandingZoneFaces true; - resolveFeatureAngle 30; + resolveFeatureAngle 30; features ( ); diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict index 25d713e68b..6915c79242 100644 --- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict +++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -21,10 +21,8 @@ actions type cellSet; action new; source regionsToCell; - sourceInfo - { - insidePoints ((-6 0 0.0)); - } + + insidePoints ((-6 0 0.0)); } { @@ -32,10 +30,8 @@ actions type cellSet; action new; source cellToCell; - sourceInfo - { - set c0; - } + + set c0; } { @@ -49,11 +45,9 @@ actions type cellSet; action new; source regionsToCell; - sourceInfo - { - set c1; - insidePoints ((-3.4 0.1 0.1)); - } + + set c1; + insidePoints ((-3.4 0.1 0.1)); } { @@ -61,10 +55,8 @@ actions type cellSet; action delete; source cellToCell; - sourceInfo - { - set c2; - } + + set c2; } ); diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp index e37d095141..22d81874f0 100644 --- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp +++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/background/system/topoSetDict.cHullProp @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -21,10 +21,7 @@ actions type cellSet; action new; source cellToCell; - sourceInfo - { - set c1; - } + set c1; } { @@ -32,10 +29,7 @@ actions type cellSet; action add; source cellToCell; - sourceInfo - { - set c2; - } + set c2; } ); diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict index bfb028eb7b..93ca878540 100644 --- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-1/system/snappyHexMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -39,14 +39,14 @@ geometry BoxRefinement_1 { - type searchableBox ; + type box; min ( -3.60318 -0.20025 -0.039084 ); max ( -3.20311 0.20025 0.395883 ); } BoxRefinement_3_hub { - type searchableBox ; + type box; min ( -3.54 -0.12 0.010); max ( -3.34 0.12 0.26); } @@ -193,4 +193,4 @@ mergeTolerance 1e-08; debug 0; -// ************************************************************************* // \ No newline at end of file +// ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict index 10e59fe051..352833c1ca 100644 --- a/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/rigidBodyHull/overset-2/system/snappyHexMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -46,7 +46,7 @@ geometry BoxRefinement_3 { - type searchableBox ; + type box; min ( -4 -0.135 0.0085 ); max ( -3.3 0.135 0.26 ); } @@ -202,4 +202,4 @@ mergeTolerance 1e-08; debug 0; -// ************************************************************************* // \ No newline at end of file +// ************************************************************************* // diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict index 85d1b68dd3..aa92662a73 100644 --- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict +++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -23,9 +23,9 @@ regions ( cylinderToCell { - p1 (0 0 -5); - p2 (0 0 0); - radius 1; + point1 (0 0 -5); + point2 (0 0 0); + radius 1; fieldValues ( volScalarFieldValue DT 1e6