From 6ce303c79a47bb80357040241bbb841f28309a0c Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 24 May 2016 09:03:41 +0100 Subject: [PATCH] functionObjects::regionFunctionObject: Added optional 'log' entry (defaults to true) --- .../regionFunctionObject/regionFunctionObject.C | 16 ++++++++++++++-- .../regionFunctionObject/regionFunctionObject.H | 10 ++++++++++ .../db/functionObjects/writeFile/writeFile.C | 14 ++------------ .../db/functionObjects/writeFile/writeFile.H | 6 ------ .../fvMeshFunctionObject/fvMeshFunctionObject.C | 7 +++++-- .../fieldCoordinateSystemTransform.C | 2 ++ .../field/fieldExpression/fieldExpression.C | 2 ++ .../field/nearWallFields/nearWallFields.C | 5 +---- .../field/processorField/processorField.C | 2 ++ .../field/readFields/readFields.C | 2 ++ .../icoUncoupledKinematicCloud.C | 2 ++ .../utilities/scalarTransport/scalarTransport.C | 2 +- 12 files changed, 43 insertions(+), 27 deletions(-) diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C index 94da686f17..54fed15f56 100644 --- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C +++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C @@ -55,7 +55,8 @@ Foam::functionObjects::regionFunctionObject::regionFunctionObject ( dict.lookupOrDefault("region", polyMesh::defaultRegion) ) - ) + ), + log_(true) {} @@ -68,7 +69,8 @@ Foam::functionObjects::regionFunctionObject::regionFunctionObject : functionObject(name), time_(obr.time()), - obr_(obr) + obr_(obr), + log_(true) {} @@ -78,4 +80,14 @@ Foam::functionObjects::regionFunctionObject::~regionFunctionObject() {} +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +bool Foam::functionObjects::regionFunctionObject::read(const dictionary& dict) +{ + log_ = dict.lookupOrDefault("log", true); + + return true; +} + + // ************************************************************************* // diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H index 4f7fab0b7f..c5ec22eb43 100644 --- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H +++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H @@ -40,6 +40,7 @@ SourceFiles #define functionObjects_regionFunctionObject_H #include "functionObject.H" +#include "Switch.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -71,6 +72,9 @@ protected: //- Reference to the region objectRegistry const objectRegistry& obr_; + //- Switch to send output to Info as well as to file + Switch log_; + private: @@ -112,6 +116,12 @@ public: //- Destructor virtual ~regionFunctionObject(); + + + // Member Functions + + //- Read optional controls + virtual bool read(const dictionary&); }; diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C index 61107dea0d..d2a172d408 100644 --- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C +++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C @@ -106,8 +106,7 @@ Foam::functionObjects::writeFile::writeFile ) : regionFunctionObject(name, runTime, dict), - prefix_(prefix), - log_(true) + prefix_(prefix) {} @@ -120,8 +119,7 @@ Foam::functionObjects::writeFile::writeFile ) : regionFunctionObject(name, obr, dict), - prefix_(prefix), - log_(true) + prefix_(prefix) {} @@ -133,14 +131,6 @@ Foam::functionObjects::writeFile::~writeFile() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -bool Foam::functionObjects::writeFile::read(const dictionary& dict) -{ - log_ = dict.lookupOrDefault("log", true); - - return true; -} - - Foam::label Foam::functionObjects::writeFile::charWidth() const { return IOstream::defaultPrecision() + addChars; diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H index c0431f07d5..9da9c54196 100644 --- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H +++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.H @@ -66,9 +66,6 @@ protected: //- Prefix const word prefix_; - //- Switch to send output to Info as well as to file - Switch log_; - // Protected Member Functions @@ -130,9 +127,6 @@ public: // Member Functions - //- Read optional controls - virtual bool read(const dictionary&); - //- Write a commented string to stream void writeCommented(Ostream& os, const string& str) const; diff --git a/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C b/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C index 47e86f2ee8..7fbfb02724 100644 --- a/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C +++ b/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C @@ -49,8 +49,11 @@ bool Foam::functionObjects::fvMeshFunctionObject::writeField { const regIOobject& field = mesh_.lookupObject(fieldName); - Info<< "functionObjects::" << type() << " " << name() - << " writing field: " << field.name() << endl; + if (log_) + { + Info<< "functionObjects::" << type() << " " << name() + << " writing field: " << field.name() << endl; + } field.write(); diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C index b1fa0ea343..8acbe5cc07 100644 --- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C +++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C @@ -90,6 +90,8 @@ bool Foam::functionObjects::fieldCoordinateSystemTransform::read const dictionary& dict ) { + fvMeshFunctionObject::read(dict); + dict.lookup("fields") >> fieldSet_; return true; diff --git a/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C b/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C index f55d45b0dc..f4d5575594 100644 --- a/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C +++ b/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C @@ -65,6 +65,8 @@ Foam::functionObjects::fieldExpression::~fieldExpression() bool Foam::functionObjects::fieldExpression::read(const dictionary& dict) { + fvMeshFunctionObject::read(dict); + if (fieldName_ == word::null || dict.found("field")) { dict.lookup("field") >> fieldName_; diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C index 29f1e3577e..eed5d67864 100644 --- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C +++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C @@ -250,10 +250,7 @@ Foam::functionObjects::nearWallFields::~nearWallFields() bool Foam::functionObjects::nearWallFields::read(const dictionary& dict) { - if (debug) - { - InfoInFunction << endl; - } + fvMeshFunctionObject::read(dict); dict.lookup("fields") >> fieldSet_; patchSet_ = diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.C b/src/postProcessing/functionObjects/field/processorField/processorField.C index 1ffc9c10d5..fa4ba42c2c 100644 --- a/src/postProcessing/functionObjects/field/processorField/processorField.C +++ b/src/postProcessing/functionObjects/field/processorField/processorField.C @@ -83,6 +83,8 @@ Foam::functionObjects::processorField::~processorField() bool Foam::functionObjects::processorField::read(const dictionary& dict) { + fvMeshFunctionObject::read(dict); + return true; } diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.C b/src/postProcessing/functionObjects/field/readFields/readFields.C index d51f5c6527..93c87e39ef 100644 --- a/src/postProcessing/functionObjects/field/readFields/readFields.C +++ b/src/postProcessing/functionObjects/field/readFields/readFields.C @@ -66,6 +66,8 @@ Foam::functionObjects::readFields::~readFields() bool Foam::functionObjects::readFields::read(const dictionary& dict) { + fvMeshFunctionObject::read(dict); + dict.lookup("fields") >> fieldSet_; return true; diff --git a/src/postProcessing/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C b/src/postProcessing/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C index d0f3f2fc9c..f4f105f37b 100644 --- a/src/postProcessing/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C +++ b/src/postProcessing/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C @@ -120,6 +120,8 @@ bool Foam::functionObjects::icoUncoupledKinematicCloud::read const dictionary& dict ) { + fvMeshFunctionObject::read(dict); + return true; } diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C index 7112598e72..1ff8599d33 100644 --- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C +++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C @@ -195,7 +195,7 @@ Foam::functionObjects::scalarTransport::~scalarTransport() bool Foam::functionObjects::scalarTransport::read(const dictionary& dict) { - Info<< type() << ":" << nl; + fvMeshFunctionObject::read(dict); phiName_ = dict.lookupOrDefault("phi", "phi"); UName_ = dict.lookupOrDefault("U", "U");