From 860e7df50bbfd4e14d91fb1b62ca5e65dd2bd435 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Jan 2020 20:46:37 +0100
Subject: [PATCH] ENH: use DetailInfo for fileOperation I/O information

- allows suppression when the banner is suppressed
---
 bin/paraFoam                                  | 40 +++++++++----------
 .../collatedFileOperation.C                   | 26 ++++++++----
 .../masterUncollatedFileOperation.C           |  6 +--
 .../uncollatedFileOperation.C                 |  1 +
 4 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/bin/paraFoam b/bin/paraFoam
index 4f4f7c20eb..f36df1a8d1 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -153,12 +153,12 @@ then
         # - libPVFoamReader_SM = (OPENFOAM <= 1912)
 
         case "$plugin" in
-        blockReader)
+        (blockReader)
             for libName in \
                 ParaFoamBlockReader \
                 libParaFoamBlockReader \
                 libPVblockMeshReader_SM \
-                ;
+            ;
             do
                 if [ -f "$PV_PLUGIN_PATH/$libName.so" ]
                 then
@@ -166,13 +166,13 @@ then
                     break
                 fi
             done
-        ;;
-        foamReader)
+            ;;
+        (foamReader)
             for libName in \
                 ParaFoamReader \
                 libParaFoamReader \
                 libPVFoamReader_SM \
-                ;
+            ;
             do
                 if [ -f "$PV_PLUGIN_PATH/$libName.so" ]
                 then
@@ -180,7 +180,7 @@ then
                     break
                 fi
             done
-        ;;
+            ;;
         esac
 
         if [ -n "$pluginError" ]
@@ -329,22 +329,22 @@ else
     # Check existence of essential files
     warn=false
     case "$plugin" in
-        blockReader)
-            blockMeshDict=system/blockMeshDict
-            if [ -f constant/polyMesh/blockMeshDict ]
-            then
-                blockMeshDict=constant/polyMesh/blockMeshDict
-            fi
+    (blockReader)
+        blockMeshDict=system/blockMeshDict
+        if [ -f constant/polyMesh/blockMeshDict ]
+        then
+            blockMeshDict=constant/polyMesh/blockMeshDict
+        fi
 
-            hasFiles system/controlDict "$blockMeshDict" || warn=true
-            ;;
+        hasFiles system/controlDict "$blockMeshDict" || warn=true
+        ;;
 
-        foamReader)
-            hasFiles \
-                system/controlDict \
-                "$fvControls/fvSchemes" \
-                "$fvControls/fvSolution" || warn=true
-            ;;
+    (foamReader)
+        hasFiles \
+            system/controlDict \
+            "$fvControls/fvSchemes" \
+            "$fvControls/fvSolution" || warn=true
+        ;;
     esac
 
     [ "${warn:-false}" = false ] || {
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
index 1fb21959ec..234ffbc16c 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/collatedFileOperation.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -273,20 +274,23 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
 
     if (verbose)
     {
-        Info<< "I/O    : " << typeName
+        DetailInfo
+            << "I/O    : " << typeName
             << " (maxThreadFileBufferSize " << maxThreadFileBufferSize
             << ')' << endl;
 
         if (maxThreadFileBufferSize == 0)
         {
-            Info<< "         Threading not activated "
+            DetailInfo
+                << "         Threading not activated "
                    "since maxThreadFileBufferSize = 0." << nl
                 << "         Writing may run slowly for large file sizes."
                 << endl;
         }
         else
         {
-            Info<< "         Threading activated "
+            DetailInfo
+                << "         Threading activated "
                    "since maxThreadFileBufferSize > 0." << nl
                 << "         Requires large enough buffer to collect all data"
                     " or thread support " << nl
@@ -308,12 +312,15 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
             }
             Pstream::gatherList(ioRanks);
 
-            Info<< "         IO nodes:" << nl;
+            DetailInfo
+                << "         IO nodes:" << nl;
+
             for (const string& ranks : ioRanks)
             {
                 if (!ranks.empty())
                 {
-                    Info<< "             " << ranks << nl;
+                    DetailInfo
+                        << "             " << ranks << nl;
                 }
             }
         }
@@ -360,20 +367,23 @@ Foam::fileOperations::collatedFileOperation::collatedFileOperation
 
     if (verbose)
     {
-        Info<< "I/O    : " << typeName
+        DetailInfo
+            << "I/O    : " << typeName
             << " (maxThreadFileBufferSize " << maxThreadFileBufferSize
             << ')' << endl;
 
         if (maxThreadFileBufferSize == 0)
         {
-            Info<< "         Threading not activated "
+            DetailInfo
+                << "         Threading not activated "
                    "since maxThreadFileBufferSize = 0." << nl
                 << "         Writing may run slowly for large file sizes."
                 << endl;
         }
         else
         {
-            Info<< "         Threading activated "
+            DetailInfo
+                << "         Threading activated "
                    "since maxThreadFileBufferSize > 0." << nl
                 << "         Requires large enough buffer to collect all data"
                     " or thread support " << nl
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index 65ca4e950d..f9689aeece 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017-2018 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -774,7 +774,7 @@ masterUncollatedFileOperation
 
     if (verbose)
     {
-        Info
+        DetailInfo
             << "I/O    : " << typeName
             << " (maxMasterFileBufferSize " << maxMasterFileBufferSize << ')'
             << endl;
@@ -820,7 +820,7 @@ masterUncollatedFileOperation
 
     if (verbose)
     {
-        Info
+        DetailInfo
             << "I/O    : " << typeName
             << " (maxMasterFileBufferSize " << maxMasterFileBufferSize << ')'
             << endl;
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
index 4fc23e04bc..587368e7f6 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.