From 1c85c649849529983253cd8604c6a1e362c63902 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 24 Jan 2019 09:40:12 +0100 Subject: [PATCH] STYLE: clarify input requirements for extrusion models (#1181) - changed the sectorCoeffs keyword to 'point' from 'axisPt' for more similarity with other dictionaries. Continue to accept 'axisPt' for compatibility. --- .../extrude/extrudeMesh/extrudeMeshDict | 7 ++- .../extrudeToRegionMeshDict | 9 ++-- .../extrude2DMesh/extrude2DMeshDict | 6 ++- .../foamyMesh/foamyQuadMesh/foamyQuadMeshDict | 6 +-- etc/controlDict | 1 + .../axisymmetricJet/system/extrudeMeshDict | 6 +-- .../extrudeModel/cyclicSector/cyclicSector.C | 6 --- .../extrudeModel/cyclicSector/cyclicSector.H | 7 +-- .../extrudeModel/extrudeModel/extrudeModel.C | 13 ++--- .../extrudeModel/extrudeModel/extrudeModel.H | 26 ++++++---- .../linearDirection/linearDirection.C | 10 +--- .../linearDirection/linearDirection.H | 16 +++++-- .../extrudeModel/linearNormal/linearNormal.C | 47 ++++++++----------- .../extrudeModel/linearNormal/linearNormal.H | 16 +++++-- .../extrudeModel/linearRadial/linearRadial.C | 7 +-- .../extrudeModel/linearRadial/linearRadial.H | 17 +++++-- .../offsetSurface/offsetSurface.C | 31 ++++++------ .../offsetSurface/offsetSurface.H | 32 ++++++++----- .../planeExtrusion/planeExtrusion.C | 6 --- .../planeExtrusion/planeExtrusion.H | 8 ++-- src/mesh/extrudeModel/radial/radial.C | 6 --- src/mesh/extrudeModel/radial/radial.H | 13 +++-- src/mesh/extrudeModel/sector/sector.C | 19 ++------ src/mesh/extrudeModel/sector/sector.H | 27 ++++++++--- .../extrudeModel/sigmaRadial/sigmaRadial.C | 6 --- .../extrudeModel/sigmaRadial/sigmaRadial.H | 11 ++++- src/mesh/extrudeModel/wedge/wedge.C | 6 --- src/mesh/extrudeModel/wedge/wedge.H | 8 ++-- .../cylinderMesh/system/extrudeMeshDict | 9 ++-- .../cylinderMesh/system/extrudeMeshDict | 9 ++-- .../cylinderMesh/system/extrudeMeshDict | 9 ++-- .../OpenCFD/system/extrude2DMeshDict | 9 ++-- .../jaggedBoundary/system/extrude2DMeshDict | 9 ++-- .../square/system/extrude2DMeshDict | 12 ++--- .../climbingRod/system/extrudeMeshDict | 13 ++--- .../RAS/waterChannel/system/extrudeMeshDict | 1 - .../RAS/waterChannel/system/extrudeMeshDict.1 | 1 - .../RAS/waterChannel/system/extrudeMeshDict.2 | 1 - 38 files changed, 224 insertions(+), 222 deletions(-) diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict index 7ae794a6b9..3f28a53731 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict +++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict @@ -71,9 +71,9 @@ nLayers 10; expansionRatio 1.0; -sectorCoeffs +sectorCoeffs //<- Also used for wedge { - axisPt (0 0.1 -0.05); + point (0 0.1 -0.05); axis (-1 0 0); angle 360; // For nLayers=1 assume symmetry so angle/2 on each side } @@ -92,8 +92,7 @@ linearDirectionCoeffs linearRadialCoeffs { R 0.1; - // Optional inner radius - Rsurface 0.01; + Rsurface 0.01; // Optional inner radius } radialCoeffs diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict index b33f3b87f2..1ee3248583 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict +++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict @@ -85,9 +85,9 @@ linearNormalCoeffs thickness 0.05; } -wedgeCoeffs +sectorCoeffs //<- Also used for wedge { - axisPt (0 0.1 -0.05); + point (0 0.1 -0.05); axis (-1 0 0); angle 360; // For nLayers=1 assume symmetry so angle/2 on each side } @@ -100,9 +100,8 @@ linearDirectionCoeffs linearRadialCoeffs { - R 0.1; - // Optional inner radius - Rsurface 0.01; + R 0.1; + Rsurface 0.01; // Optional inner radius } radialCoeffs diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshDict b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshDict index ce30c3e22b..05c9005223 100644 --- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshDict +++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshDict @@ -32,9 +32,11 @@ linearDirectionCoeffs thickness 0.1; } -wedgeCoeffs +sectorCoeffs //<- Also used for wedge { - axisPt (0 0 0); + point (0 0 0); axis (1 0 0); angle 10; } + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMeshDict b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMeshDict index f58b1f6e38..1c4ceb5af9 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMeshDict +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMeshDict @@ -175,14 +175,12 @@ extrusion thickness 0.1; } - wedgeCoeffs + sectorCoeffs //<- Also used for wedge { - axisPt (0 0 0); + point (0 0 0); axis (1 0 0); angle 10; } - - thickness 0.1; } diff --git a/etc/controlDict b/etc/controlDict index 5c65b06a66..6ccf2ef39c 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -517,6 +517,7 @@ DebugSwitches exponential 0; extendedLeastSquares 0; extendedLeastSquaresVectors 0; + extrudeModel 1; face 0; faceAreaPair 0; faceCoupleInfo 0; diff --git a/etc/templates/axisymmetricJet/system/extrudeMeshDict b/etc/templates/axisymmetricJet/system/extrudeMeshDict index 368750d8d1..4b43a195ce 100644 --- a/etc/templates/axisymmetricJet/system/extrudeMeshDict +++ b/etc/templates/axisymmetricJet/system/extrudeMeshDict @@ -24,9 +24,9 @@ extrudeModel wedge; sectorCoeffs { - axisPt (0 0 0); - axis (1 0 0); - angle 1; + point (0 0 0); + axis (1 0 0); + angle 1; } flipNormals false; diff --git a/src/mesh/extrudeModel/cyclicSector/cyclicSector.C b/src/mesh/extrudeModel/cyclicSector/cyclicSector.C index 2d2e65b9a3..82e0526bd7 100644 --- a/src/mesh/extrudeModel/cyclicSector/cyclicSector.C +++ b/src/mesh/extrudeModel/cyclicSector/cyclicSector.C @@ -48,12 +48,6 @@ cyclicSector::cyclicSector(const dictionary& dict) {} -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -cyclicSector::~cyclicSector() -{} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace extrudeModels diff --git a/src/mesh/extrudeModel/cyclicSector/cyclicSector.H b/src/mesh/extrudeModel/cyclicSector/cyclicSector.H index 86d99e1385..3f3c0854cc 100644 --- a/src/mesh/extrudeModel/cyclicSector/cyclicSector.H +++ b/src/mesh/extrudeModel/cyclicSector/cyclicSector.H @@ -27,6 +27,8 @@ Class Description Extrudes a sector. + Uses the sectorCoeffs dictionary. + See also Foam::extrudeModels::sector @@ -52,7 +54,6 @@ class cyclicSector : public sector { - public: //- Runtime type information @@ -61,11 +62,11 @@ public: // Constructors //- Construct from dictionary - cyclicSector(const dictionary& dict); + explicit cyclicSector(const dictionary& dict); //- Destructor - virtual ~cyclicSector(); + virtual ~cyclicSector() = default; }; diff --git a/src/mesh/extrudeModel/extrudeModel/extrudeModel.C b/src/mesh/extrudeModel/extrudeModel/extrudeModel.C index cb041871f6..98eaeae338 100644 --- a/src/mesh/extrudeModel/extrudeModel/extrudeModel.C +++ b/src/mesh/extrudeModel/extrudeModel/extrudeModel.C @@ -43,15 +43,12 @@ Foam::extrudeModel::extrudeModel : nLayers_(dict.lookupOrDefault