diff --git a/src/functionObjects/field/components/componentsTemplates.C b/src/functionObjects/field/components/componentsTemplates.C index 7d56c3c41b..a899a293a6 100644 --- a/src/functionObjects/field/components/componentsTemplates.C +++ b/src/functionObjects/field/components/componentsTemplates.C @@ -57,11 +57,11 @@ bool Foam::functionObjects::components::calcComponents() typedef GeometricField VolFieldType; typedef GeometricField SurfaceFieldType; - if (foundObject(fieldName_)) + if (foundObject(fieldName_, false)) { return calcFieldComponents(); } - else if (foundObject(fieldName_)) + else if (foundObject(fieldName_, false)) { return calcFieldComponents(); } diff --git a/src/functionObjects/field/div/divTemplates.C b/src/functionObjects/field/div/divTemplates.C index 08d78e198f..c13ec96c9f 100644 --- a/src/functionObjects/field/div/divTemplates.C +++ b/src/functionObjects/field/div/divTemplates.C @@ -30,7 +30,7 @@ License template bool Foam::functionObjects::div::calcDiv() { - if (foundObject(fieldName_)) + if (foundObject(fieldName_, false)) { return store ( diff --git a/src/functionObjects/field/fieldExpression/fieldExpression.H b/src/functionObjects/field/fieldExpression/fieldExpression.H index 0ae69f8aec..8f1e263efc 100644 --- a/src/functionObjects/field/fieldExpression/fieldExpression.H +++ b/src/functionObjects/field/fieldExpression/fieldExpression.H @@ -77,7 +77,7 @@ protected: void setResultName(const word& typeName, const word& defaultArg); template - bool foundObject(const word& name); + bool foundObject(const word& name, const bool verbose = true) const; private: diff --git a/src/functionObjects/field/fieldExpression/fieldExpressionTemplates.C b/src/functionObjects/field/fieldExpression/fieldExpressionTemplates.C index 442834b6e5..f2549fbf66 100644 --- a/src/functionObjects/field/fieldExpression/fieldExpressionTemplates.C +++ b/src/functionObjects/field/fieldExpression/fieldExpressionTemplates.C @@ -30,8 +30,9 @@ License template bool Foam::functionObjects::fieldExpression::foundObject ( - const word& name -) + const word& name, + const bool verbose +) const { if (fvMeshFunctionObject::foundObject(name)) { @@ -39,10 +40,13 @@ bool Foam::functionObjects::fieldExpression::foundObject } else { - Warning - << " functionObjects::" << type() << " " << this->name() - << " cannot find required object " << name << " of type " - << Type::typeName << endl; + if (verbose) + { + Warning + << " functionObjects::" << type() << " " << this->name() + << " cannot find required object " << name << " of type " + << Type::typeName << endl; + } return false; } diff --git a/src/functionObjects/field/grad/gradTemplates.C b/src/functionObjects/field/grad/gradTemplates.C index d1ad033526..e7b6b81248 100644 --- a/src/functionObjects/field/grad/gradTemplates.C +++ b/src/functionObjects/field/grad/gradTemplates.C @@ -33,7 +33,7 @@ bool Foam::functionObjects::grad::calcGrad() typedef GeometricField VolFieldType; typedef GeometricField SurfaceFieldType; - if (foundObject(fieldName_)) + if (foundObject(fieldName_, false)) { return store ( @@ -42,7 +42,7 @@ bool Foam::functionObjects::grad::calcGrad() mesh_.changing() && mesh_.cache(resultName_) ); } - else if (foundObject(fieldName_)) + else if (foundObject(fieldName_, false)) { return store ( diff --git a/src/functionObjects/field/mag/magTemplates.C b/src/functionObjects/field/mag/magTemplates.C index dead35a360..a02d9a2ac6 100644 --- a/src/functionObjects/field/mag/magTemplates.C +++ b/src/functionObjects/field/mag/magTemplates.C @@ -36,7 +36,7 @@ bool Foam::functionObjects::mag::calcMag() typedef GeometricField SurfaceFieldType; typedef DimensionedField SurfFieldType; - if (foundObject(fieldName_)) + if (foundObject(fieldName_, false)) { return store ( @@ -44,7 +44,7 @@ bool Foam::functionObjects::mag::calcMag() Foam::mag(lookupObject(fieldName_)) ); } - else if (foundObject(fieldName_)) + else if (foundObject(fieldName_, false)) { return store ( @@ -52,7 +52,7 @@ bool Foam::functionObjects::mag::calcMag() Foam::mag(lookupObject(fieldName_)) ); } - else if (foundObject(fieldName_)) + else if (foundObject(fieldName_, false)) { return store ( diff --git a/src/functionObjects/field/magSqr/magSqrTemplates.C b/src/functionObjects/field/magSqr/magSqrTemplates.C index a3fee019bb..57a808ad91 100644 --- a/src/functionObjects/field/magSqr/magSqrTemplates.C +++ b/src/functionObjects/field/magSqr/magSqrTemplates.C @@ -36,7 +36,7 @@ bool Foam::functionObjects::magSqr::calcMagSqr() typedef GeometricField SurfaceFieldType; typedef DimensionedField SurfFieldType; - if (foundObject(fieldName_)) + if (foundObject(fieldName_, false)) { return store ( @@ -44,7 +44,7 @@ bool Foam::functionObjects::magSqr::calcMagSqr() Foam::magSqr(lookupObject(fieldName_)) ); } - else if (foundObject(fieldName_)) + else if (foundObject(fieldName_, false)) { return store ( @@ -52,7 +52,7 @@ bool Foam::functionObjects::magSqr::calcMagSqr() Foam::magSqr(lookupObject(fieldName_)) ); } - else if (foundObject(fieldName_)) + else if (foundObject(fieldName_, false)) { return store ( diff --git a/src/functionObjects/field/randomise/randomiseTemplates.C b/src/functionObjects/field/randomise/randomiseTemplates.C index cf917c45f7..a466ef3551 100644 --- a/src/functionObjects/field/randomise/randomiseTemplates.C +++ b/src/functionObjects/field/randomise/randomiseTemplates.C @@ -33,11 +33,11 @@ bool Foam::functionObjects::randomise::calcRandomised() { typedef GeometricField VolFieldType; - if (foundObject(fieldName_)) + if (foundObject(fieldName_, false)) { const VolFieldType& field = lookupObject(fieldName_); - resultName_ = fieldName_ + "Random"; + resultName_ = fieldName_ & "Random"; tmp rfieldt(new VolFieldType(field)); VolFieldType& rfield = rfieldt.ref();