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

Reactions: Camel-cased all reaction names

Browse Source 
Reaction names are now consistently camel-cased for readability. Most
names have not been affected because the reaction rate name is a proper
noun and is therefore already capitalised (e.g., Arrhenius, Janev,
Landau, etc ...). Reactions that have been affected are as follows.

    Old name                                              New name

    irreversibleinfiniteReaction                          irreversibleInfiniteReaction
    irreversiblepowerSeriesReaction                       irreversiblePowerSeriesReaction
    irreversiblethirdBodyArrheniusReaction                irreversibleThirdBodyArrheniusReaction
    nonEquilibriumReversibleinfiniteReaction              nonEquilibriumReversibleInfiniteReaction
    nonEquilibriumReversiblethirdBodyArrheniusReaction    nonEquilibriumReversibleThirdBodyArrheniusReaction
    reversibleinfiniteReaction                            reversibleInfiniteReaction
    reversiblepowerSeriesReaction                         reversiblePowerSeriesReaction
    reversiblethirdBodyArrheniusReaction                  reversibleThirdBodyArrheniusReaction
    irreversiblefluxLimitedLangmuirHinshelwoodReaction    irreversibleFluxLimitedLangmuirHinshelwoodReaction
    irreversiblesurfaceArrheniusReaction                  irreversibleSurfaceArrheniusReaction
    reversiblesurfaceArrheniusReaction                    reversibleSurfaceArrheniusReaction
This commit is contained in:
Will Bainbridge
2019-10-23 21:41:26 +01:00
parent aafbb2991b
commit ace3d0e06d
11 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/OpenFOAM/primitives/strings/word/word.H
View File

@ -112,6 +112,9 @@ public:
//- Is this character valid for a word //- Is this character valid for a word
inline static bool valid(char); inline static bool valid(char);
//- Return the word with the first letter capitalised
inline word capitalise() const;
// Member Operators // Member Operators

8
src/OpenFOAM/primitives/strings/word/wordI.H
View File

@ -128,6 +128,14 @@ inline bool Foam::word::valid(char c)
} }
inline Foam::word Foam::word::capitalise() const
{
word w(*this);
w[0] = toupper(w[0]);
return w;
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
inline void Foam::word::operator=(const word& q) inline void Foam::word::operator=(const word& q)

2
src/thermophysicalModels/chemistryModel/reactions/makeReaction.H
View File

@ -67,7 +67,7 @@ namespace Foam
const word ReactionType##Thermo##ReactionRate::typeName \ const word ReactionType##Thermo##ReactionRate::typeName \
( \ ( \
ReactionType::typeName_() \ ReactionType::typeName_() \
+ ReactionRate::type() \ + ReactionRate::type().capitalise() \
+ Reaction##Thermo::typeName_() \ + Reaction##Thermo::typeName_() \
); );

2
tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reaction
View File

@ -8,7 +8,7 @@
reaction reaction
{ {
type irreversibleinfiniteReaction; type irreversibleInfiniteReaction;
reaction "CH4 + 2O2 + 7.5N2 = CO2 + 2H2O + 7.5N2"; reaction "CH4 + 2O2 + 7.5N2 = CO2 + 2H2O + 7.5N2";
} }

2
tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reaction
View File

@ -8,7 +8,7 @@
reaction reaction
{ {
type irreversibleinfiniteReaction; type irreversibleInfiniteReaction;
reaction "CH4 + 2O2 + 7.5N2 = CO2 + 2H2O + 7.5N2"; reaction "CH4 + 2O2 + 7.5N2 = CO2 + 2H2O + 7.5N2";
} }

12
tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI
View File

@ -2,7 +2,7 @@ reactions
{ {
un-named-reaction-0 un-named-reaction-0
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2O = O2"; reaction "2O = O2";
A 1.2e+11; A 1.2e+11;
beta -1; beta -1;
@ -51,7 +51,7 @@ reactions
} }
un-named-reaction-1 un-named-reaction-1
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "O + H = OH"; reaction "O + H = OH";
A 5e+11; A 5e+11;
beta -1; beta -1;
@ -396,7 +396,7 @@ reactions
} }
un-named-reaction-32 un-named-reaction-32
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + O2 = HO2"; reaction "H + O2 = HO2";
A 2.8e+12; A 2.8e+12;
beta -0.86; beta -0.86;
@ -485,7 +485,7 @@ reactions
} }
un-named-reaction-38 un-named-reaction-38
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2H = H2"; reaction "2H = H2";
A 1e+12; A 1e+12;
beta -1; beta -1;
@ -558,7 +558,7 @@ reactions
} }
un-named-reaction-42 un-named-reaction-42
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + OH = H2O"; reaction "H + OH = H2O";
A 2.2e+16; A 2.2e+16;
beta -2; beta -2;
@ -2731,7 +2731,7 @@ reactions
} }
un-named-reaction-166 un-named-reaction-166
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HCO = H + CO"; reaction "HCO = H + CO";
A 1.87e+14; A 1.87e+14;
beta -1; beta -1;

