From bbbad9cfc0c360f3389e863a52e3a6ec29da30f7 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 1 Jun 2015 09:58:33 +0100 Subject: [PATCH] fvOptions: Rationalize naming convention for constraints --- src/fvOptions/cellSetOption/cellSetOption.H | 3 -- src/fvOptions/cellSetOption/cellSetOptionIO.C | 44 ------------------- .../fixedTemperatureConstraint.C | 9 +--- .../fixedTemperatureConstraint.H | 5 +-- .../temperatureLimitsConstraint.C | 7 --- .../temperatureLimitsConstraint.H | 3 -- .../explicitSetValue/ExplicitSetValue.C | 4 +- .../explicitSetValue/ExplicitSetValue.H | 5 +-- .../explicitSetValue/ExplicitSetValueIO.C | 8 ---- src/fvOptions/fvOption/fvOption.C | 12 ++--- src/fvOptions/fvOption/fvOption.H | 17 +++---- src/fvOptions/fvOption/fvOptionI.H | 2 +- src/fvOptions/fvOption/fvOptionIO.C | 6 ++- src/fvOptions/fvOption/fvOptionList.C | 15 +++---- src/fvOptions/fvOption/fvOptionList.H | 11 +++++ .../fvOption/fvOptionListTemplates.C | 2 +- .../interRegionOption/interRegionOption.H | 3 -- .../interRegionOption/interRegionOptionIO.C | 9 ---- .../actuationDiskSource/actuationDiskSource.C | 7 --- .../actuationDiskSource/actuationDiskSource.H | 3 -- .../effectivenessHeatExchangerSource.C | 7 --- .../effectivenessHeatExchangerSource.H | 3 -- .../explicitPorositySource.C | 7 --- .../explicitPorositySource.H | 3 -- .../pressureGradientExplicitSource.C | 2 +- .../pressureGradientExplicitSource.H | 5 +-- .../pressureGradientExplicitSourceIO.C | 14 +----- .../radialActuationDiskSource.C | 6 --- .../radialActuationDiskSource.H | 3 -- .../derived/rotorDiskSource/rotorDiskSource.C | 7 --- .../derived/rotorDiskSource/rotorDiskSource.H | 3 -- .../solidificationMeltingSource.H | 3 -- .../solidificationMeltingSourceIO.C | 7 --- .../tabulatedAccelerationSource.C | 7 --- .../tabulatedAccelerationSource.H | 3 -- .../sources/general/codedSource/CodedSource.C | 6 +-- .../sources/general/codedSource/CodedSource.H | 7 +-- .../general/codedSource/CodedSourceIO.C | 8 ---- .../semiImplicitSource/SemiImplicitSource.H | 3 -- .../semiImplicitSource/SemiImplicitSourceIO.C | 8 ---- .../interRegionExplicitPorositySource.C | 7 --- .../interRegionExplicitPorositySource.H | 3 -- .../constantHeatTransfer.C | 8 ---- .../constantHeatTransfer.H | 3 -- .../interRegionHeatTransferModel.H | 3 -- .../interRegionHeatTransferModelIO.C | 11 ----- .../tabulatedHeatTransfer.C | 7 --- .../tabulatedHeatTransfer.H | 3 -- .../variableHeatTransfer.C | 7 --- .../variableHeatTransfer.H | 3 -- 50 files changed, 51 insertions(+), 291 deletions(-) diff --git a/src/fvOptions/cellSetOption/cellSetOption.H b/src/fvOptions/cellSetOption/cellSetOption.H index e391ce60d4..6dcbe17886 100644 --- a/src/fvOptions/cellSetOption/cellSetOption.H +++ b/src/fvOptions/cellSetOption/cellSetOption.H @@ -192,9 +192,6 @@ public: // IO - //- Write the source properties - virtual void writeData(Ostream&) const; - //- Read source dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/cellSetOption/cellSetOptionIO.C b/src/fvOptions/cellSetOption/cellSetOptionIO.C index 534472eb7d..90e30a2217 100644 --- a/src/fvOptions/cellSetOption/cellSetOptionIO.C +++ b/src/fvOptions/cellSetOption/cellSetOptionIO.C @@ -27,50 +27,6 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::fv::cellSetOption::writeData(Ostream& os) const -{ - option::writeData(os); - - os.writeKeyword("timeStart") << timeStart_ << token::END_STATEMENT << nl; - os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl; - os.writeKeyword("selectionMode") - << selectionModeTypeNames_[selectionMode_] << nl; - - switch (selectionMode_) - { - case smPoints: - { - os.writeKeyword("points") << points_ - << token::END_STATEMENT << nl; - break; - } - case smCellSet: - { - os.writeKeyword("cellSet") << cellSetName_ - << token::END_STATEMENT << nl; - break; - } - case smCellZone: - { - os.writeKeyword("cellZone") << cellSetName_ - << token::END_STATEMENT << nl; - break; - } - case smAll: - { - break; - } - default: - { - FatalErrorIn("option::writeData(Ostream&) const") - << "Unknown selectionMode " - << selectionMode_ - << abort(FatalError); - } - } -} - - bool Foam::fv::cellSetOption::read(const dictionary& dict) { if (option::read(dict)) diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C index 9cb7fbdf6d..422e6725de 100644 --- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C +++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C @@ -107,7 +107,7 @@ bool Foam::fv::fixedTemperatureConstraint::alwaysApply() const } -void Foam::fv::fixedTemperatureConstraint::setValue +void Foam::fv::fixedTemperatureConstraint::constrain ( fvMatrix& eqn, const label @@ -148,13 +148,6 @@ void Foam::fv::fixedTemperatureConstraint::setValue } -void Foam::fv::fixedTemperatureConstraint::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict) { if (cellSetOption::read(dict)) diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H index c33bc8a164..0337ef31e5 100644 --- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H +++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H @@ -142,14 +142,11 @@ public: // Set values directly //- Scalar - virtual void setValue(fvMatrix& eqn, const label fieldI); + virtual void constrain(fvMatrix& eqn, const label fieldI); // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C index b2b09cbd97..724548e065 100644 --- a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C +++ b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C @@ -125,13 +125,6 @@ void Foam::fv::temperatureLimitsConstraint::correct(volScalarField& he) } -void Foam::fv::temperatureLimitsConstraint::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - bool Foam::fv::temperatureLimitsConstraint::read(const dictionary& dict) { if (cellSetOption::read(dict)) diff --git a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H index f3e178c4dc..c1490da321 100644 --- a/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H +++ b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H @@ -120,9 +120,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C index 6dc030c685..cf48f43fdf 100644 --- a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C +++ b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C @@ -69,7 +69,7 @@ Foam::fv::ExplicitSetValue::ExplicitSetValue // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void Foam::fv::ExplicitSetValue::setValue +void Foam::fv::ExplicitSetValue::constrain ( fvMatrix& eqn, const label fieldI @@ -78,7 +78,7 @@ void Foam::fv::ExplicitSetValue::setValue if (debug) { Info<< "ExplicitSetValue<"<< pTraits::typeName - << ">::setValue for source " << name_ << endl; + << ">::constrain for source " << name_ << endl; } List values(cells_.size(), injectionRate_[fieldI]); diff --git a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H index 59e3c6f34e..7e3bb15c33 100644 --- a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H +++ b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H @@ -108,14 +108,11 @@ public: // Evaluation //- Set value on field - virtual void setValue(fvMatrix& eqn, const label fieldI); + virtual void constrain(fvMatrix& eqn, const label fieldI); // IO - //- Write the source properties - virtual void writeData(Ostream&) const; - //- Read source dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C index c0c7c2c3b2..0f1c2f9d49 100644 --- a/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C +++ b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C @@ -27,14 +27,6 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::fv::ExplicitSetValue::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - template bool Foam::fv::ExplicitSetValue::read(const dictionary& dict) { diff --git a/src/fvOptions/fvOption/fvOption.C b/src/fvOptions/fvOption/fvOption.C index 7c180b1725..547d2f3961 100644 --- a/src/fvOptions/fvOption/fvOption.C +++ b/src/fvOptions/fvOption/fvOption.C @@ -61,7 +61,7 @@ Foam::fv::option::option mesh_(mesh), dict_(dict), coeffs_(dict.subDict(modelType + "Coeffs")), - active_(dict_.lookupOrDefault("active", true)), + active_(dict_.lookupOrDefault("active", true)), fieldNames_(), applied_() { @@ -304,15 +304,15 @@ void Foam::fv::option::addSup } -void Foam::fv::option::setValue(fvMatrix& eqn, const label fieldI) +void Foam::fv::option::constrain(fvMatrix& eqn, const label fieldI) {} -void Foam::fv::option::setValue(fvMatrix& eqn, const label fieldI) +void Foam::fv::option::constrain(fvMatrix& eqn, const label fieldI) {} -void Foam::fv::option::setValue +void Foam::fv::option::constrain ( fvMatrix& eqn, const label fieldI @@ -320,7 +320,7 @@ void Foam::fv::option::setValue {} -void Foam::fv::option::setValue +void Foam::fv::option::constrain ( fvMatrix& eqn, const label fieldI @@ -328,7 +328,7 @@ void Foam::fv::option::setValue {} -void Foam::fv::option::setValue(fvMatrix& eqn, const label fieldI) +void Foam::fv::option::constrain(fvMatrix& eqn, const label fieldI) {} diff --git a/src/fvOptions/fvOption/fvOption.H b/src/fvOptions/fvOption/fvOption.H index 63ba718a7b..d7b431b128 100644 --- a/src/fvOptions/fvOption/fvOption.H +++ b/src/fvOptions/fvOption/fvOption.H @@ -46,6 +46,7 @@ SourceFiles #include "fvMatricesFwd.H" #include "volFieldsFwd.H" #include "dictionary.H" +#include "Switch.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -84,7 +85,7 @@ protected: dictionary coeffs_; //- Source active flag - bool active_; + Switch active_; //- Field names to apply source to - populated by derived models wordList fieldNames_; @@ -212,7 +213,7 @@ public: // Edit //- Return access to the source active flag - inline bool& active(); + inline Switch& active(); // Checks @@ -376,38 +377,38 @@ public: ); - // Set values directly + // Constraints //- Scalar - virtual void setValue + virtual void constrain ( fvMatrix& eqn, const label fieldI ); //- Vector - virtual void setValue + virtual void constrain ( fvMatrix& eqn, const label fieldI ); //- Spherical tensor - virtual void setValue + virtual void constrain ( fvMatrix& eqn, const label fieldI ); //- Symmetric tensor - virtual void setValue + virtual void constrain ( fvMatrix& eqn, const label fieldI ); //- Tensor - virtual void setValue + virtual void constrain ( fvMatrix& eqn, const label fieldI diff --git a/src/fvOptions/fvOption/fvOptionI.H b/src/fvOptions/fvOption/fvOptionI.H index 042f7c2bbc..5a1a4319d5 100644 --- a/src/fvOptions/fvOption/fvOptionI.H +++ b/src/fvOptions/fvOption/fvOptionI.H @@ -55,7 +55,7 @@ inline void Foam::fv::option::setApplied(const label fieldI) } -inline bool& Foam::fv::option::active() +inline Foam::Switch& Foam::fv::option::active() { return active_; } diff --git a/src/fvOptions/fvOption/fvOptionIO.C b/src/fvOptions/fvOption/fvOptionIO.C index 21550d5cd5..0f6c453226 100644 --- a/src/fvOptions/fvOption/fvOptionIO.C +++ b/src/fvOptions/fvOption/fvOptionIO.C @@ -42,7 +42,11 @@ void Foam::fv::option::writeFooter(Ostream& os) const void Foam::fv::option::writeData(Ostream& os) const { - os.writeKeyword("active") << active_ << token::END_STATEMENT << nl; + os.writeKeyword("type") << type() << token::END_STATEMENT << nl; + os.writeKeyword("active") << active_ << token::END_STATEMENT << nl << nl; + + os << indent << word(type() + "Coeffs"); + coeffs_.write(os); } diff --git a/src/fvOptions/fvOption/fvOptionList.C b/src/fvOptions/fvOption/fvOptionList.C index 94d1b2c342..33720d4266 100644 --- a/src/fvOptions/fvOption/fvOptionList.C +++ b/src/fvOptions/fvOption/fvOptionList.C @@ -148,7 +148,9 @@ bool Foam::fv::optionList::writeData(Ostream& os) const forAll(*this, i) { os << nl; + this->operator[](i).writeHeader(os); this->operator[](i).writeData(os); + this->operator[](i).writeFooter(os); } // Check state of IOstream @@ -158,17 +160,10 @@ bool Foam::fv::optionList::writeData(Ostream& os) const // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // -namespace Foam +Foam::Ostream& Foam::operator<<(Ostream& os, const fv::optionList& options) { - Ostream& operator<< - ( - Ostream& os, - const fv::optionList& options - ) - { - options.writeData(os); - return os; - } + options.writeData(os); + return os; } diff --git a/src/fvOptions/fvOption/fvOptionList.H b/src/fvOptions/fvOption/fvOptionList.H index d0d6ab0b4c..b29beddda3 100644 --- a/src/fvOptions/fvOption/fvOptionList.H +++ b/src/fvOptions/fvOption/fvOptionList.H @@ -44,6 +44,16 @@ SourceFile namespace Foam { + +// Forward declaration of friend functions and operators + +namespace fv +{ + class optionList; +} + +Ostream& operator<<(Ostream& os, const fv::optionList& options); + namespace fv { @@ -191,6 +201,7 @@ public: ); }; + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace fv diff --git a/src/fvOptions/fvOption/fvOptionListTemplates.C b/src/fvOptions/fvOption/fvOptionListTemplates.C index 3b199e316c..16e722e3f9 100644 --- a/src/fvOptions/fvOption/fvOptionListTemplates.C +++ b/src/fvOptions/fvOption/fvOptionListTemplates.C @@ -241,7 +241,7 @@ void Foam::fv::optionList::constrain(fvMatrix& eqn) << " to field " << eqn.psi().name() << endl; } - source.setValue(eqn, fieldI); + source.constrain(eqn, fieldI); } } } diff --git a/src/fvOptions/interRegionOption/interRegionOption.H b/src/fvOptions/interRegionOption/interRegionOption.H index b7a45c02c1..5b8e334923 100644 --- a/src/fvOptions/interRegionOption/interRegionOption.H +++ b/src/fvOptions/interRegionOption/interRegionOption.H @@ -108,9 +108,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/interRegionOption/interRegionOptionIO.C b/src/fvOptions/interRegionOption/interRegionOptionIO.C index 8c65ecd62a..158ffc07ee 100644 --- a/src/fvOptions/interRegionOption/interRegionOptionIO.C +++ b/src/fvOptions/interRegionOption/interRegionOptionIO.C @@ -27,15 +27,6 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::fv::interRegionOption::writeData(Ostream& os) const -{ - option::writeData(os); - os.writeKeyword("master") << master_ << token::END_STATEMENT << nl; - os.writeKeyword("nbrRegionName") << nbrRegionName_ - << token::END_STATEMENT << nl; -} - - bool Foam::fv::interRegionOption::read(const dictionary& dict) { if (option::read(dict)) diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C index 955dd15943..304f7c6198 100644 --- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C +++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C @@ -158,13 +158,6 @@ void Foam::fv::actuationDiskSource::addSup } -void Foam::fv::actuationDiskSource::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - bool Foam::fv::actuationDiskSource::read(const dictionary& dict) { if (cellSetOption::read(dict)) diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H index 2563e5bb21..45ae16693a 100644 --- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H +++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H @@ -207,9 +207,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C index 24cea47efe..44969e43f7 100644 --- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C +++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C @@ -308,13 +308,6 @@ void Foam::fv::effectivenessHeatExchangerSource::addSup } -void Foam::fv::effectivenessHeatExchangerSource::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict) { if (cellSetOption::read(dict)) diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H index 5b736b5985..b6904701c8 100644 --- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H +++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H @@ -278,9 +278,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C index 688e047d09..e3c8d8a94a 100644 --- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C +++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C @@ -123,13 +123,6 @@ void Foam::fv::explicitPorositySource::addSup } -void Foam::fv::explicitPorositySource::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - bool Foam::fv::explicitPorositySource::read(const dictionary& dict) { if (cellSetOption::read(dict)) diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H index 5e0d611df1..8fa468916e 100644 --- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H +++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H @@ -161,9 +161,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C index dd152dce31..1ea7f1c71b 100644 --- a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C +++ b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C @@ -214,7 +214,7 @@ void Foam::fv::pressureGradientExplicitSource::addSup } -void Foam::fv::pressureGradientExplicitSource::setValue +void Foam::fv::pressureGradientExplicitSource::constrain ( fvMatrix& eqn, const label diff --git a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H index aa6b083b47..fd94e4f099 100644 --- a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H +++ b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H @@ -146,7 +146,7 @@ public: ); //- Set 1/A coefficient - virtual void setValue + virtual void constrain ( fvMatrix& eqn, const label fieldI @@ -155,9 +155,6 @@ public: // IO - //- Write the source properties - virtual void writeData(Ostream&) const; - //- Read source dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C index ff639d776b..c9f3ab345d 100644 --- a/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C +++ b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,18 +27,6 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::pressureGradientExplicitSource::writeData(Ostream& os) const -{ - notImplemented - ( - "void Foam::fv::pressureGradientExplicitSource::writeData" - "(" - "Ostream&" - ") const" - ); -} - - bool Foam::fv::pressureGradientExplicitSource::read(const dictionary& dict) { notImplemented diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C index cab38d4fe0..39250a9ee2 100644 --- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C +++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C @@ -111,12 +111,6 @@ void Foam::fv::radialActuationDiskSource::addSup } -void Foam::fv::radialActuationDiskSource::writeData(Ostream& os) const -{ - actuationDiskSource::writeData(os); -} - - bool Foam::fv::radialActuationDiskSource::read(const dictionary& dict) { if (actuationDiskSource::read(dict)) diff --git a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H index e2c43776f4..92e619999c 100644 --- a/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H +++ b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H @@ -163,9 +163,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C index 86f4dfa8ba..c638d06ad4 100644 --- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C +++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C @@ -587,13 +587,6 @@ void Foam::fv::rotorDiskSource::addSup } -void Foam::fv::rotorDiskSource::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - bool Foam::fv::rotorDiskSource::read(const dictionary& dict) { if (cellSetOption::read(dict)) diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H index 818baec617..1640c313b5 100644 --- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H +++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H @@ -307,9 +307,6 @@ public: // IO - //- Write the source properties - virtual void writeData(Ostream&) const; - //- Read source dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H index 23228f39c8..ef963cdf77 100644 --- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H +++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H @@ -255,9 +255,6 @@ public: // IO - //- Write the source properties - virtual void writeData(Ostream&) const; - //- Read source dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C index da5aa79cc8..9ead117783 100644 --- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C +++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C @@ -27,13 +27,6 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::fv::solidificationMeltingSource::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict) { if (cellSetOption::read(dict)) diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C index 3635d6b353..6c23ae848a 100644 --- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C +++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C @@ -94,13 +94,6 @@ void Foam::fv::tabulatedAccelerationSource::addSup } -void Foam::fv::tabulatedAccelerationSource::writeData(Ostream& os) const -{ - option::writeData(os); - dict_.write(os); -} - - bool Foam::fv::tabulatedAccelerationSource::read(const dictionary& dict) { if (option::read(dict)) diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H index 08de40adc3..6127d0bff6 100644 --- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H +++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.H @@ -145,9 +145,6 @@ public: const label fieldi ); - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C index a42fb2c18c..3573ae3efe 100644 --- a/src/fvOptions/sources/general/codedSource/CodedSource.C +++ b/src/fvOptions/sources/general/codedSource/CodedSource.C @@ -201,7 +201,7 @@ void Foam::fv::CodedSource::addSup template -void Foam::fv::CodedSource::setValue +void Foam::fv::CodedSource::constrain ( fvMatrix& eqn, const label fieldI @@ -210,11 +210,11 @@ void Foam::fv::CodedSource::setValue if (debug) { Info<< "CodedSource<"<< pTraits::typeName - << ">::setValue for source " << name_ << endl; + << ">::constrain for source " << name_ << endl; } updateLibrary(redirectType_); - redirectFvOption().setValue(eqn, fieldI); + redirectFvOption().constrain(eqn, fieldI); } diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.H b/src/fvOptions/sources/general/codedSource/CodedSource.H index ccd2c52a54..0de0d2e980 100644 --- a/src/fvOptions/sources/general/codedSource/CodedSource.H +++ b/src/fvOptions/sources/general/codedSource/CodedSource.H @@ -40,7 +40,7 @@ Description const label fieldI ) - setValue + constrain ( fvMatrix& eqn, const label fieldI @@ -217,7 +217,7 @@ public: ); //- Set value - virtual void setValue + virtual void constrain ( fvMatrix& eqn, const label fieldI @@ -226,9 +226,6 @@ public: // IO - //- Write the source properties - virtual void writeData(Ostream&) const; - //- Read source dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C index 14fa3ce8a3..b605302b96 100644 --- a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C +++ b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C @@ -28,14 +28,6 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::fv::CodedSource::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - template bool Foam::fv::CodedSource::read(const dictionary& dict) { diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H index be925d9a8e..ce0df4a70e 100644 --- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H +++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H @@ -202,9 +202,6 @@ public: // IO - //- Write the source properties - virtual void writeData(Ostream&) const; - //- Read source dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C index c64023a710..6d232b85cf 100644 --- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C +++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C @@ -27,14 +27,6 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::fv::SemiImplicitSource::writeData(Ostream& os) const -{ - cellSetOption::writeData(os); - dict_.write(os); -} - - template bool Foam::fv::SemiImplicitSource::read(const dictionary& dict) { diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C index 7fc6458595..5452142948 100644 --- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C +++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C @@ -288,13 +288,6 @@ void Foam::fv::interRegionExplicitPorositySource::addSup } -void Foam::fv::interRegionExplicitPorositySource::writeData(Ostream& os) const -{ - interRegionOption::writeData(os); - dict_.write(os); -} - - bool Foam::fv::interRegionExplicitPorositySource::read(const dictionary& dict) { if (interRegionOption::read(dict)) diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H index 23bc40a6c0..eafb1b384e 100644 --- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H +++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H @@ -164,9 +164,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C index 7d2d4c80d8..7422b11ef5 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.C @@ -108,14 +108,6 @@ void Foam::fv::constantHeatTransfer::calculateHtc() {} -void Foam::fv::constantHeatTransfer::writeData(Ostream& os) const -{ - interRegionHeatTransferModel::writeData(os); - os << indent << type() + "Coeffs" << nl; - coeffs_.write(os); -} - - bool Foam::fv::constantHeatTransfer::read(const dictionary& dict) { if (interRegionHeatTransferModel::read(dict)) diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H index 288ef7f341..e3bd2830a2 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/constantHeatTransfer/constantHeatTransfer.H @@ -92,9 +92,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H index 101eec319b..9066ce40e1 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H @@ -188,9 +188,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C index f678cd43b0..72283e61a4 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModelIO.C @@ -27,17 +27,6 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::fv::interRegionHeatTransferModel::writeData(Ostream& os) const -{ - interRegionOption::writeData(os); - - os.writeKeyword("nbrModelName") << nbrModelName_ - << token::END_STATEMENT << nl; - os.writeKeyword("semiImplicit") << semiImplicit_ << token::END_STATEMENT - << nl; -} - - bool Foam::fv::interRegionHeatTransferModel::read(const dictionary& dict) { if (interRegionOption::read(dict)) diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C index fa5955d2a9..4200329836 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C @@ -133,13 +133,6 @@ void Foam::fv::tabulatedHeatTransfer::calculateHtc() } -void Foam::fv::tabulatedHeatTransfer::writeData(Ostream& os) const -{ - interRegionHeatTransferModel::writeData(os); - coeffs_.write(os); -} - - bool Foam::fv::tabulatedHeatTransfer::read(const dictionary& dict) { if (interRegionHeatTransferModel::read(dict)) diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H index 95a5a1be1a..3f2be053f8 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.H @@ -109,9 +109,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict); }; diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C index 5d1f07346c..f3852e82a8 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C @@ -126,13 +126,6 @@ void Foam::fv::variableHeatTransfer::calculateHtc() } -void Foam::fv::variableHeatTransfer::writeData(Ostream& os) const -{ - interRegionHeatTransferModel::writeData(os); - coeffs_.write(os); -} - - bool Foam::fv::variableHeatTransfer::read(const dictionary& dict) { if (interRegionHeatTransferModel::read(dict)) diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H index 6f801003bc..3b9d0f66fd 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.H @@ -113,9 +113,6 @@ public: // IO - //- Write data - virtual void writeData(Ostream&) const; - //- Read dictionary virtual bool read(const dictionary& dict) ; };