From 06ae8dca141422b81f175e9b35748e77d8010603 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Sat, 23 May 2020 13:07:48 +0200 Subject: [PATCH] ENH: output Warning messages to stderr when banners are suppressed (#1713) --- src/OpenFOAM/db/error/messageStream.C | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/db/error/messageStream.C b/src/OpenFOAM/db/error/messageStream.C index bb8a7e29cc..03cb1962c3 100644 --- a/src/OpenFOAM/db/error/messageStream.C +++ b/src/OpenFOAM/db/error/messageStream.C @@ -212,11 +212,20 @@ Foam::messageStream::operator Foam::OSstream&() { if (level) { + // stderr instead of stdout + // - INFO_STDERR + // - WARNING when infoDetailLevel == 0 + const bool useSerr = + ( + (severity_ == INFO_STDERR) + || (severity_ == WARNING && Foam::infoDetailLevel == 0) + ); + const bool collect = ( severity_ == INFO - || severity_ == INFO_STDERR || severity_ == WARNING + || useSerr ); @@ -226,10 +235,11 @@ Foam::messageStream::operator Foam::OSstream&() return Snull; } + OSstream& os = ( (collect || !Pstream::parRun()) - ? ((severity_ == INFO_STDERR) ? Serr : Sout) + ? (useSerr ? Serr : Sout) : Pout );