From 557b67011a6e6e13e323c05a8dd19629a25c2e08 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 2 Nov 2011 13:56:15 +0000 Subject: [PATCH] ENH: Improved basicSource I/O --- .../basicSource/basicSource/basicSource.H | 10 ++++++++-- .../basicSource/basicSource/basicSourceIO.C | 14 +++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H index a9495fe836..f8a74cc6de 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H @@ -369,11 +369,17 @@ public: // I-O + //- Write the source header information + virtual void writeHeader(Ostream&) const; + + //- Write the source footer information + virtual void writeFooter(Ostream&) const; + //- Write the source properties - virtual void writeData(Ostream&) const = 0; + virtual void writeData(Ostream&) const; //- Read source dictionary - virtual bool read(const dictionary& dict) = 0; + virtual bool read(const dictionary& dict); }; diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C index 054de61219..611c5f352f 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C @@ -27,11 +27,21 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::basicSource::writeData(Ostream& os) const +void Foam::basicSource::writeHeader(Ostream& os) const { os << indent << name_ << nl << indent << token::BEGIN_BLOCK << incrIndent << nl; +} + +void Foam::basicSource::writeFooter(Ostream& os) const +{ + os << decrIndent << indent << token::END_BLOCK << endl; +} + + +void Foam::basicSource::writeData(Ostream& os) const +{ os.writeKeyword("active") << active_ << token::END_STATEMENT << nl; os.writeKeyword("timeStart") << timeStart_ << token::END_STATEMENT << nl; os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl; @@ -70,8 +80,6 @@ void Foam::basicSource::writeData(Ostream& os) const << abort(FatalError); } } - - os << decrIndent << indent << token::END_BLOCK << endl; }