functionObjectList and Time modifications

- added clear() method to functionObjectList. It also gets called by ~Time().
  This should destroy function objects before anything else gets
  destroyed (eg, objectRegistry).
This commit is contained in:
Mark Olesen
2009-02-12 22:13:30 +01:00
parent d8ec3376fc
commit fafb3e8885
9 changed files with 55 additions and 51 deletions

View File

@ -47,11 +47,11 @@ const Foam::NamedEnum<Foam::outputFilterOutputControl::outputControls, 2>
Foam::outputFilterOutputControl::outputFilterOutputControl
(
const Time& time,
const Time& t,
const dictionary& dict
)
:
time_(time),
time_(t),
outputControl_(ocTimeStep),
outputInterval_(0)
{
@ -93,8 +93,8 @@ bool Foam::outputFilterOutputControl::output() const
{
return
(
!(time_.timeIndex() % outputInterval_)
|| (outputInterval_ <= 1)
(outputInterval_ <= 1)
|| !(time_.timeIndex() % outputInterval_)
);
break;
}

View File

@ -88,22 +88,18 @@ public:
// Constructors
//- Construct from dictionary and Time object
outputFilterOutputControl
(
const Time& time,
const dictionary& dict
);
//- Construct from Time object and dictionary
outputFilterOutputControl(const Time&, const dictionary&);
// Destructor
~outputFilterOutputControl();
~outputFilterOutputControl();
// Member Functions
//- Read from dictionary
void read(const dictionary& dict);
void read(const dictionary&);
//- Return const access to the Time object
const Time& time() const