diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict index 00eee0f69..5da4b55ae 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/snappyHexMeshDict @@ -20,58 +20,58 @@ addLayers false; geometry { - AMI.obj + AMI { type triSurfaceMesh; - name AMI; + file "AMI.obj"; } - innerInlet.obj + innerInlet { type triSurfaceMesh; - name innerInlet; + file "innerInlet.obj"; } - outerInlet.obj + outerInlet { type triSurfaceMesh; - name outerInlet; + file "outerInlet.obj"; } - innerOutlet.obj + innerOutlet { type triSurfaceMesh; - name innerOutlet; + file "innerOutlet.obj"; } - outerOutlet.obj + outerOutlet { type triSurfaceMesh; - name outerOutlet; + file "outerOutlet.obj"; } - rotorBlades.obj + rotorBlades { type triSurfaceMesh; - name rotorBlades; + file "rotorBlades.obj"; } - shaft.obj + shaft { type triSurfaceMesh; - name shaft; + file "shaft.obj"; } - statorBlades.obj + statorBlades { type triSurfaceMesh; - name statorBlades; + file "statorBlades.obj"; } - wall.obj + walls { type triSurfaceMesh; - name walls; + file "wall.obj"; } }; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict index 53802769e..c093a0aaa 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict @@ -29,34 +29,34 @@ addLayers false; // - to 'snap' the mesh boundary to the surface geometry { - bottomAir.stl + bottomAir { type triSurfaceMesh; - name bottomAir; + file "bottomAir.stl"; } - topAir.stl + topAir { type triSurfaceMesh; - name topAir; + file "topAir.stl"; } - leftSolid.stl + leftSolid { type triSurfaceMesh; - name leftSolid; + file "leftSolid.stl"; } - rightSolid.stl + rightSolid { type triSurfaceMesh; - name rightSolid; + file "rightSolid.stl"; } - heater.stl + heater { type triSurfaceMesh; - name heater; + file "heater.stl"; } }; diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict index a6122210a..36b96b5c0 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/snappyHexMeshDict @@ -28,10 +28,10 @@ addLayers false; // - to 'snap' the mesh boundary to the surface geometry { - innerCylinder.obj + innerCylinder { type triSurfaceMesh; - name innerCylinder; + file "innerCylinder.obj"; regions { ascii @@ -40,10 +40,10 @@ geometry } } } - innerCylinderSmall.obj + innerCylinderSmall { type triSurfaceMesh; - name innerCylinderSmall; + file "innerCylinderSmall.obj"; regions { ascii @@ -52,10 +52,10 @@ geometry } } } - outerCylinder.obj + outerCylinder { type triSurfaceMesh; - name outerCylinder; + file "outerCylinder.obj"; regions { ascii @@ -64,10 +64,10 @@ geometry } } } - propellerTip.obj.gz + propellerTip { type triSurfaceMesh; - name propellerTip; + file "propellerTip.obj"; regions { ascii @@ -76,10 +76,10 @@ geometry } } } - propellerStem1.obj + propellerStem1 { type triSurfaceMesh; - name propellerStem1; + file "propellerStem1.obj"; regions { ascii @@ -88,10 +88,10 @@ geometry } } } - propellerStem2.obj + propellerStem2 { type triSurfaceMesh; - name propellerStem2; + file "propellerStem2.obj"; regions { ascii @@ -100,10 +100,10 @@ geometry } } } - propellerStem3.obj + propellerStem3 { type triSurfaceMesh; - name propellerStem3; + file "propellerStem3.obj"; regions { ascii diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict index 8911dc9ed..9c97cd6df 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict @@ -28,10 +28,10 @@ addLayers true; // - to 'snap' the mesh boundary to the surface geometry { - wing_5degrees.obj + wing { type triSurfaceMesh; - name wing; + file "wing_5degrees.obj"; } refinementBox diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict index e9285153d..6598de9fb 100644 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict @@ -28,10 +28,10 @@ addLayers false; // - to 'snap' the mesh boundary to the surface geometry { - motorBike.obj + motorBike { type triSurfaceMesh; - name motorBike; + file "motorBike.obj"; } // Analytical shape; cylinder, sphere diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict index 326b9cd73..6a2b0357a 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict @@ -28,10 +28,10 @@ addLayers true; // - to 'snap' the mesh boundary to the surface geometry { - motorBike.obj + motorBike { type triSurfaceMesh; - name motorBike; + file "motorBike.obj"; } refinementBox diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict index 2e38dda77..292391853 100644 --- a/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict @@ -22,10 +22,10 @@ addLayers off; geometry { - fixed.obj + fixed { type triSurfaceMesh; - name fixed; + file "fixed.obj"; regions { patch0 { name slipWall; } @@ -33,10 +33,10 @@ geometry patch2 { name inlet; } } } - rotatingZone.obj + rotatingZone { type triSurfaceMesh; - name rotatingZone; + file "rotatingZone.obj"; } }; diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict index b882f821e..d93e0ad60 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict @@ -43,10 +43,10 @@ geometry max (581771 4785671 1079); } - terrain.stl + terrain { type triSurfaceMesh; - name terrain; + file "terrain.stl"; } }; diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict index 42b798b18..4dee194f2 100644 --- a/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict @@ -22,10 +22,10 @@ addLayers off; geometry { - buildings.obj + buildings { type triSurfaceMesh; - name buildings; + file "buildings.obj"; } refinementBox diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict index 59372f732..0edc67d7c 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict +++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict @@ -29,10 +29,10 @@ addLayers false; // - to 'snap' the mesh boundary to the surface geometry { - cyclone.stl + walls { type triSurfaceMesh; - name walls; + file "cyclone.stl"; } }; diff --git a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict index 4ff7febbc..775ae5855 100644 --- a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict +++ b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict @@ -28,10 +28,10 @@ addLayers true; // - to 'snap' the mesh boundary to the surface geometry { -// motorBike.obj +// motorBike // { // type triSurfaceMesh; -// name motorBike; +// file "motorBike.obj"; // } // // refinementBox diff --git a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict index beffcbc2b..61b65c8f8 100644 --- a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict +++ b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict @@ -29,10 +29,10 @@ addLayers false; // - to 'snap' the mesh boundary to the surface geometry { - flange.stl + flange { type triSurfaceMesh; - name flange; + file "flange.stl"; } //- Refine a bit extra around the small centre hole diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/snappyHexMeshDict index 8d3ead9c5..414f6c551 100644 --- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/snappyHexMeshDict +++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/snappyHexMeshDict @@ -29,10 +29,10 @@ addLayers true; // - to 'snap' the mesh boundary to the surface geometry { - DTC-scaled.stl + hull { type triSurfaceMesh; - name hull; + file "DTC-scaled.stl"; patchInfo { diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHullWave/system/snappyHexMeshDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHullWave/system/snappyHexMeshDict index 52895707e..d279f7c1b 100644 --- a/tutorials/multiphase/interDyMFoam/RAS/DTCHullWave/system/snappyHexMeshDict +++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHullWave/system/snappyHexMeshDict @@ -29,10 +29,10 @@ addLayers true; // - to 'snap' the mesh boundary to the surface geometry { - DTC-scaled.stl + hull { type triSurfaceMesh; - name hull; + file "DTC-scaled.stl"; patchInfo { diff --git a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict index 028374ad1..9db0b1f74 100644 --- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict +++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict @@ -21,10 +21,11 @@ addLayers false; geometry { - vessel.stl + vessel { - name vessel; type triSurfaceMesh; + file "vessel.stl"; + regions { vessel @@ -34,10 +35,11 @@ geometry } } - gasInlet.stl + gasInlet { - name gasInlet; type triSurfaceMesh; + file "gasInlet.stl"; + regions { gasInlet @@ -47,10 +49,11 @@ geometry } } - outlet.stl + outlet { - name outlet; type triSurfaceMesh; + file "outlet.stl"; + regions { outlet @@ -60,10 +63,11 @@ geometry } } - shaftRotating.stl + shaftRotating { - name shaftRotating; type triSurfaceMesh; + file "shaftRotating.stl"; + regions { shaftRotating @@ -73,10 +77,11 @@ geometry } } - shaft.stl + shaft { - name shaft; type triSurfaceMesh; + file "shaft.stl"; + regions { shaft @@ -86,10 +91,11 @@ geometry } } - sparger.stl + sparger { - name sparger; type triSurfaceMesh; + file "sparger.stl"; + regions { sparger @@ -99,10 +105,11 @@ geometry } } - stirrer.stl + stirrer { - name stirrer; type triSurfaceMesh; + file "stirrer.stl"; + regions { stirrer @@ -112,10 +119,11 @@ geometry } } - baffles.stl + baffles { - name baffles; type triSurfaceMesh; + file "baffles.stl"; + regions { baffles @@ -125,10 +133,10 @@ geometry } } - rotating.stl + rotating { - name rotating; type triSurfaceMesh; + file "rotating.stl"; } }; diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingCylinder/system/snappyHexMeshDict b/tutorials/multiphase/interDyMFoam/laminar/sloshingCylinder/system/snappyHexMeshDict index 767ac9285..6b2094ce1 100644 --- a/tutorials/multiphase/interDyMFoam/laminar/sloshingCylinder/system/snappyHexMeshDict +++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingCylinder/system/snappyHexMeshDict @@ -22,10 +22,10 @@ addLayers off; geometry { - sloshingCylinder.obj + sloshingCylinder { type closedTriSurfaceMesh; - name sloshingCylinder; + file "sloshingCylinder.obj"; } }; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict index 8d3ead9c5..414f6c551 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict @@ -29,10 +29,10 @@ addLayers true; // - to 'snap' the mesh boundary to the surface geometry { - DTC-scaled.stl + hull { type triSurfaceMesh; - name hull; + file "DTC-scaled.stl"; patchInfo { diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict index a6122210a..8474b5cf2 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict @@ -28,10 +28,10 @@ addLayers false; // - to 'snap' the mesh boundary to the surface geometry { - innerCylinder.obj + innerCylinder { type triSurfaceMesh; - name innerCylinder; + file "innerCylinder.obj"; regions { ascii @@ -40,10 +40,10 @@ geometry } } } - innerCylinderSmall.obj + innerCylinderSmall { type triSurfaceMesh; - name innerCylinderSmall; + file "innerCylinderSmall.obj"; regions { ascii @@ -52,10 +52,10 @@ geometry } } } - outerCylinder.obj + outerCylinder { type triSurfaceMesh; - name outerCylinder; + file "outerCylinder.obj"; regions { ascii @@ -64,10 +64,10 @@ geometry } } } - propellerTip.obj.gz + propellerTip { type triSurfaceMesh; - name propellerTip; + file "propellerTip.obj"; regions { ascii @@ -76,10 +76,10 @@ geometry } } } - propellerStem1.obj + propellerStem1 { type triSurfaceMesh; - name propellerStem1; + file "propellerStem1.obj"; regions { ascii @@ -88,10 +88,10 @@ geometry } } } - propellerStem2.obj + propellerStem2 { type triSurfaceMesh; - name propellerStem2; + file "propellerStem2.obj"; regions { ascii @@ -100,10 +100,10 @@ geometry } } } - propellerStem3.obj + propellerStem3 { type triSurfaceMesh; - name propellerStem3; + file "propellerStem3.obj"; regions { ascii @@ -114,8 +114,6 @@ geometry } }; - - // Settings for the castellatedMesh generation. castellatedMeshControls { diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict index 5190eadcd..18eeae359 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict @@ -29,10 +29,10 @@ addLayers true; // - to 'snap' the mesh boundary to the surface geometry { - bullet.stl + bullet { type triSurfaceMesh; - name bullet; + file "bullet.stl"; regions {