From a246faf1c15047ba2e50026a2d6a357750bf055f Mon Sep 17 00:00:00 2001
From: Chris Greenshields <https://cfd.direct>
Date: Sat, 27 Jul 2024 17:06:46 +0100
Subject: [PATCH] snappyHexMeshConfig: fix bounds of the background mesh
 without adjustment

when using the '-bounds' option
---
 .../blockMeshCylindricalConfiguration.C       | 29 ++++++++++++-------
 .../blockMeshCylindricalConfiguration.H       |  5 ++--
 .../snappyHexMeshConfig/snappyHexMeshConfig.C |  1 +
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C
index d080ecea90..21ac36be9f 100644
--- a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C
+++ b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C
@@ -53,7 +53,10 @@ bool Foam::blockMeshCylindricalConfiguration::isBoundBoxOnZaxis()
     return mag(bbMidNorm.x()) < rootSmall && mag(bbMidNorm.y()) < rootSmall;
 }
 
-void Foam::blockMeshCylindricalConfiguration::calcBlockMeshDict()
+void Foam::blockMeshCylindricalConfiguration::calcBlockMeshDict
+(
+    const bool& boundsOpt
+)
 {
     // Set nCells as a vector: (boxCells radialCells zCells)
     label boxCells = nCells_.x();
@@ -74,20 +77,23 @@ void Foam::blockMeshCylindricalConfiguration::calcBlockMeshDict()
 
     // Size the bounding box
     const scalar roundFactor = roundingScale(0.01*bb_.minDim());
-    const scalar expansion = 1.0/(Foam::cos(degToRad(45.0/nCells_.x())));
 
-    const vector scaling(expansion, expansion, 1);
+    if(!boundsOpt)
+    {
+        const scalar expansion = 1.0/(Foam::cos(degToRad(45.0/nCells_.x())));
 
-    // Inflate the bounding box in radial direction
-    bbInflate(bb_, scaling);
-    bbInflate(rzbb_, scaling);
+        const vector scaling(expansion, expansion, 1);
 
-    // Round the bounding box
-    roundBoundingBox(bb_, roundFactor);
-    roundBoundingBox(rzbb_, roundFactor);
+        // Inflate the bounding box in radial direction
+        bbInflate(bb_, scaling);
+        bbInflate(rzbb_, scaling);
+
+        // Round the bounding box
+        roundBoundingBox(bb_, roundFactor);
+        roundBoundingBox(rzbb_, roundFactor);
+    }
 
     radBox_ = ceil(0.3*rzbb_.max().x()/roundFactor)*roundFactor;
-
     nCells_ *= refineFactor_;
 }
 
@@ -403,6 +409,7 @@ Foam::blockMeshCylindricalConfiguration::blockMeshCylindricalConfiguration
     const fileName& dir,
     const Time& time,
     const meshingSurfaceList& surfaces,
+    const bool& boundsOpt,
     const Vector<label>& nCells,
     const label refineFactor,
     const HashTable<Pair<word>>& patchOpts,
@@ -438,7 +445,7 @@ Foam::blockMeshCylindricalConfiguration::blockMeshCylindricalConfiguration
         rzbb_.max() = factor*bb_.max();
     }
 
-    calcBlockMeshDict();
+    calcBlockMeshDict(boundsOpt);
 }
 
 
diff --git a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.H b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.H
index bf299aecb5..0a01b54e87 100644
--- a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.H
+++ b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2023 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2023-2024 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ class blockMeshCylindricalConfiguration
         bool isBoundBoxOnZaxis();
 
         //- Calculate the parameters for the blockMeshDict file
-        void calcBlockMeshDict();
+        void calcBlockMeshDict(const bool& boundsOpt);
 
         //- Write backgroundMesh sub-dictionary
         void writeBackgroundMesh();
@@ -142,6 +142,7 @@ public:
             const fileName& dir,
             const Time& time,
             const meshingSurfaceList& surfaces,
+            const bool& boundsOpt,
             const Vector<label>& nCells,
             const label refineFactor,
             const HashTable<Pair<word>>& patchOpts,
diff --git a/applications/utilities/preProcessing/snappyHexMeshConfig/snappyHexMeshConfig.C b/applications/utilities/preProcessing/snappyHexMeshConfig/snappyHexMeshConfig.C
index f4c6e6ae51..058cbf33f1 100644
--- a/applications/utilities/preProcessing/snappyHexMeshConfig/snappyHexMeshConfig.C
+++ b/applications/utilities/preProcessing/snappyHexMeshConfig/snappyHexMeshConfig.C
@@ -521,6 +521,7 @@ int main(int argc, char *argv[])
             runTime.system(),
             runTime,
             surfaces,
+            args.optionFound("bounds"),
             nCells,
             refineFactor,
             patchOpts,