From f0fb0d426363a9ee980f6d5f44faad1d3402be89 Mon Sep 17 00:00:00 2001
From: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
Date: Mon, 16 Aug 2021 14:29:51 +0100
Subject: [PATCH] ENH: variable-specific debug flags (finiteArea solvers)

---
 src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C  | 11 +++++++++--
 .../faMatrices/faScalarMatrix/faScalarMatrix.C      | 13 ++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C b/src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C
index 43e6f00183..63f11d4f81 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrixSolve.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,6 +60,13 @@ Foam::SolverPerformance<Type> Foam::faMatrix<Type>::solve
         << "solving faMatrix<Type>"
         << endl;
 
+    const int logLevel =
+        solverControls.getOrDefault<int>
+        (
+            "log",
+            SolverPerformance<Type>::debug
+        );
+
     auto& psi =
         const_cast<GeometricField<Type, faPatchField, areaMesh>&>(psi_);
 
@@ -141,7 +148,7 @@ Foam::SolverPerformance<Type> Foam::faMatrix<Type>::solve
             solverControls
         )->solve(psiCmpt, sourceCmpt, cmpt);
 
-        if (SolverPerformance<Type>::debug)
+        if (logLevel)
         {
             solverPerf.print(Info);
         }
diff --git a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
index 21ad32e6f3..4fd605449d 100644
--- a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
+++ b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,7 +62,14 @@ Foam::solverPerformance Foam::faMatrix<Foam::scalar>::solve
         << "solving faMatrix<scalar>"
         << endl;
 
-    GeometricField<scalar, faPatchField, areaMesh>& psi =
+    const int logLevel =
+        solverControls.getOrDefault<int>
+        (
+            "log",
+            solverPerformance::debug
+        );
+
+    auto& psi =
         const_cast<GeometricField<scalar, faPatchField, areaMesh>&>(psi_);
 
     scalarField saveDiag(diag());
@@ -82,7 +89,7 @@ Foam::solverPerformance Foam::faMatrix<Foam::scalar>::solve
         solverControls
     )->solve(psi.ref(), totalSource);
 
-    if (solverPerformance::debug)
+    if (logLevel)
     {
         solverPerf.print(Info);
     }