Remove reaction specializations

doc/sphinx/cython/kinetics.rst

@@ -149,6 +149,11 @@ StickingBlowersMaselRate
 Auxiliary Reaction Data
 -----------------------
 
+ThirdBody
+^^^^^^^^^
+.. autoclass:: ThirdBody
+   :no-undoc-members:
+
 Arrhenius
 ^^^^^^^^^
 .. autoclass:: Arrhenius(A, b, E)

include/cantera/kinetics/Falloff.h

@@ -169,8 +169,11 @@ class FalloffRate : public ReactionRate
         return 0;
     }
 
-    virtual const std::string type() const {
-        return "Falloff";
+    virtual const std::string type() const override {
+        if (m_chemicallyActivated) {
+            return "chemically-activated";
+        }
+        return "falloff";
     }
 
     //! Returns the number of parameters used by this parameterization. The
@@ -179,7 +182,8 @@ class FalloffRate : public ReactionRate
         return 0;
     }
 
-    virtual void setParameters(const AnyMap& node, const UnitStack& rate_units);
+    virtual void setParameters(
+        const AnyMap& node, const UnitStack& rate_units) override;
 
     //! Get the values of the parameters for this object. *params* must be an
     //! array of at least nParameters() elements.
@@ -220,7 +224,7 @@ class FalloffRate : public ReactionRate
     }
 
     virtual void check(const std::string& equation) override;
-    virtual void validate(const std::string& equation, const Kinetics& kin);
+    virtual void validate(const std::string& equation, const Kinetics& kin) override;
 
     //! Get flag indicating whether negative A values are permitted
     bool allowNegativePreExponentialFactor() const {
@@ -297,12 +301,12 @@ class LindemannRate final : public FalloffRate
         setFalloffCoeffs(c);
     }
 
-    unique_ptr<MultiRateBase> newMultiRate() const {
+    unique_ptr<MultiRateBase> newMultiRate() const override{
         return unique_ptr<MultiRateBase>(
             new MultiRate<LindemannRate, FalloffData>);
     }
 
-    virtual const std::string type() const {
+    virtual const std::string subType() const override {
         return "Lindemann";
     }
 };
@@ -358,7 +362,7 @@ class TroeRate final : public FalloffRate
         setFalloffCoeffs(c);
     }
 
