Reactions: Removed "Reaction" from the end of the reaction names

This part of the name is unnecessary, as it is clear from context that
the name refers to a reaction. The selector has been made backwards
compatible so that old names will still read successfuly.

applications/utilities/thermophysical/chemkinToFoam/chemkinReader/chemkinReader.C

@@ -172,8 +172,7 @@ void Foam::chemkinReader::addReactionType
         {
             reactions_.append
             (
-                new IrreversibleReaction
+                new IrreversibleReaction<gasHThermoPhysics, ReactionRateType>
-                <Reaction, gasHThermoPhysics, ReactionRateType>
                 (
                     ReactionProxy<gasHThermoPhysics>
                     (
@@ -192,8 +191,7 @@ void Foam::chemkinReader::addReactionType
         {
             reactions_.append
             (
-                new ReversibleReaction
+                new ReversibleReaction<gasHThermoPhysics, ReactionRateType>
-                <Reaction, gasHThermoPhysics, ReactionRateType>
                 (
                     ReactionProxy<gasHThermoPhysics>
                     (
@@ -481,7 +479,10 @@ void Foam::chemkinReader::addReaction
                 reactions_.append
                 (
                     new NonEquilibriumReversibleReaction
-                        <Reaction, gasHThermoPhysics, ArrheniusReactionRate>
+                    <
+                        gasHThermoPhysics,
+                        ArrheniusReactionRate
+                    >
                     (
                         ReactionProxy<gasHThermoPhysics>
                         (
@@ -534,7 +535,6 @@ void Foam::chemkinReader::addReaction
                 (
                     new NonEquilibriumReversibleReaction
                     <
-                        Reaction,
                         gasHThermoPhysics,
                         thirdBodyArrheniusReactionRate
                     >
@@ -640,7 +640,6 @@ void Foam::chemkinReader::addReaction
                 (
                     new NonEquilibriumReversibleReaction
                     <
-                        Reaction,
                         gasHThermoPhysics,
                         LandauTellerReactionRate
                     >

src/OpenFOAM/primitives/strings/string/string.C

@@ -103,35 +103,33 @@ bool Foam::string::removeRepeated(const char character)
 {
     bool changed = false;
 
-    if (character && find(character) != npos)
+    string::size_type n = 0;
-    {
-        string::size_type nChar=0;
     iterator iter2 = begin();
 
-        char prev = 0;
+    char cPrev = operator[](0) + 1;
 
     for
     (
         string::const_iterator iter1 = iter2;
         iter1 != end();
-            iter1++
+        ++ iter1
     )
     {
         char c = *iter1;
 
-            if (prev == c && c == character)
+        if (c == cPrev && c == character)
         {
             changed = true;
         }
         else
         {
-                *iter2 = prev = c;
+            *iter2 = cPrev = c;
             ++ iter2;
-                ++nChar;
+            ++ n;
         }
     }
-        resize(nChar);
+
-    }
+    resize(n);
 
     return changed;
 }
@@ -149,10 +147,10 @@ bool Foam::string::removeTrailing(const char character)
 {
     bool changed = false;
 
-    string::size_type nChar = size();
+    string::size_type n = size();
-    if (character && nChar > 1 && operator[](nChar-1) == character)
+    if (n >= 1 && operator[](n - 1) == character)
     {
-        resize(nChar-1);
+        resize(n - 1);
         changed = true;
     }
 
@@ -162,9 +160,32 @@ bool Foam::string::removeTrailing(const char character)
 
 Foam::string Foam::string::removeTrailing(const char character) const
 {
-    string str(*this);
+    string result(*this);
-    str.removeTrailing(character);
+    result.removeTrailing(character);
-    return str;
+    return result;
+}
+
+
+bool Foam::string::removeTrailing(const string& str)
+{
+    bool changed = false;
+
+    string::size_type n = size(), nStr = str.size();
+    if (n >= str.size() && operator()(n - nStr, nStr) == str)
+    {
+        resize(n - nStr);
+        changed = true;
+    }
+
+    return changed;
+}
+
+
+Foam::string Foam::string::removeTrailing(const string& str) const
+{
+    string result(*this);
+    result.removeTrailing(str);
+    return result;
 }
 
 

src/OpenFOAM/primitives/strings/string/string.H

@@ -206,6 +206,12 @@ public:
         //- Return string with trailing character removed
         string removeTrailing(const char) const;
 
+        //- Remove trailing string returning true if string changed
+        bool removeTrailing(const string&);
+
+        //- Return string with trailing string removed
+        string removeTrailing(const string&) const;
+
 
     // Member Operators
 

src/thermophysicalModels/chemistryModel/reactions/makeReaction.H

@@ -60,7 +60,7 @@ namespace Foam
 #define makeReactionName(Thermo, ReactionType, ReactionRate)                   \
     typedef Reaction<Thermo> Reaction##Thermo;                                 \
                                                                                \
-    typedef ReactionType<Reaction, Thermo, ReactionRate>                       \
+    typedef ReactionType<Thermo, ReactionRate>                                 \
         ReactionType##Thermo##ReactionRate;                                    \
                                                                                \
     template<>                                                                 \
@@ -68,7 +68,6 @@ namespace Foam
     (                                                                          \
         ReactionType::typeName_()                                              \
       + ReactionRate::type().capitalise()                                      \
-      + Reaction##Thermo::typeName_()                                          \
     );
 
 

src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C

@@ -27,31 +27,21 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::IrreversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
 IrreversibleReaction
 (
-    const ReactionType<ReactionThermo>& reaction,
+    const Reaction<ReactionThermo>& reaction,
     const ReactionRate& k
 )
 :
-    ReactionType<ReactionThermo>(reaction),
+    Reaction<ReactionThermo>(reaction),
     k_(k)
 {}
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::IrreversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
 IrreversibleReaction
 (
     const speciesTable& species,
@@ -59,18 +49,13 @@ IrreversibleReaction
     const dictionary& dict
 )
 :
-    ReactionType<ReactionThermo>(species, thermoDatabase, dict),
+    Reaction<ReactionThermo>(species, thermoDatabase, dict),
     k_(species, dict)
 {}
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::IrreversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
 IrreversibleReaction
 (
     const speciesTable& species,
@@ -79,43 +64,28 @@ IrreversibleReaction
     const dictionary& dict
 )
 :
-    ReactionType<ReactionThermo>(species, thermoDatabase, dict),
+    Reaction<ReactionThermo>(species, thermoDatabase, dict),
     k_(species, ob, dict)
 {}
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::IrreversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
 IrreversibleReaction
 (
-    const IrreversibleReaction<ReactionType, ReactionThermo,ReactionRate>& irr,
+    const IrreversibleReaction<ReactionThermo,ReactionRate>& irr,
     const speciesTable& species
 )
 :
-    ReactionType<ReactionThermo>(irr, species),
+    Reaction<ReactionThermo>(irr, species),
     k_(irr.k_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::kf
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::IrreversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::kf
 (
     const scalar p,
     const scalar T,
@@ -127,18 +97,8 @@ Foam::scalar Foam::IrreversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::kr
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::IrreversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::kr
 (
     const scalar kfwd,
     const scalar p,
@@ -151,18 +111,8 @@ Foam::scalar Foam::IrreversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::kr
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::IrreversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::kr
 (
     const scalar p,
     const scalar T,
@@ -174,18 +124,8 @@ Foam::scalar Foam::IrreversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::dkfdT
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::IrreversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dkfdT
 (
     const scalar p,
     const scalar T,
@@ -197,18 +137,8 @@ Foam::scalar Foam::IrreversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::dkrdT
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::IrreversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dkrdT
 (
     const scalar p,
     const scalar T,
@@ -222,36 +152,16 @@ Foam::scalar Foam::IrreversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 const Foam::List<Foam::Tuple2<Foam::label, Foam::scalar>>&
-Foam::IrreversibleReaction
+Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::beta() const
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::beta() const
 {
     return k_.beta();
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+void Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::dcidc
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-void Foam::IrreversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dcidc
 (
     const scalar p,
     const scalar T,
@@ -264,18 +174,8 @@ void Foam::IrreversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::dcidT
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::IrreversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dcidT
 (
     const scalar p,
     const scalar T,
@@ -287,19 +187,13 @@ Foam::scalar Foam::IrreversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+void Foam::IrreversibleReaction<ReactionThermo, ReactionRate>::write
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-void Foam::IrreversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
-write
 (
     Ostream& os
 ) const
 {
-    ReactionType<ReactionThermo>::write(os);
+    Reaction<ReactionThermo>::write(os);
     k_.write(os);
 }
 

src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H

@@ -46,15 +46,10 @@ namespace Foam
                     Class IrreversibleReaction Declaration
 \*---------------------------------------------------------------------------*/
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 class IrreversibleReaction
 :
-    public ReactionType<ReactionThermo>
+    public Reaction<ReactionThermo>
 {
     // Private Data
 
@@ -72,19 +67,14 @@ public:
         //- Construct from components
         IrreversibleReaction
         (
-            const ReactionType<ReactionThermo>& reaction,
+            const Reaction<ReactionThermo>& reaction,
             const ReactionRate& reactionRate
         );
 
         //- Construct as copy given new speciesTable
         IrreversibleReaction
         (
-            const IrreversibleReaction
+            const IrreversibleReaction<ReactionThermo, ReactionRate>&,
-            <
-                ReactionType,
-                ReactionThermo,
-                ReactionRate
-            >&,
             const speciesTable& species
         );
 
@@ -110,12 +100,7 @@ public:
         {
             return autoPtr<Reaction<ReactionThermo>>
             (
-                new IrreversibleReaction
+                new IrreversibleReaction<ReactionThermo, ReactionRate>(*this)
-                <
-                    ReactionType,
-                    ReactionThermo,
-                    ReactionRate
-                >(*this)
             );
         }
 
@@ -127,12 +112,7 @@ public:
         {
             return autoPtr<Reaction<ReactionThermo>>
             (
-                new IrreversibleReaction
+                new IrreversibleReaction<ReactionThermo, ReactionRate>
-                <
-                    ReactionType,
-                    ReactionThermo,
-                    ReactionRate
-                >
                 (
                     *this,
                     species
@@ -240,12 +220,7 @@ public:
         //- Disallow default bitwise assignment
         void operator=
         (
-            const IrreversibleReaction
+            const IrreversibleReaction<ReactionThermo, ReactionRate>&
-            <
-                ReactionType,
-                ReactionThermo,
-                ReactionRate
-            >&
         ) = delete;
 };
 

src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C

@@ -27,43 +27,23 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::NonEquilibriumReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::
 NonEquilibriumReversibleReaction
 (
-    const ReactionType<ReactionThermo>& reaction,
+    const Reaction<ReactionThermo>& reaction,
     const ReactionRate& forwardReactionRate,
     const ReactionRate& reverseReactionRate
 )
 :
-    ReactionType<ReactionThermo>(reaction),
+    Reaction<ReactionThermo>(reaction),
     fk_(forwardReactionRate),
     rk_(reverseReactionRate)
 {}
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::NonEquilibriumReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::
 NonEquilibriumReversibleReaction
 (
     const speciesTable& species,
@@ -71,24 +51,14 @@ NonEquilibriumReversibleReaction
     const dictionary& dict
 )
 :
-    ReactionType<ReactionThermo>(species, thermoDatabase, dict),
+    Reaction<ReactionThermo>(species, thermoDatabase, dict),
     fk_(species, dict.subDict("forward")),
     rk_(species, dict.subDict("reverse"))
 {}
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::NonEquilibriumReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::
 NonEquilibriumReversibleReaction
 (
     const speciesTable& species,
@@ -97,36 +67,21 @@ NonEquilibriumReversibleReaction
     const dictionary& dict
 )
 :
-    ReactionType<ReactionThermo>(species, thermoDatabase, dict),
+    Reaction<ReactionThermo>(species, thermoDatabase, dict),
     fk_(species, ob, dict.subDict("forward")),
     rk_(species, ob, dict.subDict("reverse"))
 {}
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::NonEquilibriumReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::
 NonEquilibriumReversibleReaction
 (
-    const NonEquilibriumReversibleReaction
+    const NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>& nerr,
-    <
-        ReactionType,
-        ReactionThermo,
-        ReactionRate
-    >& nerr,
     const speciesTable& species
 )
 :
-    ReactionType<ReactionThermo>(nerr, species),
+    Reaction<ReactionThermo>(nerr, species),
     fk_(nerr.fk_),
     rk_(nerr.rk_)
 {}
@@ -134,19 +89,9 @@ NonEquilibriumReversibleReaction
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 Foam::scalar
-Foam::NonEquilibriumReversibleReaction
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kf
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::kf
 (
     const scalar p,
     const scalar T,
@@ -158,19 +103,9 @@ Foam::NonEquilibriumReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 Foam::scalar
-Foam::NonEquilibriumReversibleReaction
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::kr
 (
     const scalar,
     const scalar p,
@@ -183,19 +118,9 @@ Foam::NonEquilibriumReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 Foam::scalar
-Foam::NonEquilibriumReversibleReaction
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::kr
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::kr
 (
     const scalar p,
     const scalar T,
@@ -207,19 +132,9 @@ Foam::NonEquilibriumReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 Foam::scalar
-Foam::NonEquilibriumReversibleReaction
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::dkfdT
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dkfdT
 (
     const scalar p,
     const scalar T,
@@ -231,19 +146,9 @@ Foam::NonEquilibriumReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 Foam::scalar
-Foam::NonEquilibriumReversibleReaction
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::dkrdT
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dkrdT
 (
     const scalar p,
     const scalar T,
@@ -257,36 +162,18 @@ Foam::NonEquilibriumReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 const Foam::List<Foam::Tuple2<Foam::label, Foam::scalar>>&
-Foam::NonEquilibriumReversibleReaction
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::
-<
+beta() const
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::beta() const
 {
     return fk_.beta();
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+void
-    template<class> class ReactionType,
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::dcidc
-    class ReactionThermo,
-    class ReactionRate
->
-void Foam::NonEquilibriumReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dcidc
 (
     const scalar p,
     const scalar T,
@@ -299,18 +186,9 @@ void Foam::NonEquilibriumReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar
-    template<class> class ReactionType,
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::dcidT
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::NonEquilibriumReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dcidT
 (
     const scalar p,
     const scalar T,
@@ -322,23 +200,14 @@ Foam::scalar Foam::NonEquilibriumReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+void
-    template<class> class ReactionType,
+Foam::NonEquilibriumReversibleReaction<ReactionThermo, ReactionRate>::write
-    class ReactionThermo,
-    class ReactionRate
->
-void Foam::NonEquilibriumReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::write
 (
     Ostream& os
 ) const
 {
-    ReactionType<ReactionThermo>::write(os);
+    Reaction<ReactionThermo>::write(os);
 
     os  << indent << "forward" << nl;
     os  << indent << token::BEGIN_BLOCK << nl;

src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H

@@ -47,15 +47,10 @@ namespace Foam
              Class NonEquilibriumReversibleReaction Declaration
 \*---------------------------------------------------------------------------*/
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 class NonEquilibriumReversibleReaction
 :
-    public ReactionType<ReactionThermo>
+    public Reaction<ReactionThermo>
 {
     // Private Data
 
@@ -74,7 +69,7 @@ public:
         //- Construct from components
         NonEquilibriumReversibleReaction
         (
-            const ReactionType<ReactionThermo>& reaction,
+            const Reaction<ReactionThermo>& reaction,
             const ReactionRate& forwardReactionRate,
             const ReactionRate& reverseReactionRate
         );
@@ -83,7 +78,10 @@ public:
         NonEquilibriumReversibleReaction
         (
             const NonEquilibriumReversibleReaction
-                <ReactionType, ReactionThermo, ReactionRate>&,
+            <
+                ReactionThermo,
+                ReactionRate
+            >&,
             const speciesTable& species
         );
 
@@ -105,26 +103,35 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<ReactionType<ReactionThermo>> clone() const
+        virtual autoPtr<Reaction<ReactionThermo>> clone() const
         {
-            return autoPtr<ReactionType<ReactionThermo>>
+            return autoPtr<Reaction<ReactionThermo>>
             (
                 new NonEquilibriumReversibleReaction
-                    <ReactionType, ReactionThermo, ReactionRate>(*this)
+                <
+                    ReactionThermo,
+                    ReactionRate
+                >(*this)
             );
         }
 
         //- Construct and return a clone with new speciesTable
-        virtual autoPtr<ReactionType<ReactionThermo>> clone
+        virtual autoPtr<Reaction<ReactionThermo>> clone
         (
             const speciesTable& species
         ) const
         {
-            return autoPtr<ReactionType<ReactionThermo>>
+            return autoPtr<Reaction<ReactionThermo>>
             (
                 new NonEquilibriumReversibleReaction
-                    <ReactionType, ReactionThermo, ReactionRate>
+                <
-                    (*this, species)
+                    ReactionThermo,
+                    ReactionRate
+                >
+                (
+                    *this,
+                    species
+                )
             );
         }
 
@@ -229,7 +236,6 @@ public:
         (
             const NonEquilibriumReversibleReaction
             <
-                ReactionType,
                 ReactionThermo,
                 ReactionRate
             >&

src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C

@@ -164,8 +164,20 @@ Foam::Reaction<ReactionThermo>::New
 {
     const word& reactionTypeName = dict.lookup("type");
 
-    typename dictionaryConstructorTable::iterator cstrIter
+    typename dictionaryConstructorTable::iterator cstrIter =
-        = dictionaryConstructorTablePtr_->find(reactionTypeName);
+        dictionaryConstructorTablePtr_->find(reactionTypeName);
+
+    // Backwards compatibility check. Reaction names used to have "Reaction"
+    // (Reaction<ReactionThermo>::typeName_()) appended. This was removed as it
+    // is unnecessary given the context in which the reaction is specified. If
+    // this reaction name was not found, search also for the old name.
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        cstrIter = dictionaryConstructorTablePtr_->find
+        (
+            reactionTypeName.removeTrailing(typeName_())
+        );
+    }
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
@@ -200,17 +212,34 @@ Foam::Reaction<ReactionThermo>::New
     {
         return New(species, thermoDatabase, dict);
     }
-    else
+
-    {
     const word& reactionTypeName = dict.lookup("type");
 
-        typename objectRegistryConstructorTable::iterator cstrIter
+    typename objectRegistryConstructorTable::iterator cstrIter =
-            = objectRegistryConstructorTablePtr_->find(reactionTypeName);
+        objectRegistryConstructorTablePtr_->find(reactionTypeName);
+
+    // Backwards compatibility check. See above.
+    if (cstrIter == objectRegistryConstructorTablePtr_->end())
+    {
+        cstrIter = objectRegistryConstructorTablePtr_->find
+        (
+            reactionTypeName.removeTrailing(typeName_())
+        );
+    }
 
     if (cstrIter == objectRegistryConstructorTablePtr_->end())
     {
-            typename dictionaryConstructorTable::iterator cstrIter
+        typename dictionaryConstructorTable::iterator cstrIter =
-                = dictionaryConstructorTablePtr_->find(reactionTypeName);
+            dictionaryConstructorTablePtr_->find(reactionTypeName);
+
+        // Backwards compatibility check. See above.
+        if (cstrIter == dictionaryConstructorTablePtr_->end())
+        {
+            cstrIter = dictionaryConstructorTablePtr_->find
+            (
+                reactionTypeName.removeTrailing(typeName_())
+            );
+        }
 
         if (cstrIter == dictionaryConstructorTablePtr_->end())
         {
@@ -234,7 +263,6 @@ Foam::Reaction<ReactionThermo>::New
         cstrIter()(species, thermoDatabase, ob, dict)
     );
 }
-}
 
 
 template<class ReactionThermo>

src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C

@@ -27,31 +27,21 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::ReversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::ReversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
 ReversibleReaction
 (
-    const ReactionType<ReactionThermo>& reaction,
+    const Reaction<ReactionThermo>& reaction,
     const ReactionRate& k
 )
 :
-    ReactionType<ReactionThermo>(reaction),
+    Reaction<ReactionThermo>(reaction),
     k_(k)
 {}
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::ReversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::ReversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
 ReversibleReaction
 (
     const speciesTable& species,
@@ -59,18 +49,13 @@ ReversibleReaction
     const dictionary& dict
 )
 :
-    ReactionType<ReactionThermo>(species, thermoDatabase, dict),
+    Reaction<ReactionThermo>(species, thermoDatabase, dict),
     k_(species, dict)
 {}
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::ReversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::ReversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
 ReversibleReaction
 (
     const speciesTable& species,
@@ -79,43 +64,28 @@ ReversibleReaction
     const dictionary& dict
 )
 :
-    ReactionType<ReactionThermo>(species, thermoDatabase, dict),
+    Reaction<ReactionThermo>(species, thermoDatabase, dict),
     k_(species, ob, dict)
 {}
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::ReversibleReaction<ReactionThermo, ReactionRate>::
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::ReversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
 ReversibleReaction
 (
-    const ReversibleReaction<ReactionType, ReactionThermo, ReactionRate>& rr,
+    const ReversibleReaction<ReactionThermo, ReactionRate>& rr,
     const speciesTable& species
 )
 :
-    ReactionType<ReactionThermo>(rr, species),
+    Reaction<ReactionThermo>(rr, species),
     k_(rr.k_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kf
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::ReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::kf
 (
     const scalar p,
     const scalar T,
@@ -127,18 +97,8 @@ Foam::scalar Foam::ReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kr
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::ReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::kr
 (
     const scalar kfwd,
     const scalar p,
@@ -151,18 +111,8 @@ Foam::scalar Foam::ReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::kr
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::ReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::kr
 (
     const scalar p,
     const scalar T,
@@ -174,18 +124,8 @@ Foam::scalar Foam::ReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::dkfdT
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::ReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dkfdT
 (
     const scalar p,
     const scalar T,
@@ -197,18 +137,8 @@ Foam::scalar Foam::ReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::dkrdT
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::ReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dkrdT
 (
     const scalar p,
     const scalar T,
@@ -224,36 +154,16 @@ Foam::scalar Foam::ReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 const Foam::List<Foam::Tuple2<Foam::label, Foam::scalar>>&
-Foam::ReversibleReaction
+Foam::ReversibleReaction<ReactionThermo, ReactionRate>::beta() const
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::beta() const
 {
     return k_.beta();
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+void Foam::ReversibleReaction<ReactionThermo, ReactionRate>::dcidc
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-void Foam::ReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dcidc
 (
     const scalar p,
     const scalar T,
@@ -266,18 +176,8 @@ void Foam::ReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+Foam::scalar Foam::ReversibleReaction<ReactionThermo, ReactionRate>::dcidT
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::scalar Foam::ReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::dcidT
 (
     const scalar p,
     const scalar T,
@@ -289,18 +189,8 @@ Foam::scalar Foam::ReversibleReaction
 }
 
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
+void Foam::ReversibleReaction<ReactionThermo, ReactionRate>::write
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-void Foam::ReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::write
 (
     Ostream& os
 ) const

src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H

@@ -47,15 +47,10 @@ namespace Foam
                      Class ReversibleReaction Declaration
 \*---------------------------------------------------------------------------*/
 
-template
+template<class ReactionThermo, class ReactionRate>
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
 class ReversibleReaction
 :
-    public ReactionType<ReactionThermo>
+    public Reaction<ReactionThermo>
 {
     // Private Data
 
@@ -73,19 +68,14 @@ public:
         //- Construct from components
         ReversibleReaction
         (
-            const ReactionType<ReactionThermo>& reaction,
+            const Reaction<ReactionThermo>& reaction,
             const ReactionRate& k
         );
 
         //- Construct as copy given new speciesTable
         ReversibleReaction
         (
-            const ReversibleReaction
+            const ReversibleReaction<ReactionThermo, ReactionRate>&,
-            <
-                ReactionType,
-                ReactionThermo,
-                ReactionRate
-            >&,
             const speciesTable& species
         );
 
@@ -107,29 +97,23 @@ public:
         );
 
         //- Construct and return a clone
-        virtual autoPtr<ReactionType<ReactionThermo>> clone() const
+        virtual autoPtr<Reaction<ReactionThermo>> clone() const
         {
-            return autoPtr<ReactionType<ReactionThermo>>
+            return autoPtr<Reaction<ReactionThermo>>
             (
-                new ReversibleReaction
+                new ReversibleReaction<ReactionThermo, ReactionRate>(*this)
-                <
-                    ReactionType,
-                    ReactionThermo,
-                    ReactionRate
-                >(*this)
             );
         }
 
         //- Construct and return a clone with new speciesTable
-        virtual autoPtr<ReactionType<ReactionThermo>> clone
+        virtual autoPtr<Reaction<ReactionThermo>> clone
         (
             const speciesTable& species
         ) const
         {
-            return autoPtr<ReactionType<ReactionThermo>>
+            return autoPtr<Reaction<ReactionThermo>>
             (
-                new ReversibleReaction
+                new ReversibleReaction<ReactionThermo, ReactionRate>
-                <ReactionType, ReactionThermo, ReactionRate>
                 (
                     *this,
                     species
@@ -236,12 +220,7 @@ public:
         //- Disallow default bitwise assignment
         void operator=
         (
-            const ReversibleReaction
+            const ReversibleReaction<ReactionThermo, ReactionRate>&
-            <
-                ReactionType,
-                ReactionThermo,
-                ReactionRate
-            >&
         ) = delete;
 };
 

tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/reaction

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

tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/reaction

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

tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/reactions

@@ -20,7 +20,7 @@ reactions
 {
     methaneReaction
     {
-        type     irreversibleArrheniusReaction;
+        type     irreversibleArrhenius;
         reaction "CH4 + 2O2 = CO2 + 2H2O";
         A        5.2e16;
         beta     0;

tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/reactions

@@ -20,7 +20,7 @@ reactions
 {
     methaneReaction
     {
-        type     irreversibleArrheniusReaction;
+        type     irreversibleArrhenius;
         reaction "CH4 + 2O2 = CO2 + 2H2O";
         A        5.2e16;
         beta     0;

tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/reactions

@@ -27,7 +27,7 @@ reactions
 {
     methaneReaction
     {
-        type     irreversibleArrheniusReaction;
+        type     irreversibleArrhenius;
         reaction "CH4^0.2 + 2O2^1.3 = CO2 + 2H2O";
         A        2.11873e+11;
         beta     0;

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/reactions

@@ -2,7 +2,7 @@ reactions
 {
     methaneReaction
     {
-        type     irreversibleArrheniusReaction;
+        type     irreversibleArrhenius;
         reaction "CH4 + 2O2^1.0 = CO2 + 2H2O^1.0";
         A        7e+06;
         beta     0;
@@ -12,7 +12,7 @@ reactions
     }
     hydrogenReaction
     {
-        type     irreversibleArrheniusReaction;
+        type     irreversibleArrhenius;
         reaction "H2 + 0.5O2^1.0 = H2O";
         A        4.74342e+12;
         beta     0;

tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactions

@@ -20,7 +20,7 @@ reactions
 {
     methaneReaction
     {
-        type     irreversibleArrheniusReaction;
+        type     irreversibleArrhenius;
         reaction "CH4 + 2O2 = CO2 + 2H2O";
         A        5.2e16;
         beta     0;

tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/reactions.gas

@@ -2,7 +2,7 @@ reactions
 {
     waterGasShift
     {
-        type        reversibleArrheniusReaction;
+        type        reversibleArrhenius;
 
         reaction    "CO^0.93 + H2O^0.24 = CO2^0.69 + H2^1";
 

tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/reactions.vapor

@@ -25,7 +25,7 @@ reactions
 {
     oxidation
     {
-        type        irreversibleArrheniusReaction;
+        type        irreversibleArrhenius;
 
         reaction    "O2^0 + TiCl4 = TiO2 + 2Cl2";
 

tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/reactions.vapor

@@ -29,7 +29,7 @@ reactions
 {
     oxidation
     {
-        type        irreversibleArrheniusReaction;
+        type        irreversibleArrhenius;
 
         reaction    "O2^0 + TiCl4 = TiO2 + 2Cl2";
 
@@ -40,7 +40,7 @@ reactions
 
     oxidationAtSurface
     {
-        type        irreversibleSurfaceArrheniusReaction;
+        type        irreversibleSurfaceArrhenius;
 
         reaction    "O2^0 + TiCl4 = TiO2_s + 2Cl2";