12
tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/reactionsGRI
View File

@ -2,7 +2,7 @@ reactions
{ {
un-named-reaction-0 un-named-reaction-0
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2O = O2"; reaction "2O = O2";
A 1.2e+11; A 1.2e+11;
beta -1; beta -1;
@ -51,7 +51,7 @@ reactions
} }
un-named-reaction-1 un-named-reaction-1
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "O + H = OH"; reaction "O + H = OH";
A 5e+11; A 5e+11;
beta -1; beta -1;
@ -396,7 +396,7 @@ reactions
} }
un-named-reaction-32 un-named-reaction-32
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + O2 = HO2"; reaction "H + O2 = HO2";
A 2.8e+12; A 2.8e+12;
beta -0.86; beta -0.86;
@ -485,7 +485,7 @@ reactions
} }
un-named-reaction-38 un-named-reaction-38
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2H = H2"; reaction "2H = H2";
A 1e+12; A 1e+12;
beta -1; beta -1;
@ -558,7 +558,7 @@ reactions
} }
un-named-reaction-42 un-named-reaction-42
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + OH = H2O"; reaction "H + OH = H2O";
A 2.2e+16; A 2.2e+16;
beta -2; beta -2;
@ -2731,7 +2731,7 @@ reactions
} }
un-named-reaction-166 un-named-reaction-166
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HCO = H + CO"; reaction "HCO = H + CO";
A 1.87e+14; A 1.87e+14;
beta -1; beta -1;

24
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/reactionsGRI
View File

@ -2274,7 +2274,7 @@ reactions
} }
un-named-reaction-284 un-named-reaction-284
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2O = O2"; reaction "2O = O2";
A 1.2e+11; A 1.2e+11;
beta -1; beta -1;
@ -2340,7 +2340,7 @@ reactions
} }
un-named-reaction-285 un-named-reaction-285
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "O + H = OH"; reaction "O + H = OH";
A 5e+11; A 5e+11;
beta -1; beta -1;
@ -2406,7 +2406,7 @@ reactions
} }
un-named-reaction-286 un-named-reaction-286
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + O2 = HO2"; reaction "H + O2 = HO2";
A 2.8e+12; A 2.8e+12;
beta -0.86; beta -0.86;
@ -2472,7 +2472,7 @@ reactions
} }
un-named-reaction-287 un-named-reaction-287
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2H = H2"; reaction "2H = H2";
A 1e+12; A 1e+12;
beta -1; beta -1;
@ -2538,7 +2538,7 @@ reactions
} }
un-named-reaction-288 un-named-reaction-288
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + OH = H2O"; reaction "H + OH = H2O";
A 2.2e+16; A 2.2e+16;
beta -2; beta -2;
@ -2604,7 +2604,7 @@ reactions
} }
un-named-reaction-289 un-named-reaction-289
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HCO = H + CO"; reaction "HCO = H + CO";
A 1.87e+14; A 1.87e+14;
beta -1; beta -1;
@ -2670,7 +2670,7 @@ reactions
} }
un-named-reaction-290 un-named-reaction-290
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "NO + O = NO2"; reaction "NO + O = NO2";
A 1.06e+14; A 1.06e+14;
beta -1.41; beta -1.41;
@ -2736,7 +2736,7 @@ reactions
} }
un-named-reaction-291 un-named-reaction-291
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "NNH = N2 + H"; reaction "NNH = N2 + H";
A 1.3e+11; A 1.3e+11;
beta -0.11; beta -0.11;
@ -2802,7 +2802,7 @@ reactions
} }
un-named-reaction-292 un-named-reaction-292
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + NO = HNO"; reaction "H + NO = HNO";
A 4.48e+13; A 4.48e+13;
beta -1.32; beta -1.32;
@ -2868,7 +2868,7 @@ reactions
} }
un-named-reaction-293 un-named-reaction-293
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "NCO = N + CO"; reaction "NCO = N + CO";
A 3.1e+11; A 3.1e+11;
beta 0; beta 0;
@ -2934,7 +2934,7 @@ reactions
} }
un-named-reaction-294 un-named-reaction-294
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HCN = H + CN"; reaction "HCN = H + CN";
A 1.04e+26; A 1.04e+26;
beta -3.3; beta -3.3;
@ -3000,7 +3000,7 @@ reactions
} }
un-named-reaction-295 un-named-reaction-295
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HNCO = NH + CO"; reaction "HNCO = NH + CO";
A 1.18e+13; A 1.18e+13;
beta 0; beta 0;

