diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index e2860796dc..6e417abc1e 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -882,7 +882,7 @@ int main(int argc, char *argv[]) autoPtr surfacesPtr; - Info<< "Reading refinement surfaces." << endl; + Info<< "Reading refinement surfaces..." << endl; if (surfaceSimplify) { @@ -938,7 +938,9 @@ int main(int argc, char *argv[]) new refinementSurfaces ( allGeometry, - refineDict.subDict("refinementSurfaces"), + refineDict.found("refinementSurfaces") + ? refineDict.subDict("refinementSurfaces") + : dictionary::null, refineDict.lookupOrDefault("gapLevelIncrement", 0) ) ); @@ -1002,18 +1004,20 @@ int main(int argc, char *argv[]) // Read refinement shells // ~~~~~~~~~~~~~~~~~~~~~~ - Info<< "Reading refinement shells." << endl; + Info<< "Reading refinement regions..." << endl; shellSurfaces shells ( allGeometry, - refineDict.subDict("refinementRegions") + refineDict.found("refinementRegions") + ? refineDict.subDict("refinementRegions") + : dictionary::null ); - Info<< "Read refinement shells in = " + Info<< "Read refinement regions in = " << mesh.time().cpuTimeIncrement() << " s" << nl << endl; Info<< "Setting refinement level of surface to be consistent" - << " with shells." << endl; + << " with shells.." << endl; surfaces.setMinLevelFields(shells); Info<< "Checked shell refinement in = " << mesh.time().cpuTimeIncrement() << " s" << nl << endl; @@ -1022,11 +1026,13 @@ int main(int argc, char *argv[]) // Read feature meshes // ~~~~~~~~~~~~~~~~~~~ - Info<< "Reading features." << endl; + Info<< "Reading features..." << endl; refinementFeatures features ( mesh, - refineDict.lookup("features") + refineDict.found("features") + ? refineDict.lookup("features") + : PtrList() ); Info<< "Read features in = " << mesh.time().cpuTimeIncrement() << " s" << nl << endl; diff --git a/etc/caseDicts/annotated/snappyHexMeshDict b/etc/caseDicts/annotated/snappyHexMeshDict index 598cff8a64..f2ff64ee08 100644 --- a/etc/caseDicts/annotated/snappyHexMeshDict +++ b/etc/caseDicts/annotated/snappyHexMeshDict @@ -188,7 +188,7 @@ castellatedMeshControls // faceZone sphere; // cellZone sphere; - // cellZoneInside inside; // outside/insidePoint + // mode inside; // outside/insidePoint //- Optional specification of what to do with faceZone faces: // internal : keep them as internal faces (default) diff --git a/etc/templates/closedVolumeRotating/system/snappyHexMeshDict b/etc/templates/closedVolumeRotating/system/snappyHexMeshDict index 2c02254534..91ba4c375a 100644 --- a/etc/templates/closedVolumeRotating/system/snappyHexMeshDict +++ b/etc/templates/closedVolumeRotating/system/snappyHexMeshDict @@ -65,7 +65,7 @@ castellatedMeshControls level (2 2); faceZone rotatingZone; cellZone rotatingZone; - cellZoneInside inside; + mode inside; } } diff --git a/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict b/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict index 7ac8778f60..4e307e058b 100644 --- a/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict +++ b/etc/templates/inflowOutflowRotating/system/snappyHexMeshDict @@ -94,7 +94,7 @@ castellatedMeshControls level (2 2); faceZone rotatingZone; cellZone rotatingZone; - cellZoneInside inside; + mode inside; } } diff --git a/etc/templates/singleFluidCHT/system/snappyHexMeshDict b/etc/templates/singleFluidCHT/system/snappyHexMeshDict index 61189b7627..764cd03a8d 100644 --- a/etc/templates/singleFluidCHT/system/snappyHexMeshDict +++ b/etc/templates/singleFluidCHT/system/snappyHexMeshDict @@ -55,7 +55,7 @@ castellatedMeshControls level (2 2); faceZone solid; cellZone solid; - cellZoneInside inside; + mode inside; } CAD diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict b/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict index 8139e26e2d..51ff2b0a8c 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict +++ b/tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict @@ -65,8 +65,6 @@ geometry castellatedMeshControls { - features (); - refinementSurfaces { boundaries @@ -91,7 +89,7 @@ castellatedMeshControls { type patch; inGroups (inlet); - } + } } outletSleeve { @@ -133,16 +131,14 @@ castellatedMeshControls } membrane { - level (0 0); - cellZone pipe; - faceZone membrane; - cellZoneInside insidePoint; + level (0 0); + cellZone pipe; + faceZone membrane; + mode insidePoint; insidePoint (0 0 0); } } - refinementRegions {} - locationInMesh (0 0 0); } diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict index d94b55dd94..b6ad7f2bca 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict @@ -114,7 +114,7 @@ castellatedMeshControls level (2 2); faceZone rotatingZone; cellZone rotatingZone; - cellZoneInside inside; + mode inside; } innerInlet @@ -204,10 +204,6 @@ castellatedMeshControls resolveFeatureAngle 30; - refinementRegions - { - } - locationInMesh (0.035 0.043 0.017); allowFreeStandingZoneFaces true; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict index 8e0a59aee7..43b0c98a77 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/system/snappyHexMeshDict @@ -189,24 +189,6 @@ castellatedMeshControls resolveFeatureAngle 60; - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // descending order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - - refinementRegions - { - } - - // Mesh selection // ~~~~~~~~~~~~~~ diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/snappyHexMeshDict index 31a21c6ef4..a848df8f19 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/snappyHexMeshDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/system/snappyHexMeshDict @@ -79,7 +79,7 @@ castellatedMeshControls level (1 1); faceZone fluidToMetal; cellZone metal; - cellZoneInside insidePoint; + mode insidePoint; insidePoint (0.025 0.0025 0.075); } @@ -88,16 +88,13 @@ castellatedMeshControls level (1 1); faceZone metalToHeater; cellZone heater; - cellZoneInside insidePoint; + mode insidePoint; insidePoint (0.025 -0.005 0.075); } } nCellsBetweenLevels 1; - refinementRegions - {} - locationInMesh (0.025 0.025 0.075); } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/snappyHexMeshDict.orig b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/snappyHexMeshDict.orig index 13dabbf6e3..1329f79a14 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/snappyHexMeshDict.orig +++ b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/system/snappyHexMeshDict.orig @@ -106,21 +106,17 @@ castellatedMeshControls level (1 1); faceZone shell_to_solid; cellZone shell; - cellZoneInside inside; + mode inside; } tube_to_solid { level (1 1); faceZone tube_to_solid; cellZone tube; - cellZoneInside inside; + mode inside; } } - refinementRegions - { - } - locationInMesh (0 0.008 0.015); nCellsBetweenLevels 2; diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict index 5c66759a43..ef3f440ee0 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict @@ -170,7 +170,7 @@ castellatedMeshControls level (4 4); cellZone innerCylinder; faceZone innerCylinder; - cellZoneInside inside; + mode inside; } outerCylinder { diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces index e7d834476a..0bb96993a8 100644 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/meshDict.conformationSurfaces @@ -78,7 +78,7 @@ porosity meshableSide both; faceZone porosity; cellZone porosity; - cellZoneInside inside; + mode inside; } diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict index b2cfa353c4..3ab0b71bb7 100644 --- a/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict @@ -82,7 +82,7 @@ castellatedMeshControls level (4 4); faceZone rotatingZone; cellZone rotatingZone; - cellZoneInside inside; + mode inside; } } diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict index 4c727afd09..0e645db405 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict @@ -145,7 +145,7 @@ castellatedMeshControls // (inside / outside / specified insidePoint) // faceZone sphere; // cellZone sphere; - // cellZoneInside inside; // outside/insidePoint + // mode inside; // outside/insidePoint } } diff --git a/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict b/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict index d0b9e8c65a..3767db861f 100644 --- a/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict +++ b/tutorials/lagrangian/denseParticleFoam/cyclone/system/snappyHexMeshDict @@ -108,25 +108,6 @@ castellatedMeshControls // Resolve sharp angles resolveFeatureAngle 30; - - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // descending order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - - refinementRegions - { - } - - // Mesh selection // ~~~~~~~~~~~~~~ diff --git a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict index e0e393b45e..1fb90adab0 100644 --- a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict +++ b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict @@ -128,29 +128,6 @@ castellatedMeshControls resolveFeatureAngle 30; - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // descending order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - - refinementRegions - { -// refinementBox -// { -// mode inside; -// level 4; -// } - } - - // Mesh selection // ~~~~~~~~~~~~~~ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict index 610d9ea77f..f7e4baac5b 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict @@ -111,24 +111,6 @@ castellatedMeshControls resolveFeatureAngle 45; - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // descending order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - - refinementRegions - { - } - - // Mesh selection // ~~~~~~~~~~~~~~ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict index 610d9ea77f..f7e4baac5b 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict @@ -111,24 +111,6 @@ castellatedMeshControls resolveFeatureAngle 45; - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // descending order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - - refinementRegions - { - } - - // Mesh selection // ~~~~~~~~~~~~~~ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/snappyHexMeshDict index 610d9ea77f..f7e4baac5b 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/snappyHexMeshDict @@ -111,24 +111,6 @@ castellatedMeshControls resolveFeatureAngle 45; - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // descending order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - - refinementRegions - { - } - - // Mesh selection // ~~~~~~~~~~~~~~ diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict index 5ef499d119..660d930898 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict @@ -319,7 +319,7 @@ castellatedMeshControls level (1 2); cellZone rotating; faceZone rotating; - cellZoneInside insidePoint; + mode insidePoint; insidePoint (0 0.1 0.5); } } @@ -330,23 +330,6 @@ castellatedMeshControls resolveFeatureAngle 30; - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // increasing order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - - refinementRegions - { - } - // Mesh selection // ~~~~~~~~~~~~~~ diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.1 b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.1 index 7fab38a0d9..35e4f9f170 100644 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.1 +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/snappyHexMeshDict.1 @@ -111,24 +111,6 @@ castellatedMeshControls resolveFeatureAngle 45; - // Region-wise refinement - // ~~~~~~~~~~~~~~~~~~~~~~ - - // Specifies refinement level for cells in relation to a surface. One of - // three modes - // - distance. 'levels' specifies per distance to the surface the - // wanted refinement level. The distances need to be specified in - // descending order. - // - inside. 'levels' is only one entry and only the level is used. All - // cells inside the surface get refined up to the level. The surface - // needs to be closed for this to be possible. - // - outside. Same but cells outside. - - refinementRegions - { - } - - // Mesh selection // ~~~~~~~~~~~~~~ diff --git a/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict index 5c66759a43..ef3f440ee0 100644 --- a/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/propeller/system/snappyHexMeshDict @@ -170,7 +170,7 @@ castellatedMeshControls level (4 4); cellZone innerCylinder; faceZone innerCylinder; - cellZoneInside inside; + mode inside; } outerCylinder { diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict index 948fcaade4..d8cc7d8346 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict @@ -31,10 +31,6 @@ geometry castellatedMeshControls { - features - ( - ); - refinementSurfaces { sloshingCylinder