-    unique_ptr<MultiRateBase> newMultiRate() const {
+    unique_ptr<MultiRateBase> newMultiRate() const override {
         return unique_ptr<MultiRateBase>(new MultiRate<TroeRate, FalloffData>);
     }
 
@@ -367,41 +371,42 @@ class TroeRate final : public FalloffRate
      * @param c Vector of three or four doubles: The doubles are the parameters,
      *          a, T_3, T_1, and (optionally) T_2 of the Troe parameterization
      */
-    virtual void setFalloffCoeffs(const vector_fp& c);
+    virtual void setFalloffCoeffs(const vector_fp& c) override;
 
-    virtual void getFalloffCoeffs(vector_fp& c) const;
+    virtual void getFalloffCoeffs(vector_fp& c) const override;
 
     //! Update the temperature parameters in the representation
     /*!
      *   @param T         Temperature (Kelvin)
      *   @param work      Vector of working space, length 1, representing the
      *                    temperature-dependent part of the parameterization.
      */
-    virtual void updateTemp(double T, double* work) const;
+    virtual void updateTemp(double T, double* work) const override;
 
-    virtual double F(double pr, const double* work) const;
+    virtual double F(double pr, const double* work) const override;
 
-    virtual size_t workSize() const {
+    virtual size_t workSize() const override {
         return 1;
     }
 
-    virtual const std::string type() const {
+    virtual const std::string subType() const override {
         return "Troe";
     }
 
-    virtual size_t nParameters() const {
+    virtual size_t nParameters() const override {
         return 4;
     }
 
-    virtual void setParameters(const AnyMap& node, const UnitStack& rate_units);
+    virtual void setParameters(
+        const AnyMap& node, const UnitStack& rate_units) override;
 
     //! Sets params to contain, in order, \f[ (A, T_3, T_1, T_2) \f]
     /**
      * @deprecated  To be removed after Cantera 3.0; superseded by getFalloffCoeffs()
      */
-    virtual void getParameters(double* params) const;
+    virtual void getParameters(double* params) const override;
 
-    virtual void getParameters(AnyMap& node) const;
+    virtual void getParameters(AnyMap& node) const override;
 
 protected:
     //! parameter a in the 4-parameter Troe falloff function. Dimensionless
@@ -460,7 +465,7 @@ class SriRate final : public FalloffRate
         setFalloffCoeffs(c);
     }
 
-    unique_ptr<MultiRateBase> newMultiRate() const {
+    unique_ptr<MultiRateBase> newMultiRate() const override {
         return unique_ptr<MultiRateBase>(new MultiRate<SriRate, FalloffData>);
     }
 
@@ -470,41 +475,42 @@ class SriRate final : public FalloffRate
      *          a, b, c, d (optional; default 1.0), and e (optional; default
      *          0.0) of the SRI parameterization
      */
-    virtual void setFalloffCoeffs(const vector_fp& c);
+    virtual void setFalloffCoeffs(const vector_fp& c) override;
 
-    virtual void getFalloffCoeffs(vector_fp& c) const;
+    virtual void getFalloffCoeffs(vector_fp& c) const override;
 
     //! Update the temperature parameters in the representation
     /*!
      *   @param T         Temperature (Kelvin)
      *   @param work      Vector of working space, length 2, representing the
      *                    temperature-dependent part of the parameterization.
      */
-    virtual void updateTemp(double T, double* work) const;
+    virtual void updateTemp(double T, double* work) const override;
 
-    virtual double F(double pr, const double* work) const;
+    virtual double F(double pr, const double* work) const override;
 
-    virtual size_t workSize() const {
+    virtual size_t workSize() const override {
         return 2;
     }
 
-    virtual const std::string type() const {
+    virtual const std::string subType() const override {
         return "SRI";
     }
 
-    virtual size_t nParameters() const {
+    virtual size_t nParameters() const override {
         return 5;
     }
 
-    virtual void setParameters(const AnyMap& node, const UnitStack& rate_units);
+    virtual void setParameters(
+        const AnyMap& node, const UnitStack& rate_units) override;
 
     //! Sets params to contain, in order, \f[ (a, b, c, d, e) \f]
     /**
      * @deprecated  To be removed after Cantera 3.0; superseded by getFalloffCoeffs()
      */
-    virtual void getParameters(double* params) const;
+    virtual void getParameters(double* params) const override;
 
-    virtual void getParameters(AnyMap& node) const;
+    virtual void getParameters(AnyMap& node) const override;
 
 protected:
     //! parameter a in the 5-parameter SRI falloff function. Dimensionless.
@@ -570,7 +576,7 @@ class TsangRate final : public FalloffRate
         setFalloffCoeffs(c);
     }
 
-    unique_ptr<MultiRateBase> newMultiRate() const {
+    unique_ptr<MultiRateBase> newMultiRate() const override {
         return unique_ptr<MultiRateBase>(new MultiRate<TsangRate, FalloffData>);
     }
 
@@ -579,41 +585,42 @@ class TsangRate final : public FalloffRate
      * @param c Vector of one or two doubles: The doubles are the parameters,
      *          a and (optionally) b of the Tsang F_cent parameterization
      */
-    virtual void setFalloffCoeffs(const vector_fp& c);
+    virtual void setFalloffCoeffs(const vector_fp& c) override;
 
-    virtual void getFalloffCoeffs(vector_fp& c) const;
+    virtual void getFalloffCoeffs(vector_fp& c) const override;
 
     //! Update the temperature parameters in the representation
     /*!
      *   @param T         Temperature (Kelvin)
      *   @param work      Vector of working space, length 1, representing the
      *                    temperature-dependent part of the parameterization.
      */
-    virtual void updateTemp(double T, double* work) const;
+    virtual void updateTemp(double T, double* work) const override;
 
-    virtual double F(double pr, const double* work) const;
+    virtual double F(double pr, const double* work) const override;
 
-    virtual size_t workSize() const {
+    virtual size_t workSize() const override {
         return 1;
     }
 
-    virtual const std::string type() const {
+    virtual const std::string subType() const override {
         return "Tsang";
     }
 
-    virtual size_t nParameters() const {
+    virtual size_t nParameters() const override {
         return 2;
     }
 
-    virtual void setParameters(const AnyMap& node, const UnitStack& rate_units);
+    virtual void setParameters(
+        const AnyMap& node, const UnitStack& rate_units) override;
 
     //! Sets params to contain, in order, \f[ (A, B) \f]
     /**
      * @deprecated  To be removed after Cantera 3.0; superseded by getFalloffCoeffs()
      */
-    virtual void getParameters(double* params) const;
+    virtual void getParameters(double* params) const override;
 
-    virtual void getParameters(AnyMap& node) const;
+    virtual void getParameters(AnyMap& node) const override;
 
 protected:
     //! parameter a in the Tsang F_cent formulation. Dimensionless