24
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/reactionsGRI
View File

@ -2274,7 +2274,7 @@ reactions
} }
un-named-reaction-284 un-named-reaction-284
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2O = O2"; reaction "2O = O2";
A 1.2e+11; A 1.2e+11;
beta -1; beta -1;
@ -2340,7 +2340,7 @@ reactions
} }
un-named-reaction-285 un-named-reaction-285
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "O + H = OH"; reaction "O + H = OH";
A 5e+11; A 5e+11;
beta -1; beta -1;
@ -2406,7 +2406,7 @@ reactions
} }
un-named-reaction-286 un-named-reaction-286
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + O2 = HO2"; reaction "H + O2 = HO2";
A 2.8e+12; A 2.8e+12;
beta -0.86; beta -0.86;
@ -2472,7 +2472,7 @@ reactions
} }
un-named-reaction-287 un-named-reaction-287
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2H = H2"; reaction "2H = H2";
A 1e+12; A 1e+12;
beta -1; beta -1;
@ -2538,7 +2538,7 @@ reactions
} }
un-named-reaction-288 un-named-reaction-288
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + OH = H2O"; reaction "H + OH = H2O";
A 2.2e+16; A 2.2e+16;
beta -2; beta -2;
@ -2604,7 +2604,7 @@ reactions
} }
un-named-reaction-289 un-named-reaction-289
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HCO = H + CO"; reaction "HCO = H + CO";
A 1.87e+14; A 1.87e+14;
beta -1; beta -1;
@ -2670,7 +2670,7 @@ reactions
} }
un-named-reaction-290 un-named-reaction-290
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "NO + O = NO2"; reaction "NO + O = NO2";
A 1.06e+14; A 1.06e+14;
beta -1.41; beta -1.41;
@ -2736,7 +2736,7 @@ reactions
} }
un-named-reaction-291 un-named-reaction-291
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "NNH = N2 + H"; reaction "NNH = N2 + H";
A 1.3e+11; A 1.3e+11;
beta -0.11; beta -0.11;
@ -2802,7 +2802,7 @@ reactions
} }
un-named-reaction-292 un-named-reaction-292
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + NO = HNO"; reaction "H + NO = HNO";
A 4.48e+13; A 4.48e+13;
beta -1.32; beta -1.32;
@ -2868,7 +2868,7 @@ reactions
} }
un-named-reaction-293 un-named-reaction-293
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "NCO = N + CO"; reaction "NCO = N + CO";
A 3.1e+11; A 3.1e+11;
beta 0; beta 0;
@ -2934,7 +2934,7 @@ reactions
} }
un-named-reaction-294 un-named-reaction-294
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HCN = H + CN"; reaction "HCN = H + CN";
A 1.04e+26; A 1.04e+26;
beta -3.3; beta -3.3;
@ -3000,7 +3000,7 @@ reactions
} }
un-named-reaction-295 un-named-reaction-295
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HNCO = NH + CO"; reaction "HNCO = NH + CO";
A 1.18e+13; A 1.18e+13;
beta 0; beta 0;

