From 7e86354f4f6c36a100a2e9d1abd59c253e432ca8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 20 May 2011 11:55:59 +0100
Subject: [PATCH] STYLE: writeRegisteredObject: remove unused switch
---
.../writeRegisteredObject.C | 47 ++++++++-----------
.../writeRegisteredObject.H | 4 --
2 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
index ab24cecb1a3..0ec6bf75340 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
@@ -44,7 +44,6 @@ Foam::writeRegisteredObject::writeRegisteredObject
:
name_(name),
obr_(obr),
- active_(true),
objectNames_()
{
read(dict);
@@ -61,10 +60,7 @@ Foam::writeRegisteredObject::~writeRegisteredObject()
void Foam::writeRegisteredObject::read(const dictionary& dict)
{
- if (active_)
- {
- dict.lookup("objectNames") >> objectNames_;
- }
+ dict.lookup("objectNames") >> objectNames_;
}
@@ -82,32 +78,29 @@ void Foam::writeRegisteredObject::end()
void Foam::writeRegisteredObject::write()
{
- if (active_)
+ forAll(objectNames_, i)
{
- forAll(objectNames_, i)
+ if (obr_.foundObject<regIOobject>(objectNames_[i]))
{
- if (obr_.foundObject<regIOobject>(objectNames_[i]))
- {
- regIOobject& obj =
- const_cast<regIOobject&>
- (
- obr_.lookupObject<regIOobject>(objectNames_[i])
- );
- // Switch off automatic writing to prevent double write
- obj.writeOpt() = IOobject::NO_WRITE;
- obj.write();
- }
- else
- {
- WarningIn
+ regIOobject& obj =
+ const_cast<regIOobject&>
(
- "Foam::writeRegisteredObject::read(const dictionary&)"
- ) << "Object " << objectNames_[i] << " not found in "
- << "database. Available objects:" << nl << obr_.sortedToc()
- << endl;
- }
-
+ obr_.lookupObject<regIOobject>(objectNames_[i])
+ );
+ // Switch off automatic writing to prevent double write
+ obj.writeOpt() = IOobject::NO_WRITE;
+ obj.write();
}
+ else
+ {
+ WarningIn
+ (
+ "Foam::writeRegisteredObject::read(const dictionary&)"
+ ) << "Object " << objectNames_[i] << " not found in "
+ << "database. Available objects:" << nl << obr_.sortedToc()
+ << endl;
+ }
+
}
}
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
index 9a65acea9d0..ecd96e5390f 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
@@ -65,10 +65,6 @@ protected:
const objectRegistry& obr_;
- //- On/off switch
- bool active_;
-
-
// Read from dictionary
//- Names of objects to control
--
GitLab