From 14a50c7d628716c15b1514bb4ea47c86f3cb3721 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 15 Jun 2018 15:23:12 +0100 Subject: [PATCH] thermophysicalModels: Corrected the name of solidReaction -> SolidReaction for consistency with the rest of the reaction system --- .../pyrolysisChemistryModel.C | 4 +-- .../SolidReaction.C} | 27 +++++++------- .../SolidReaction.H} | 36 +++++++++---------- .../SolidReactionI.H} | 6 ++-- .../reaction/reactions/makeSolidReaction.H | 12 +++---- 5 files changed, 42 insertions(+), 43 deletions(-) rename src/thermophysicalModels/solidSpecie/reaction/{Reactions/solidReaction/solidReaction.C => SolidReaction/SolidReaction.C} (85%) rename src/thermophysicalModels/solidSpecie/reaction/{Reactions/solidReaction/solidReaction.H => SolidReaction/SolidReaction.H} (88%) rename src/thermophysicalModels/solidSpecie/reaction/{Reactions/solidReaction/solidReactionI.H => SolidReaction/SolidReactionI.H} (92%) diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C index 5566471a4..6fea87184 100644 --- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C +++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "pyrolysisChemistryModel.H" -#include "solidReaction.H" +#include "SolidReaction.H" #include "basicThermo.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -156,7 +156,7 @@ pyrolysisChemistryModel Info<< indent << "Number of gases = " << nGases_ << nl; forAll(this->reactions_, i) { - Info<< dynamic_cast& > + Info<< dynamic_cast& > ( this->reactions_[i] ) << nl; diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C b/src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReaction.C similarity index 85% rename from src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C rename to src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReaction.C index 392a534d9..710205c74 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C +++ b/src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReaction.C @@ -23,14 +23,13 @@ License \*---------------------------------------------------------------------------*/ -#include "solidReaction.H" +#include "SolidReaction.H" #include "DynamicList.H" - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::solidReaction::solidReaction +Foam::SolidReaction::SolidReaction ( const Reaction& reaction, const speciesTable& pyrolisisGases, @@ -46,9 +45,9 @@ Foam::solidReaction::solidReaction template -Foam::solidReaction::solidReaction +Foam::SolidReaction::SolidReaction ( - const solidReaction& r, + const SolidReaction& r, const speciesTable& pyrolisisGases ) : @@ -60,7 +59,7 @@ Foam::solidReaction::solidReaction template -Foam::solidReaction::solidReaction +Foam::SolidReaction::SolidReaction ( const speciesTable& species, const HashPtrTable& thermoDatabase, @@ -85,8 +84,8 @@ Foam::solidReaction::solidReaction // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -const Foam::List::specieCoeffs>& -Foam::solidReaction::glhs() const +const Foam::List::specieCoeffs>& +Foam::SolidReaction::glhs() const { return glhs_; } @@ -94,14 +93,14 @@ Foam::solidReaction::glhs() const template const Foam::List::specieCoeffs>& -Foam::solidReaction::grhs() const +Foam::SolidReaction::grhs() const { return grhs_; } template -const Foam::speciesTable& Foam::solidReaction:: +const Foam::speciesTable& Foam::SolidReaction:: gasSpecies() const { return pyrolisisGases_; @@ -109,7 +108,7 @@ gasSpecies() const template -void Foam::solidReaction::write(Ostream& os) const +void Foam::SolidReaction::write(Ostream& os) const { OStringStream reaction; os.writeKeyword("reaction") << solidReactionStr(reaction) @@ -118,7 +117,7 @@ void Foam::solidReaction::write(Ostream& os) const template -Foam::string Foam::solidReaction::solidReactionStr +Foam::string Foam::SolidReaction::solidReactionStr ( OStringStream& reaction ) const @@ -142,7 +141,7 @@ Foam::string Foam::solidReaction::solidReactionStr template -void Foam::solidReaction::solidReactionStrLeft +void Foam::SolidReaction::solidReactionStrLeft ( OStringStream& reaction ) const @@ -167,7 +166,7 @@ void Foam::solidReaction::solidReactionStrLeft template -void Foam::solidReaction::solidReactionStrRight +void Foam::SolidReaction::solidReactionStrRight ( OStringStream& reaction ) const diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReaction.H similarity index 88% rename from src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H rename to src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReaction.H index a98126696..c4065c3ec 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H +++ b/src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReaction.H @@ -22,20 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::solidReaction + Foam::SolidReaction Description Read solid reactions of the type S1 = S2 + G1 SourceFiles - solidReactionI.H - solidReaction.C + SolidReactionI.H + SolidReaction.C \*---------------------------------------------------------------------------*/ -#ifndef solidReaction_H -#define solidReaction_H +#ifndef SolidReaction_H +#define SolidReaction_H #include "speciesTable.H" #include "Reaction.H" @@ -47,17 +47,17 @@ namespace Foam // Forward declaration of friend functions and operators template -class solidReaction; +class SolidReaction; template -inline Ostream& operator<<(Ostream&, const solidReaction&); +inline Ostream& operator<<(Ostream&, const SolidReaction&); /*---------------------------------------------------------------------------*\ - Class solidReaction Declaration + Class SolidReaction Declaration \*---------------------------------------------------------------------------*/ template -class solidReaction +class SolidReaction : public Reaction { @@ -91,7 +91,7 @@ private: void solidReactionStrRight(OStringStream&) const; //- Disallow default bitwise assignment - void operator=(const solidReaction&); + void operator=(const SolidReaction&); public: @@ -103,7 +103,7 @@ public: // Constructors //- Construct from components - solidReaction + SolidReaction ( const Reaction& reaction, const speciesTable& pyrolisisGases, @@ -113,15 +113,15 @@ public: //- Construct as copy given new speciesTable - solidReaction + SolidReaction ( - const solidReaction&, + const SolidReaction&, const speciesTable& pyrolisisGases ); //- Construct from dictionary - solidReaction + SolidReaction ( const speciesTable& species, const HashPtrTable& thermoDatabase, @@ -130,7 +130,7 @@ public: //- Destructor - virtual ~solidReaction() + virtual ~SolidReaction() {} @@ -157,7 +157,7 @@ public: friend Ostream& operator<< ( Ostream&, - const solidReaction& + const SolidReaction& ); }; @@ -168,12 +168,12 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "solidReactionI.H" +#include "SolidReactionI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "solidReaction.C" + #include "SolidReaction.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReactionI.H b/src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReactionI.H similarity index 92% rename from src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReactionI.H rename to src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReactionI.H index 9bad3ba77..2c5c3ca14 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReactionI.H +++ b/src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReactionI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "solidReaction.H" +#include "SolidReaction.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -36,7 +36,7 @@ template inline Ostream& operator<< ( Ostream& os, - const solidReaction& r + const SolidReaction& r ) { OStringStream reaction; diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H index b278c3c46..10a657ab0 100644 --- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H +++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description #ifndef makeSolidReaction_H #define makeSolidReaction_H -#include "solidReaction.H" +#include "SolidReaction.H" #include "IrreversibleReaction.H" #include "Reaction.H" @@ -47,16 +47,16 @@ namespace Foam #define makeSolidReaction(ReactionType, Thermo, ReactionRate) \ \ - typedef solidReaction solidReaction##Thermo; \ + typedef SolidReaction SolidReaction##Thermo; \ \ typedef Reaction Reaction##Thermo; \ \ - typedef ReactionType \ + typedef ReactionType \ ReactionType##Thermo##ReactionRate; \ \ defineTemplateRunTimeSelectionTable(Reaction##Thermo, dictionary); \ \ - defineTemplateTypeNameAndDebug(solidReaction##Thermo, 0); \ + defineTemplateTypeNameAndDebug(SolidReaction##Thermo, 0); \ defineTemplateTypeNameAndDebug(Reaction##Thermo, 0); \ \ template<> \ @@ -64,7 +64,7 @@ namespace Foam ( \ ReactionType::typeName_() \ + ReactionRate::type() \ - + solidReaction##Thermo::typeName_() \ + + SolidReaction##Thermo::typeName_() \ ); \ \ addToRunTimeSelectionTable \