From 712f49758af8f4da90092c363657e6936341b93e Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@esi-group.com> Date: Wed, 18 Jul 2018 16:47:34 +0200 Subject: [PATCH] TUT: update snappy dictionaries to use minMedialAxisAngle - canonical parameter name changed from "minMedianAxisAngle" to "minMedialAxisAngle" (DEC-2013), but was never previously reported as having changed. --- .../medialAxisMeshMover.C | 18 ++++++++++-------- .../system/snappyHexMeshDict | 2 +- .../system/snappyHexMeshDict | 2 +- .../injectorPipe/system/snappyHexMeshDict | 2 +- .../system/snappyHexMeshDict | 2 +- .../building/steady/system/snappyHexMeshDict | 2 +- .../system/snappyHexMeshDict | 2 +- .../system/snappyHexMeshDict | 2 +- .../RAS/propeller/system/snappyHexMeshDict | 2 +- .../system/snappyHexMeshDict | 2 +- .../motorBike/system/snappyHexMeshDict | 2 +- .../motorBike/system/snappyHexMeshDict | 2 +- .../turbineSiting/system/snappyHexMeshDict | 2 +- .../MPPICFoam/cyclone/system/snappyHexMeshDict | 2 +- .../foamyHexMesh/blob/system/snappyHexMeshDict | 2 +- .../flange/system/snappyHexMeshDict | 2 +- .../box_snappyHexMesh/system/snappyHexMeshDict | 2 +- .../flange/system/snappyHexMeshDict | 2 +- .../gap_detection/system/snappyHexMeshDict | 2 +- .../RAS/DTCHull/system/snappyHexMeshDict | 2 +- .../RAS/DTCHullMoving/system/snappyHexMeshDict | 2 +- .../mixerVesselAMI/system/snappyHexMeshDict | 2 +- .../RAS/motorBike/system/snappyHexMeshDict | 2 +- .../propeller/system/snappyHexMeshDict | 2 +- .../cavitatingBullet/system/snappyHexMeshDict | 2 +- .../motorBike/system/snappyHexMeshDict | 2 +- .../system/snappyHexMeshDict | 2 +- 27 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C index b2337c67bf8..094d83af79f 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C @@ -132,16 +132,18 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict) coeffDict.lookup("nSmoothSurfaceNormals") ); - //- When is medial axis - word angleKey = "minMedialAxisAngle"; - if (!coeffDict.found(angleKey)) - { - // Backwards compatibility - angleKey = "minMedianAxisAngle"; - } + // Note: parameter name changed + // "minMedianAxisAngle" -> "minMedialAxisAngle" (DEC-2013) + // but not previously reported. scalar minMedialAxisAngleCos = Foam::cos ( - degToRad(readScalar(coeffDict.lookup(angleKey))) + degToRad + ( + coeffDict.getCompat<scalar> + ( + "minMedialAxisAngle", {{ "minMedianAxisAngle", 1712 }} + ) + ) ); //- Feature angle when to stop adding layers diff --git a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict index 1522673795c..7ee7be6fd51 100644 --- a/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict +++ b/tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict @@ -313,7 +313,7 @@ addLayersControls maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict index 4567dce38bf..481baba5208 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict @@ -240,7 +240,7 @@ addLayersControls nSmoothThickness 10; maxFaceThicknessRatio 0.5; maxThicknessToMedialRatio 0.3; - minMedianAxisAngle 90; + minMedialAxisAngle 90; nBufferCellsNoExtrude 0; nLayerIter 50; } diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/snappyHexMeshDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/snappyHexMeshDict index ee84068a5c1..e69bc01881f 100644 --- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/snappyHexMeshDict +++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/snappyHexMeshDict @@ -317,7 +317,7 @@ addLayersControls maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict index 4f4b54f0c4a..38d95d7daac 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict @@ -246,7 +246,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/incompressible/lumpedPointMotion/building/steady/system/snappyHexMeshDict b/tutorials/incompressible/lumpedPointMotion/building/steady/system/snappyHexMeshDict index 69338d2558c..78ab62d71ad 100644 --- a/tutorials/incompressible/lumpedPointMotion/building/steady/system/snappyHexMeshDict +++ b/tutorials/incompressible/lumpedPointMotion/building/steady/system/snappyHexMeshDict @@ -256,7 +256,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict index c2401240803..0021be428d2 100644 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict @@ -222,7 +222,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 16x! 90 degrees corresponds to 130 in 16x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict index 4c6a78a1c1f..cef52eb167d 100644 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict @@ -212,7 +212,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 16x! 90 degrees corresponds to 130 in 16x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict index 1f6506e5b88..0c8ae38ea9a 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict @@ -382,7 +382,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict index d4d9f8dda02..2fbf3e6a713 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict @@ -235,7 +235,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 16x! 90 degrees corresponds to 130 in 16x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict index 20d77742f9e..2ee707f7196 100644 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict @@ -247,7 +247,7 @@ addLayersControls maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict index 3d210d69c24..9df82a648c1 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict @@ -276,7 +276,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict index 50a584a8f47..8f8c1c0f374 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict @@ -289,7 +289,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 16x! 90 degrees corresponds to 130 in 16x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict index 59369679d0f..4f9fd89d32f 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict +++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict @@ -248,7 +248,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict index 6f11249aca8..d8a420f676a 100644 --- a/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict +++ b/tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict @@ -262,7 +262,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict index 3acd722ebf6..ce032aa653a 100644 --- a/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict +++ b/tutorials/mesh/foamyHexMesh/flange/system/snappyHexMeshDict @@ -254,7 +254,7 @@ addLayersControls maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict index 54b1d5eb0ca..8e27db89d4b 100644 --- a/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict +++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict @@ -292,7 +292,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict index 15b632ae687..fbddfc06e6b 100644 --- a/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict +++ b/tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict @@ -257,7 +257,7 @@ addLayersControls maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict index ff6216ee835..89ee28e1add 100644 --- a/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict +++ b/tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict @@ -257,7 +257,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 16x! 90 degrees corresponds to 130 in 16x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict index 54a6b77baf5..907b412b368 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict @@ -240,7 +240,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict index 9b3de4f0b70..8077a1c9dd0 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict @@ -249,7 +249,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict index 01ab19aaf6a..3058882b373 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict @@ -464,7 +464,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict index f5651c7fad0..21128495c10 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict @@ -267,7 +267,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict index af76695cf85..0f3d907b25c 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict @@ -383,7 +383,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 in // 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict index 34ff5703354..96f64946509 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict @@ -256,7 +256,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict index 86be389d333..cb330c9854e 100644 --- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict +++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict @@ -276,7 +276,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict index dc96c7e5d7a..d3ab11bc257 100644 --- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict +++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict @@ -329,7 +329,7 @@ addLayersControls // Angle used to pick up medial axis points // Note: changed(corrected) w.r.t 1.7.x! 90 degrees corresponds to 130 // in 1.7.x. - minMedianAxisAngle 90; + minMedialAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; -- GitLab