zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermophysicalModels: Corrected the name of solidReaction -> SolidReaction

Browse Source 
for consistency with the rest of the reaction system
This commit is contained in:
Henry Weller
2018-06-15 15:23:12 +01:00
parent 4dc35c6810
commit 14a50c7d62
5 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "pyrolysisChemistryModel.H" #include "pyrolysisChemistryModel.H"
#include "solidReaction.H" #include "SolidReaction.H"
#include "basicThermo.H" #include "basicThermo.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -156,7 +156,7 @@ pyrolysisChemistryModel
Info<< indent << "Number of gases = " << nGases_ << nl; Info<< indent << "Number of gases = " << nGases_ << nl;
forAll(this->reactions_, i) forAll(this->reactions_, i)
{ {
Info<< dynamic_cast<const solidReaction<SolidThermo>& > Info<< dynamic_cast<const SolidReaction<SolidThermo>& >
( (
this->reactions_[i] this->reactions_[i]
) << nl; ) << nl;

27
src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C → src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReaction.C
View File

@ -23,14 +23,13 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "solidReaction.H" #include "SolidReaction.H"
#include "DynamicList.H" #include "DynamicList.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ReactionThermo> template<class ReactionThermo>
Foam::solidReaction<ReactionThermo>::solidReaction Foam::SolidReaction<ReactionThermo>::SolidReaction
( (
const Reaction<ReactionThermo>& reaction, const Reaction<ReactionThermo>& reaction,
const speciesTable& pyrolisisGases, const speciesTable& pyrolisisGases,
@ -46,9 +45,9 @@ Foam::solidReaction<ReactionThermo>::solidReaction
template<class ReactionThermo> template<class ReactionThermo>
Foam::solidReaction<ReactionThermo>::solidReaction Foam::SolidReaction<ReactionThermo>::SolidReaction
( (
const solidReaction<ReactionThermo>& r, const SolidReaction<ReactionThermo>& r,
const speciesTable& pyrolisisGases const speciesTable& pyrolisisGases
) )
: :
@ -60,7 +59,7 @@ Foam::solidReaction<ReactionThermo>::solidReaction
template<class ReactionThermo> template<class ReactionThermo>
Foam::solidReaction<ReactionThermo>::solidReaction Foam::SolidReaction<ReactionThermo>::SolidReaction
( (
const speciesTable& species, const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase, const HashPtrTable<ReactionThermo>& thermoDatabase,
@ -85,8 +84,8 @@ Foam::solidReaction<ReactionThermo>::solidReaction
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ReactionThermo> template<class ReactionThermo>
const Foam::List<typename Foam::solidReaction<ReactionThermo>::specieCoeffs>& const Foam::List<typename Foam::SolidReaction<ReactionThermo>::specieCoeffs>&
Foam::solidReaction<ReactionThermo>::glhs() const Foam::SolidReaction<ReactionThermo>::glhs() const
{ {
return glhs_; return glhs_;
} }
@ -94,14 +93,14 @@ Foam::solidReaction<ReactionThermo>::glhs() const
template<class ReactionThermo> template<class ReactionThermo>
const Foam::List<typename Foam::Reaction<ReactionThermo>::specieCoeffs>& const Foam::List<typename Foam::Reaction<ReactionThermo>::specieCoeffs>&
Foam::solidReaction<ReactionThermo>::grhs() const Foam::SolidReaction<ReactionThermo>::grhs() const
{ {
return grhs_; return grhs_;
} }
template<class ReactionThermo> template<class ReactionThermo>
const Foam::speciesTable& Foam::solidReaction<ReactionThermo>:: const Foam::speciesTable& Foam::SolidReaction<ReactionThermo>::
gasSpecies() const gasSpecies() const
{ {
return pyrolisisGases_; return pyrolisisGases_;
@ -109,7 +108,7 @@ gasSpecies() const
template<class ReactionThermo> template<class ReactionThermo>
void Foam::solidReaction<ReactionThermo>::write(Ostream& os) const void Foam::SolidReaction<ReactionThermo>::write(Ostream& os) const
{ {
OStringStream reaction; OStringStream reaction;
os.writeKeyword("reaction") << solidReactionStr(reaction) os.writeKeyword("reaction") << solidReactionStr(reaction)
@ -118,7 +117,7 @@ void Foam::solidReaction<ReactionThermo>::write(Ostream& os) const
template<class ReactionThermo> template<class ReactionThermo>
Foam::string Foam::solidReaction<ReactionThermo>::solidReactionStr Foam::string Foam::SolidReaction<ReactionThermo>::solidReactionStr
( (
OStringStream& reaction OStringStream& reaction
) const ) const
@ -142,7 +141,7 @@ Foam::string Foam::solidReaction<ReactionThermo>::solidReactionStr
template<class ReactionThermo> template<class ReactionThermo>
void Foam::solidReaction<ReactionThermo>::solidReactionStrLeft void Foam::SolidReaction<ReactionThermo>::solidReactionStrLeft
( (
OStringStream& reaction OStringStream& reaction
) const ) const
@ -167,7 +166,7 @@ void Foam::solidReaction<ReactionThermo>::solidReactionStrLeft
template<class ReactionThermo> template<class ReactionThermo>
void Foam::solidReaction<ReactionThermo>::solidReactionStrRight void Foam::SolidReaction<ReactionThermo>::solidReactionStrRight
( (
OStringStream& reaction OStringStream& reaction
) const ) const

36
src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H → src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReaction.H
View File

@ -22,20 +22,20 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::solidReaction Foam::SolidReaction
Description Description
Read solid reactions of the type S1 = S2 + G1 Read solid reactions of the type S1 = S2 + G1
SourceFiles SourceFiles
solidReactionI.H SolidReactionI.H
solidReaction.C SolidReaction.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef solidReaction_H #ifndef SolidReaction_H
#define solidReaction_H #define SolidReaction_H
#include "speciesTable.H" #include "speciesTable.H"
#include "Reaction.H" #include "Reaction.H"
@ -47,17 +47,17 @@ namespace Foam
// Forward declaration of friend functions and operators // Forward declaration of friend functions and operators
template<class ReactionThermo> template<class ReactionThermo>
class solidReaction; class SolidReaction;
template<class ReactionThermo> template<class ReactionThermo>
inline Ostream& operator<<(Ostream&, const solidReaction<ReactionThermo>&); inline Ostream& operator<<(Ostream&, const SolidReaction<ReactionThermo>&);
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class solidReaction Declaration Class SolidReaction Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class ReactionThermo> template<class ReactionThermo>
class solidReaction class SolidReaction
: :
public Reaction<ReactionThermo> public Reaction<ReactionThermo>
{ {
@ -91,7 +91,7 @@ private:
void solidReactionStrRight(OStringStream&) const; void solidReactionStrRight(OStringStream&) const;
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const solidReaction&); void operator=(const SolidReaction&);
public: public:
@ -103,7 +103,7 @@ public:
// Constructors // Constructors
//- Construct from components //- Construct from components
solidReaction SolidReaction
( (
const Reaction<ReactionThermo>& reaction, const Reaction<ReactionThermo>& reaction,
const speciesTable& pyrolisisGases, const speciesTable& pyrolisisGases,
@ -113,15 +113,15 @@ public:
//- Construct as copy given new speciesTable //- Construct as copy given new speciesTable
solidReaction SolidReaction
( (
const solidReaction<ReactionThermo>&, const SolidReaction<ReactionThermo>&,
const speciesTable& pyrolisisGases const speciesTable& pyrolisisGases
); );
//- Construct from dictionary //- Construct from dictionary
solidReaction SolidReaction
( (
const speciesTable& species, const speciesTable& species,
const HashPtrTable<ReactionThermo>& thermoDatabase, const HashPtrTable<ReactionThermo>& thermoDatabase,
@ -130,7 +130,7 @@ public:
//- Destructor //- Destructor
virtual ~solidReaction() virtual ~SolidReaction()
{} {}
@ -157,7 +157,7 @@ public:
friend Ostream& operator<< <ReactionThermo> friend Ostream& operator<< <ReactionThermo>
( (
Ostream&, Ostream&,
const solidReaction<ReactionThermo>& const SolidReaction<ReactionThermo>&
); );
}; };
@ -168,12 +168,12 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "solidReactionI.H" #include "SolidReactionI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository #ifdef NoRepository
#include "solidReaction.C" #include "SolidReaction.C"
#endif #endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

6
src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReactionI.H → src/thermophysicalModels/solidSpecie/reaction/SolidReaction/SolidReactionI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "solidReaction.H" #include "SolidReaction.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -36,7 +36,7 @@ template<class ReactionThermo>
inline Ostream& operator<< inline Ostream& operator<<
( (
Ostream& os, Ostream& os,
const solidReaction<ReactionThermo>& r const SolidReaction<ReactionThermo>& r
) )
{ {
OStringStream reaction; OStringStream reaction;

12
src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,7 +32,7 @@ Description
#ifndef makeSolidReaction_H #ifndef makeSolidReaction_H
#define makeSolidReaction_H #define makeSolidReaction_H
#include "solidReaction.H" #include "SolidReaction.H"
#include "IrreversibleReaction.H" #include "IrreversibleReaction.H"
#include "Reaction.H" #include "Reaction.H"
@ -47,16 +47,16 @@ namespace Foam
#define makeSolidReaction(ReactionType, Thermo, ReactionRate) \ #define makeSolidReaction(ReactionType, Thermo, ReactionRate) \
\ \
typedef solidReaction<Thermo> solidReaction##Thermo; \ typedef SolidReaction<Thermo> SolidReaction##Thermo; \
\ \
typedef Reaction<Thermo> Reaction##Thermo; \ typedef Reaction<Thermo> Reaction##Thermo; \
\ \
typedef ReactionType<solidReaction, Thermo, ReactionRate> \ typedef ReactionType<SolidReaction, Thermo, ReactionRate> \
ReactionType##Thermo##ReactionRate; \ ReactionType##Thermo##ReactionRate; \
\ \
defineTemplateRunTimeSelectionTable(Reaction##Thermo, dictionary); \ defineTemplateRunTimeSelectionTable(Reaction##Thermo, dictionary); \
\ \
defineTemplateTypeNameAndDebug(solidReaction##Thermo, 0); \ defineTemplateTypeNameAndDebug(SolidReaction##Thermo, 0); \
defineTemplateTypeNameAndDebug(Reaction##Thermo, 0); \ defineTemplateTypeNameAndDebug(Reaction##Thermo, 0); \
\ \
template<> \ template<> \
@ -64,7 +64,7 @@ namespace Foam
( \ ( \
ReactionType::typeName_() \ ReactionType::typeName_() \
+ ReactionRate::type() \ + ReactionRate::type() \
+ solidReaction##Thermo::typeName_() \ + SolidReaction##Thermo::typeName_() \
); \ ); \
\ \
addToRunTimeSelectionTable \ addToRunTimeSelectionTable \