24
tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/reactionsGRI
View File

@ -2274,7 +2274,7 @@ reactions
} }
un-named-reaction-284 un-named-reaction-284
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2O = O2"; reaction "2O = O2";
A 1.2e+11; A 1.2e+11;
beta -1; beta -1;
@ -2340,7 +2340,7 @@ reactions
} }
un-named-reaction-285 un-named-reaction-285
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "O + H = OH"; reaction "O + H = OH";
A 5e+11; A 5e+11;
beta -1; beta -1;
@ -2406,7 +2406,7 @@ reactions
} }
un-named-reaction-286 un-named-reaction-286
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + O2 = HO2"; reaction "H + O2 = HO2";
A 2.8e+12; A 2.8e+12;
beta -0.86; beta -0.86;
@ -2472,7 +2472,7 @@ reactions
} }
un-named-reaction-287 un-named-reaction-287
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "2H = H2"; reaction "2H = H2";
A 1e+12; A 1e+12;
beta -1; beta -1;
@ -2538,7 +2538,7 @@ reactions
} }
un-named-reaction-288 un-named-reaction-288
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + OH = H2O"; reaction "H + OH = H2O";
A 2.2e+16; A 2.2e+16;
beta -2; beta -2;
@ -2604,7 +2604,7 @@ reactions
} }
un-named-reaction-289 un-named-reaction-289
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HCO = H + CO"; reaction "HCO = H + CO";
A 1.87e+14; A 1.87e+14;
beta -1; beta -1;
@ -2670,7 +2670,7 @@ reactions
} }
un-named-reaction-290 un-named-reaction-290
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "NO + O = NO2"; reaction "NO + O = NO2";
A 1.06e+14; A 1.06e+14;
beta -1.41; beta -1.41;
@ -2736,7 +2736,7 @@ reactions
} }
un-named-reaction-291 un-named-reaction-291
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "NNH = N2 + H"; reaction "NNH = N2 + H";
A 1.3e+11; A 1.3e+11;
beta -0.11; beta -0.11;
@ -2802,7 +2802,7 @@ reactions
} }
un-named-reaction-292 un-named-reaction-292
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "H + NO = HNO"; reaction "H + NO = HNO";
A 4.48e+13; A 4.48e+13;
beta -1.32; beta -1.32;
@ -2868,7 +2868,7 @@ reactions
} }
un-named-reaction-293 un-named-reaction-293
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "NCO = N + CO"; reaction "NCO = N + CO";
A 3.1e+11; A 3.1e+11;
beta 0; beta 0;
@ -2934,7 +2934,7 @@ reactions
} }
un-named-reaction-294 un-named-reaction-294
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HCN = H + CN"; reaction "HCN = H + CN";
A 1.04e+26; A 1.04e+26;
beta -3.3; beta -3.3;
@ -3000,7 +3000,7 @@ reactions
} }
un-named-reaction-295 un-named-reaction-295
{ {
type reversiblethirdBodyArrheniusReaction; type reversibleThirdBodyArrheniusReaction;
reaction "HNCO = NH + CO"; reaction "HNCO = NH + CO";
A 1.18e+13; A 1.18e+13;
beta 0; beta 0;

2
tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/reactions.vapor
View File

@ -40,7 +40,7 @@ reactions
oxidationAtSurface oxidationAtSurface
{ {
type irreversiblesurfaceArrheniusReaction; type irreversibleSurfaceArrheniusReaction;
reaction "O2^0 + TiCl4 = TiO2_s + 2Cl2"; reaction "O2^0 + TiCl4 = TiO2_s + 2Cl2";