From 7d229e7026a3c6b903871ffa83578ff55b6cce2e Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Wed, 27 Nov 2019 15:45:53 +0000 Subject: [PATCH] functionObject: Log by default to stdout when in postProcess mode, not otherwise This change formalises the usage of the "log" keyword in function objects. By default, logging to stdout is activated when running "postProcess" or " -postProcess", and deactivated when a function is being executed as part of a run. This behaviour can now be overridden in the function object dictionary when operating in either mode. --- etc/caseDicts/postProcessing/forces/forces.cfg | 2 -- etc/caseDicts/postProcessing/minMax/cellMinMax.cfg | 1 - etc/caseDicts/postProcessing/minMax/faceMinMax.cfg | 1 - etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg | 5 +---- etc/caseDicts/postProcessing/pressure/pressure.cfg | 1 - etc/caseDicts/postProcessing/pressure/pressureDifference.cfg | 5 ++--- .../postProcessing/surfaceFieldValue/surfaceRegion.cfg | 1 - .../db/functionObjects/functionObject/functionObject.C | 3 ++- src/functionObjects/field/fieldMinMax/fieldMinMax.H | 2 -- 9 files changed, 5 insertions(+), 16 deletions(-) diff --git a/etc/caseDicts/postProcessing/forces/forces.cfg b/etc/caseDicts/postProcessing/forces/forces.cfg index 74ef7a4891..0e8a607f95 100644 --- a/etc/caseDicts/postProcessing/forces/forces.cfg +++ b/etc/caseDicts/postProcessing/forces/forces.cfg @@ -12,6 +12,4 @@ libs ("libforces.so"); writeControl timeStep; writeInterval 1; -log off; - // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg index dbcb7200e2..dc8a7cb301 100644 --- a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg +++ b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg @@ -13,7 +13,6 @@ writeControl timeStep; writeInterval 1; writeFields false; -log false; regionType all; operation max; diff --git a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg index ff3bd8c7c7..7a46cadbc4 100644 --- a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg +++ b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg @@ -13,7 +13,6 @@ writeControl timeStep; writeInterval 1; writeFields false; -log false; regionType all; operation max; diff --git a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg index c0eeb4ce8c..32c2dc9a2b 100644 --- a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg +++ b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg @@ -12,9 +12,6 @@ libs ("libfieldFunctionObjects.so"); writeControl timeStep; writeInterval 1; -write true; -log false; - -mode magnitude; +mode magnitude; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/pressure/pressure.cfg b/etc/caseDicts/postProcessing/pressure/pressure.cfg index 16835a9473..c310980cdb 100644 --- a/etc/caseDicts/postProcessing/pressure/pressure.cfg +++ b/etc/caseDicts/postProcessing/pressure/pressure.cfg @@ -11,6 +11,5 @@ libs ("libfieldFunctionObjects.so"); executeControl writeTime; writeControl writeTime; -log false; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg index 3074db8dd5..cd642c0aad 100644 --- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg +++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg @@ -9,11 +9,10 @@ type fieldValueDelta; libs ("libfieldFunctionObjects.so"); -operation subtract; - writeControl timeStep; writeInterval 1 -log false; + +operation subtract; region1 { diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg index 8a6f52db1e..e93f377f01 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg @@ -13,6 +13,5 @@ writeControl timeStep; writeInterval 1; writeFields false; -log false; // ************************************************************************* // diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C index 0ffbb25218..6d53322b4c 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C @@ -126,9 +126,10 @@ const Foam::word& Foam::functionObject::name() const bool Foam::functionObject::read(const dictionary& dict) { + log = dict.lookupOrDefault("log", postProcess); + if (!postProcess) { - log = dict.lookupOrDefault("log", true); executeAtStart_ = dict.lookupOrDefault("executeAtStart", true); } diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/functionObjects/field/fieldMinMax/fieldMinMax.H index f528c4c9c6..48fb677607 100644 --- a/src/functionObjects/field/fieldMinMax/fieldMinMax.H +++ b/src/functionObjects/field/fieldMinMax/fieldMinMax.H @@ -39,7 +39,6 @@ Description type fieldMinMax; libs ("libfieldFunctionObjects.so"); ... - write yes; log yes; location yes; mode magnitude; @@ -55,7 +54,6 @@ Usage \table Property | Description | Required | Default value type | type name: fieldMinMax | yes | - write | write min/max data to file | no | yes log | write min/max data to standard output | no | no location | write location of the min/max value | no | yes mode | calculation mode: magnitude or component | no | magnitude