From 39612c6d5f16ac4010c3d7ac6968513b6f7c366a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 9 Dec 2021 11:22:16 +0100
Subject: [PATCH] BUG: blockMesh verbosity set too late
- sort out the command-line vs dictionary vs default logic *before*
constructing any other members since they too are influenced by the
verbosity.
---
src/mesh/blockMesh/blockMesh/blockMesh.C | 33 ++++++++++++++----------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.C b/src/mesh/blockMesh/blockMesh/blockMesh.C
index dc7ea581536..6894f89033a 100644
--- a/src/mesh/blockMesh/blockMesh/blockMesh.C
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.C
@@ -53,6 +53,25 @@ Foam::blockMesh::strategyNames_
namespace Foam
{
+// Define/refine the verbosity level
+// Command-line options have precedence over dictionary setting
+static int getVerbosity(const dictionary& dict, int verbosity)
+{
+ if (verbosity < 0)
+ {
+ // Forced as 'off'
+ verbosity = 0;
+ }
+ else if (!verbosity)
+ {
+ // Not specified: use dictionary value or static default
+ verbosity = dict.getOrDefault("verbose", blockMesh::verboseOutput);
+ }
+
+ return verbosity;
+}
+
+
// Process dictionary entry with single scalar or vector quantity
// - return 0 if scaling is not needed. Eg, Not found or is unity
// - return 1 for uniform scaling
@@ -235,7 +254,7 @@ Foam::blockMesh::blockMesh
)
:
meshDict_(dict),
- verbose_(verbosity),
+ verbose_(getVerbosity(dict, verbosity)),
checkFaceCorrespondence_
(
meshDict_.getOrDefault("checkFaceCorrespondence", true)
@@ -269,18 +288,6 @@ Foam::blockMesh::blockMesh
transform_(),
topologyPtr_(createTopology(meshDict_, regionName))
{
- // Command-line options have precedence over dictionary setting
-
- if (verbose_ < 0)
- {
- // Forced as 'off'
- verbose_ = 0;
- }
- else if (!verbose_)
- {
- verbose_ = meshDict_.getOrDefault("verbose", verboseOutput);
- }
-
if (mergeStrategy_ == mergeStrategy::DEFAULT_MERGE)
{
strategyNames_.readIfPresent("mergeType", meshDict_, mergeStrategy_);
--
GitLab