Commit b454b7ce authored by Henry Weller's avatar Henry Weller
Browse files

functionObjects::regionFunctionObject: Added optional 'log' entry (defaults to true)

parent aa70b282
......@@ -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<Switch>("log", true);
return true;
}
// ************************************************************************* //
......@@ -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&);
};
......
......@@ -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<Switch>("log", true);
return true;
}
Foam::label Foam::functionObjects::writeFile::charWidth() const
{
return IOstream::defaultPrecision() + addChars;
......
......@@ -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;
......
......@@ -49,8 +49,11 @@ bool Foam::functionObjects::fvMeshFunctionObject::writeField
{
const regIOobject& field = mesh_.lookupObject<regIOobject>(fieldName);
Info<< "functionObjects::" << type() << " " << name()
<< " writing field: " << field.name() << endl;
if (log_)
{
Info<< "functionObjects::" << type() << " " << name()
<< " writing field: " << field.name() << endl;
}
field.write();
......
......@@ -90,6 +90,8 @@ bool Foam::functionObjects::fieldCoordinateSystemTransform::read
const dictionary& dict
)
{
fvMeshFunctionObject::read(dict);
dict.lookup("fields") >> fieldSet_;
return true;
......
......@@ -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_;
......
......@@ -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_ =
......
......@@ -83,6 +83,8 @@ Foam::functionObjects::processorField::~processorField()
bool Foam::functionObjects::processorField::read(const dictionary& dict)
{
fvMeshFunctionObject::read(dict);
return true;
}
......
......@@ -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;
......
......@@ -120,6 +120,8 @@ bool Foam::functionObjects::icoUncoupledKinematicCloud::read
const dictionary& dict
)
{
fvMeshFunctionObject::read(dict);
return true;
}
......
......@@ -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<word>("phi", "phi");
UName_ = dict.lookupOrDefault<word>("U", "U");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment