From ace3d0e06d30421f0c637f2da645f2a75fc76f58 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Wed, 23 Oct 2019 21:41:26 +0100 Subject: [PATCH] Reactions: Camel-cased all reaction names 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 --- src/OpenFOAM/primitives/strings/word/word.H | 3 +++ src/OpenFOAM/primitives/strings/word/wordI.H | 8 +++++++ .../chemistryModel/reactions/makeReaction.H | 2 +- .../LES/smallPoolFire2D/constant/reaction | 2 +- .../LES/smallPoolFire3D/constant/reaction | 2 +- .../RAS/DLR_A_LTS/constant/reactionsGRI | 12 +++++----- .../RAS/SandiaD_LTS/constant/reactionsGRI | 12 +++++----- .../constant/reactionsGRI | 24 +++++++++---------- .../constant/reactionsGRI | 24 +++++++++---------- .../constant/reactionsGRI | 24 +++++++++---------- .../constant/reactions.vapor | 2 +- 11 files changed, 63 insertions(+), 52 deletions(-) diff --git a/src/OpenFOAM/primitives/strings/word/word.H b/src/OpenFOAM/primitives/strings/word/word.H index c94c7bca4f..0b6d56861b 100644 --- a/src/OpenFOAM/primitives/strings/word/word.H +++ b/src/OpenFOAM/primitives/strings/word/word.H @@ -112,6 +112,9 @@ public: //- Is this character valid for a word inline static bool valid(char); + //- Return the word with the first letter capitalised + inline word capitalise() const; + // Member Operators diff --git a/src/OpenFOAM/primitives/strings/word/wordI.H b/src/OpenFOAM/primitives/strings/word/wordI.H index ba2097b5e9..84731e3647 100644 --- a/src/OpenFOAM/primitives/strings/word/wordI.H +++ b/src/OpenFOAM/primitives/strings/word/wordI.H @@ -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 * * * * * * * * * * * * * // inline void Foam::word::operator=(const word& q) diff --git a/src/thermophysicalModels/chemistryModel/reactions/makeReaction.H b/src/thermophysicalModels/chemistryModel/reactions/makeReaction.H index c71741d1f7..1c706276ad 100644 --- a/src/thermophysicalModels/chemistryModel/reactions/makeReaction.H +++ b/src/thermophysicalModels/chemistryModel/reactions/makeReaction.H @@ -67,7 +67,7 @@ namespace Foam const word ReactionType##Thermo##ReactionRate::typeName \ ( \ ReactionType::typeName_() \ - + ReactionRate::type() \ + + ReactionRate::type().capitalise() \ + Reaction##Thermo::typeName_() \ ); diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reaction b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reaction index 55404ca17b..aba51dce39 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reaction +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reaction @@ -8,7 +8,7 @@ reaction { - type irreversibleinfiniteReaction; + type irreversibleInfiniteReaction; reaction "CH4 + 2O2 + 7.5N2 = CO2 + 2H2O + 7.5N2"; } diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reaction b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reaction index 61b478b345..ed9f8fa83d 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reaction +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reaction @@ -8,7 +8,7 @@ reaction { - type irreversibleinfiniteReaction; + type irreversibleInfiniteReaction; reaction "CH4 + 2O2 + 7.5N2 = CO2 + 2H2O + 7.5N2"; } diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI index 9ae52e4ae6..8bcd9f798c 100644 --- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI +++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI @@ -2,7 +2,7 @@ reactions { un-named-reaction-0 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2O = O2"; A 1.2e+11; beta -1; @@ -51,7 +51,7 @@ reactions } un-named-reaction-1 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "O + H = OH"; A 5e+11; beta -1; @@ -396,7 +396,7 @@ reactions } un-named-reaction-32 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + O2 = HO2"; A 2.8e+12; beta -0.86; @@ -485,7 +485,7 @@ reactions } un-named-reaction-38 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2H = H2"; A 1e+12; beta -1; @@ -558,7 +558,7 @@ reactions } un-named-reaction-42 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + OH = H2O"; A 2.2e+16; beta -2; @@ -2731,7 +2731,7 @@ reactions } un-named-reaction-166 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HCO = H + CO"; A 1.87e+14; beta -1; diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/reactionsGRI b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/reactionsGRI index 17e60dd822..05b9faa7d0 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/reactionsGRI +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/reactionsGRI @@ -2,7 +2,7 @@ reactions { un-named-reaction-0 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2O = O2"; A 1.2e+11; beta -1; @@ -51,7 +51,7 @@ reactions } un-named-reaction-1 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "O + H = OH"; A 5e+11; beta -1; @@ -396,7 +396,7 @@ reactions } un-named-reaction-32 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + O2 = HO2"; A 2.8e+12; beta -0.86; @@ -485,7 +485,7 @@ reactions } un-named-reaction-38 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2H = H2"; A 1e+12; beta -1; @@ -558,7 +558,7 @@ reactions } un-named-reaction-42 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + OH = H2O"; A 2.2e+16; beta -2; @@ -2731,7 +2731,7 @@ reactions } un-named-reaction-166 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HCO = H + CO"; A 1.87e+14; beta -1; diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/reactionsGRI b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/reactionsGRI index a79133d5f0..31fbdbdf83 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/reactionsGRI +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/reactionsGRI @@ -2274,7 +2274,7 @@ reactions } un-named-reaction-284 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2O = O2"; A 1.2e+11; beta -1; @@ -2340,7 +2340,7 @@ reactions } un-named-reaction-285 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "O + H = OH"; A 5e+11; beta -1; @@ -2406,7 +2406,7 @@ reactions } un-named-reaction-286 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + O2 = HO2"; A 2.8e+12; beta -0.86; @@ -2472,7 +2472,7 @@ reactions } un-named-reaction-287 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2H = H2"; A 1e+12; beta -1; @@ -2538,7 +2538,7 @@ reactions } un-named-reaction-288 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + OH = H2O"; A 2.2e+16; beta -2; @@ -2604,7 +2604,7 @@ reactions } un-named-reaction-289 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HCO = H + CO"; A 1.87e+14; beta -1; @@ -2670,7 +2670,7 @@ reactions } un-named-reaction-290 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "NO + O = NO2"; A 1.06e+14; beta -1.41; @@ -2736,7 +2736,7 @@ reactions } un-named-reaction-291 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "NNH = N2 + H"; A 1.3e+11; beta -0.11; @@ -2802,7 +2802,7 @@ reactions } un-named-reaction-292 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + NO = HNO"; A 4.48e+13; beta -1.32; @@ -2868,7 +2868,7 @@ reactions } un-named-reaction-293 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "NCO = N + CO"; A 3.1e+11; beta 0; @@ -2934,7 +2934,7 @@ reactions } un-named-reaction-294 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HCN = H + CN"; A 1.04e+26; beta -3.3; @@ -3000,7 +3000,7 @@ reactions } un-named-reaction-295 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HNCO = NH + CO"; A 1.18e+13; beta 0; diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/reactionsGRI b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/reactionsGRI index a79133d5f0..31fbdbdf83 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/reactionsGRI +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/reactionsGRI @@ -2274,7 +2274,7 @@ reactions } un-named-reaction-284 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2O = O2"; A 1.2e+11; beta -1; @@ -2340,7 +2340,7 @@ reactions } un-named-reaction-285 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "O + H = OH"; A 5e+11; beta -1; @@ -2406,7 +2406,7 @@ reactions } un-named-reaction-286 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + O2 = HO2"; A 2.8e+12; beta -0.86; @@ -2472,7 +2472,7 @@ reactions } un-named-reaction-287 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2H = H2"; A 1e+12; beta -1; @@ -2538,7 +2538,7 @@ reactions } un-named-reaction-288 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + OH = H2O"; A 2.2e+16; beta -2; @@ -2604,7 +2604,7 @@ reactions } un-named-reaction-289 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HCO = H + CO"; A 1.87e+14; beta -1; @@ -2670,7 +2670,7 @@ reactions } un-named-reaction-290 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "NO + O = NO2"; A 1.06e+14; beta -1.41; @@ -2736,7 +2736,7 @@ reactions } un-named-reaction-291 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "NNH = N2 + H"; A 1.3e+11; beta -0.11; @@ -2802,7 +2802,7 @@ reactions } un-named-reaction-292 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + NO = HNO"; A 4.48e+13; beta -1.32; @@ -2868,7 +2868,7 @@ reactions } un-named-reaction-293 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "NCO = N + CO"; A 3.1e+11; beta 0; @@ -2934,7 +2934,7 @@ reactions } un-named-reaction-294 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HCN = H + CN"; A 1.04e+26; beta -3.3; @@ -3000,7 +3000,7 @@ reactions } un-named-reaction-295 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HNCO = NH + CO"; A 1.18e+13; beta 0; diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/reactionsGRI b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/reactionsGRI index a79133d5f0..31fbdbdf83 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/reactionsGRI +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/reactionsGRI @@ -2274,7 +2274,7 @@ reactions } un-named-reaction-284 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2O = O2"; A 1.2e+11; beta -1; @@ -2340,7 +2340,7 @@ reactions } un-named-reaction-285 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "O + H = OH"; A 5e+11; beta -1; @@ -2406,7 +2406,7 @@ reactions } un-named-reaction-286 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + O2 = HO2"; A 2.8e+12; beta -0.86; @@ -2472,7 +2472,7 @@ reactions } un-named-reaction-287 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "2H = H2"; A 1e+12; beta -1; @@ -2538,7 +2538,7 @@ reactions } un-named-reaction-288 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + OH = H2O"; A 2.2e+16; beta -2; @@ -2604,7 +2604,7 @@ reactions } un-named-reaction-289 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HCO = H + CO"; A 1.87e+14; beta -1; @@ -2670,7 +2670,7 @@ reactions } un-named-reaction-290 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "NO + O = NO2"; A 1.06e+14; beta -1.41; @@ -2736,7 +2736,7 @@ reactions } un-named-reaction-291 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "NNH = N2 + H"; A 1.3e+11; beta -0.11; @@ -2802,7 +2802,7 @@ reactions } un-named-reaction-292 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "H + NO = HNO"; A 4.48e+13; beta -1.32; @@ -2868,7 +2868,7 @@ reactions } un-named-reaction-293 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "NCO = N + CO"; A 3.1e+11; beta 0; @@ -2934,7 +2934,7 @@ reactions } un-named-reaction-294 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HCN = H + CN"; A 1.04e+26; beta -3.3; @@ -3000,7 +3000,7 @@ reactions } un-named-reaction-295 { - type reversiblethirdBodyArrheniusReaction; + type reversibleThirdBodyArrheniusReaction; reaction "HNCO = NH + CO"; A 1.18e+13; beta 0; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/reactions.vapor b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/reactions.vapor index f770e80baa..5574fcd4e0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/reactions.vapor +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/reactions.vapor @@ -40,7 +40,7 @@ reactions oxidationAtSurface { - type irreversiblesurfaceArrheniusReaction; + type irreversibleSurfaceArrheniusReaction; reaction "O2^0 + TiCl4 = TiO2_s + 2Cl2";