From 50017eeb802bf336fbbd64e5fccc50458d7a0e78 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <https://cfd.direct>
Date: Thu, 13 Jul 2023 16:20:24 +0100
Subject: [PATCH] snappyHexMeshConfig: removed resizing of bounds specified
 with '-bounds' option

---
 .../blockMeshCartesianConfiguration.C           | 17 ++++++++++++-----
 .../blockMeshCartesianConfiguration.H           |  3 ++-
 .../blockMeshCylindricalConfiguration.C         | 13 +++++++++++++
 .../blockMeshCylindricalConfiguration.H         |  3 +++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCartesianConfiguration.C b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCartesianConfiguration.C
index cc72e277da..941a655262 100644
--- a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCartesianConfiguration.C
+++ b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCartesianConfiguration.C
@@ -37,20 +37,26 @@ const Foam::List<Foam::word> Foam::blockMeshCartesianConfiguration::patches =
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::blockMeshCartesianConfiguration::calcBlockMeshDict()
+void Foam::blockMeshCartesianConfiguration::calcBlockMeshDict
+(
+    const bool& boundsOpt
+)
 {
     Info<< "Surface bounding box is " << bb_ << endl;
 
-    // Round the bounding box
+    // Round the bounding box if it is not specified with '-bounds' option
     const scalar roundFactor = roundingScale(bb_.minDim());
-    roundBoundingBox(bb_, roundFactor);
+    if (!boundsOpt)
+    {
+        roundBoundingBox(bb_, roundFactor);
+    }
 
     // Set nCells with the lowest number of cells within the range 10-20
     if (nCells_ == Vector<label>::zero)
     {
         nCells_ = Vector<label>(bb_.span()/roundFactor);
 
-        if (!isEven(nCells_) && cmptMin(nCells_) > 20)
+        if (!isEven(nCells_) && cmptMin(nCells_) > 20 && !boundsOpt)
         {
             roundBoundingBox(bb_, 2*roundFactor);
             nCells_ = Vector<label>(bb_.span()/roundFactor);
@@ -258,6 +264,7 @@ Foam::blockMeshCartesianConfiguration::blockMeshCartesianConfiguration
     const fileName& dir,
     const Time& time,
     const meshingSurfaceList& surfaces,
+    const bool& boundsOpt,
     const Vector<label>& nCells,
     const label refineFactor,
     const HashTable<Pair<word>>& patchOpts,
@@ -269,7 +276,7 @@ Foam::blockMeshCartesianConfiguration::blockMeshCartesianConfiguration
     refineFactor_(refineFactor),
     clearBoundary_(clearBoundary)
 {
-    calcBlockMeshDict();
+    calcBlockMeshDict(boundsOpt);
 }
 
 
diff --git a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCartesianConfiguration.H b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCartesianConfiguration.H
index 4bd2487107..9595b35fa9 100644
--- a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCartesianConfiguration.H
+++ b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCartesianConfiguration.H
@@ -67,7 +67,7 @@ class blockMeshCartesianConfiguration
     // Private Member Functions
 
         //- Calculate the parameters for the blockMeshDict file
-        void calcBlockMeshDict();
+        void calcBlockMeshDict(const bool& boundsOpt);
 
         //- Write backgroundMesh sub-dictionary
         void writeBackgroundMesh();
@@ -116,6 +116,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/blockMeshCylindricalConfiguration.C b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C
index 74eef21f8e..b22f620672 100644
--- a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C
+++ b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.C
@@ -48,6 +48,11 @@ void Foam::blockMeshCylindricalConfiguration::bbInflate
     bb.max() = cmptMultiply(s, bb.max());
 }
 
+bool Foam::blockMeshCylindricalConfiguration::isBoundBoxOnZaxis()
+{
+    const vector bbMidNorm = bb_.midpoint()/bb_.mag();
+    return mag(bbMidNorm.x()) < rootSmall && mag(bbMidNorm.y()) < rootSmall;
+}
 
 void Foam::blockMeshCylindricalConfiguration::calcBlockMeshDict()
 {
@@ -406,6 +411,14 @@ Foam::blockMeshCylindricalConfiguration::blockMeshCylindricalConfiguration
     refineFactor_(refineFactor),
     clearBoundary_(clearBoundary)
 {
+    if (!isBoundBoxOnZaxis())
+    {
+        FatalErrorInFunction
+            << "Attempting to create a cylindrical background mesh"
+            << nl << "but the geometry bounds are not aligned with the z-axis."
+            << exit(FatalError);
+    }
+
     if (rzbb_.volume() == 0)
     {
         FatalErrorInFunction
diff --git a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.H b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.H
index 6abe78e2d9..bf299aecb5 100644
--- a/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.H
+++ b/applications/utilities/preProcessing/snappyHexMeshConfig/blockMeshCylindricalConfiguration.H
@@ -77,6 +77,9 @@ class blockMeshCylindricalConfiguration
         //- Inflate a bounding box by a scaling vector
         void bbInflate(boundBox& bb, const vector& s);
 
+        //- Are the geometry bounds aligned with the z-axis
+        bool isBoundBoxOnZaxis();
+
         //- Calculate the parameters for the blockMeshDict file
         void calcBlockMeshDict();