From 40e0fb2eacb1b35991fa5d84464b6e872c4cd355 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 22 Dec 2016 10:09:12 +0000
Subject: [PATCH] ENH: Field function objects using fieldExpression - tidied
outpu. See #359
---
src/functionObjects/field/CourantNo/CourantNo.C | 2 +-
src/functionObjects/field/blendingFactor/blendingFactor.C | 3 +--
.../field/fieldExpression/fieldExpressionTemplates.C | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/functionObjects/field/CourantNo/CourantNo.C b/src/functionObjects/field/CourantNo/CourantNo.C
index 617356f6ca5..7e21b4ab4ee 100644
--- a/src/functionObjects/field/CourantNo/CourantNo.C
+++ b/src/functionObjects/field/CourantNo/CourantNo.C
@@ -83,7 +83,7 @@ bool Foam::functionObjects::CourantNo::calc()
)
);
- if (foundObject<volScalarField>(resultName_))
+ if (foundObject<volScalarField>(resultName_, false))
{
volScalarField& Co
(
diff --git a/src/functionObjects/field/blendingFactor/blendingFactor.C b/src/functionObjects/field/blendingFactor/blendingFactor.C
index de66522a2f5..4c5bcc592b8 100644
--- a/src/functionObjects/field/blendingFactor/blendingFactor.C
+++ b/src/functionObjects/field/blendingFactor/blendingFactor.C
@@ -171,8 +171,7 @@ bool Foam::functionObjects::blendingFactor::write()
reduce(nCellsScheme2, sumOp<label>());
reduce(nCellsBlended, sumOp<label>());
- Log << type() << " " << name() << " write:" << nl
- << " scheme 1 cells : " << nCellsScheme1 << nl
+ Log << " scheme 1 cells : " << nCellsScheme1 << nl
<< " scheme 2 cells : " << nCellsScheme2 << nl
<< " blended cells : " << nCellsBlended << nl
<< endl;
diff --git a/src/functionObjects/field/fieldExpression/fieldExpressionTemplates.C b/src/functionObjects/field/fieldExpression/fieldExpressionTemplates.C
index f2549fbf66d..1605921090f 100644
--- a/src/functionObjects/field/fieldExpression/fieldExpressionTemplates.C
+++ b/src/functionObjects/field/fieldExpression/fieldExpressionTemplates.C
@@ -40,7 +40,7 @@ bool Foam::functionObjects::fieldExpression::foundObject
}
else
{
- if (verbose)
+ if (debug || verbose)
{
Warning
<< " functionObjects::" << type() << " " << this->name()
--
GitLab