Merge 065b194 into 4570f3e

include/cantera/base/global.h

@@ -215,6 +215,9 @@ void warn_user(const std::string& method, const std::string& msg,
 //! @copydoc Application::make_deprecation_warnings_fatal
 void make_deprecation_warnings_fatal();
 
+//! @copydoc Application::make_warnings_fatal
+void make_warnings_fatal();
+
 //! @copydoc Application::suppress_thermo_warnings
 void suppress_thermo_warnings(bool suppress=true);
 

include/cantera/kinetics/Kinetics.h

@@ -873,6 +873,9 @@ class Kinetics
         m_root = root;
     }
 
+    //! Caltulate the reaction enthalpy of a reaction which
+    //! has not been added into kinetics object
+    virtual double reactionEnthalpy(const Composition& reactants, const Composition& products);
 protected:
     //! Cache for saved calculations within each Kinetics object.
     ValueCache m_cache;

include/cantera/kinetics/Reaction.h

@@ -58,6 +58,12 @@ class Reaction
     //! valid.
     virtual void validate();
 
+    //! New validate function takes kinetics object as the input
+    //! Perform validation checks that need access to a complete
+    //! Kinetics objects, for example to retrieve information about
+    //! reactant / product species.
+    virtual void validate(Kinetics& kin){};
+
     //! Return the parameters such that an identical Reaction could be reconstructed
     //! using the newReaction() function. Behavior specific to derived classes is
     //! handled by the getParameters() method.
@@ -188,7 +194,9 @@ class ElementaryReaction2 : public Reaction
     ElementaryReaction2();
     ElementaryReaction2(const Composition& reactants, const Composition products,
                         const Arrhenius& rate);
+
     virtual void validate();
+    virtual void validate(Kinetics& kin){};
     virtual void getParameters(AnyMap& reactionNode) const;
 
     virtual std::string type() const {
@@ -269,7 +277,9 @@ class FalloffReaction : public Reaction
 
     virtual std::string reactantString() const;
     virtual std::string productString() const;
+
     virtual void validate();
+    virtual void validate(Kinetics& kin){};
     virtual void calculateRateCoeffUnits(const Kinetics& kin);
     virtual void getParameters(AnyMap& reactionNode) const;
 
@@ -333,6 +343,7 @@ class PlogReaction2 : public Reaction
     }
 
     virtual void validate();
+    virtual void validate(Kinetics& kin){};
     virtual void getParameters(AnyMap& reactionNode) const;
 
     Plog rate;
@@ -383,6 +394,8 @@ class InterfaceReaction : public ElementaryReaction2
     virtual void calculateRateCoeffUnits(const Kinetics& kin);
     virtual void getParameters(AnyMap& reactionNode) const;
 
+    virtual void validate(Kinetics& kin);
+
     virtual std::string type() const {
         return "interface";
     }
@@ -433,8 +446,9 @@ class BlowersMaselReaction: public Reaction
     BlowersMaselReaction(const Composition& reactants,
                          const Composition& products, const BlowersMasel& rate);
     virtual void getParameters(AnyMap& reactionNode) const;
-    virtual void validate();
 
+    virtual void validate();
+    virtual void validate(Kinetics& kin){};
     virtual std::string type() const {
         return "Blowers-Masel";
     }
@@ -455,6 +469,7 @@ class BlowersMaselInterfaceReaction : public BlowersMaselReaction
                       const BlowersMasel& rate, bool isStick=false);
     virtual void getParameters(AnyMap& reactionNode) const;
     virtual void calculateRateCoeffUnits(const Kinetics& kin);
+    virtual void validate(Kinetics& kin);
 
     virtual std::string type() const {
         return "surface-Blowers-Masel";
@@ -674,5 +689,4 @@ void setupBlowersMaselReaction(BlowersMaselReaction&,
 void setupBlowersMaselInterfaceReaction(BlowersMaselInterfaceReaction&,
                                         const AnyMap&, const Kinetics&);
 }
-
 #endif

include/cantera/kinetics/RxnRates.h

@@ -102,6 +102,10 @@ class Arrhenius
         return m_E;
     }
 
+    //! Check to make sure that the sticking coefficient is
+    //! less than 1 over a range of temperatures
+    void validate(const std::string& equation);
+
 protected:
     doublereal m_logA, m_b, m_E, m_A;
 };

interfaces/cython/cantera/_cantera.pxd

@@ -131,6 +131,7 @@ cdef extern from "cantera/base/global.h" namespace "Cantera":
     cdef XML_Node* CxxGetXmlFile "Cantera::get_XML_File" (string) except +translate_exception
     cdef XML_Node* CxxGetXmlFromString "Cantera::get_XML_from_string" (string) except +translate_exception
     cdef void Cxx_make_deprecation_warnings_fatal "Cantera::make_deprecation_warnings_fatal" ()
+    cdef void Cxx_make_warnings_fatal "Cantera::make_warnings_fatal" ()
     cdef void Cxx_suppress_deprecation_warnings "Cantera::suppress_deprecation_warnings" ()
     cdef void Cxx_suppress_thermo_warnings "Cantera::suppress_thermo_warnings" (cbool)
     cdef void Cxx_use_legacy_rate_constants "Cantera::use_legacy_rate_constants" (cbool)

interfaces/cython/cantera/test/test_kinetics.py

@@ -466,6 +466,23 @@ def test_pdep_err(self):
             for msg in err_msg:
                 self.assertIn(msg, err_msg_list)
 
+    def test_sticking_coeff_err(self):
+        err_msg = ("Sticking coefficient is bigger than 1 for reaction \'O2 \+ 2 PT\(S\) => 2 O\(S\)\'",
+                   "at T = 200.0",
+                   "at T = 500.0",
+                   "at T = 1000.0",
+                   "at T = 2000.0",
+                   "at T = 5000.0",
+                   "at T = 10000.0",
+                   "Sticking coefficient is bigger than 1 for reaction",
+                   "CanteraError thrown by InterfaceReaction::validate:",
+                   "CanteraError thrown by BlowersMaselInterfaceReaction::validate:"
+                   )
+        ct.make_warnings_fatal()
+        for err in err_msg:
+            with self.assertRaisesRegex(ct.CanteraError, err):
+                gas = ct.Solution('sticking_coeff_check.yaml')
+                surface = ct.Interface('sticking_coeff_check.yaml', 'Pt_surf', [gas])
 
 class TestUndeclared(utilities.CanteraTest):
 

interfaces/cython/cantera/utils.pyx

@@ -67,6 +67,9 @@ def make_deprecation_warnings_fatal():
                             message='.*Cantera.*')  # for warnings in Cython code
     Cxx_make_deprecation_warnings_fatal()
 
+def make_warnings_fatal():# for warnings in Cython code
+    Cxx_make_warnings_fatal()
+
 def suppress_deprecation_warnings():
     warnings.filterwarnings('ignore', category=DeprecationWarning,
                             module='cantera')  # for warnings in Python code

src/base/application.cpp

@@ -127,6 +127,7 @@ Application::Application() :
     m_suppress_deprecation_warnings(false),
     m_fatal_deprecation_warnings(false),
     m_suppress_thermo_warnings(false),
+    m_fatal_warnings(false),
 #if CT_LEGACY_RATE_CONSTANTS
     m_use_legacy_rate_constants(true)
 #else
@@ -182,6 +183,9 @@ void Application::warn_deprecated(const std::string& method,
 void Application::warn_user(const std::string& method,
                             const std::string& extra)
 {
+    if (m_fatal_warnings) {
+        throw CanteraError(method, extra);
+    }
     writelog(fmt::format("CanteraWarning: {}: {}", method, extra));
     writelogendl();
 }

src/base/application.h

@@ -354,6 +354,12 @@ class Application
     //! information can be specified in *extra*.
     void warn_user(const std::string& method, const std::string& extra="");
 
+    //! Turns Cantera warnings into exceptions. Activated within the test
+    //! suite to make sure that your warning message are being raised.
+    void make_warnings_fatal() {
+        m_fatal_warnings = true;
+    }
+
     //! Globally disable printing of warnings about problematic thermo data,
     //! e.g. NASA polynomials with discontinuities at the midpoint temperature.
     void suppress_thermo_warnings(bool suppress=true) {
@@ -453,6 +459,7 @@ class Application
     bool m_suppress_deprecation_warnings;
     bool m_fatal_deprecation_warnings;
     bool m_suppress_thermo_warnings;
+    bool m_fatal_warnings;
     bool m_use_legacy_rate_constants;
 
     ThreadMessages pMessenger;

src/base/global.cpp

@@ -71,6 +71,11 @@ void make_deprecation_warnings_fatal()
     app()->make_deprecation_warnings_fatal();
 }
 
+void make_warnings_fatal()
+{
+    app()->make_warnings_fatal();
+}
+
 void suppress_thermo_warnings(bool suppress)
 {
     app()->suppress_thermo_warnings(suppress);

src/kinetics/Kinetics.cpp

@@ -512,6 +512,8 @@ void Kinetics::resizeSpecies()
 bool Kinetics::addReaction(shared_ptr<Reaction> r, bool resize)
 {
     r->validate();
+    r->validate(*this);
+
     if (m_kk == 0) {
         init();
     }
@@ -631,4 +633,24 @@ shared_ptr<const Reaction> Kinetics::reaction(size_t i) const
     return m_reactions[i];
 }
 
+double Kinetics::reactionEnthalpy(const Composition& reactants, const Composition& products)
+{
+    vector_fp hk(nTotalSpecies());
+    for (size_t n = 0; n < nPhases(); n++) {
+        thermo(n).getPartialMolarEnthalpies(&hk[m_start[n]]);
+    }
+    double rxn_deltaH = 0;
+    for (const auto& product : products) {
+        size_t k = kineticsSpeciesIndex(product.first);
+        double stoich = product.second;
+        rxn_deltaH += hk[k] * stoich;
+    }
+    for (const auto& reactant : reactants) {
+            size_t k = kineticsSpeciesIndex(reactant.first);
+            double stoich = reactant.second;
+            rxn_deltaH -= hk[k] * stoich;
+        }
+    return rxn_deltaH;
+}
+
 }

src/kinetics/Reaction.cpp

@@ -765,6 +765,26 @@ void InterfaceReaction::getParameters(AnyMap& reactionNode) const
     }
 }
 
+void InterfaceReaction::validate(Kinetics& kin)
+{
+    if (is_sticking_coefficient) {
+        fmt::memory_buffer err_reactions;
+        double T[] = {200.0, 500.0, 1000.0, 2000.0, 5000.0, 10000.0};
+        for (size_t i=0; i < 6; i++) {
+            double k = rate.updateRC(log(T[i]), 1/T[i]);
+            if (k > 1) {
+                fmt_append(err_reactions,
+                          "\n Sticking coefficient is bigger than 1 for reaction '{}'\n"
+                          " at T = {:.1f}\n",
+                          equation(), T[i]);
+            }
+        }
+        if (err_reactions.size()) {
+            warn_user("InterfaceReaction::validate", to_string(err_reactions));
+        }
+    }
+}
+
 ElectrochemicalReaction::ElectrochemicalReaction()
     : beta(0.5)
     , exchange_current_density_formulation(false)
@@ -883,6 +903,33 @@ void BlowersMaselInterfaceReaction::getParameters(AnyMap& reactionNode) const
     }
 }
 
+void BlowersMaselInterfaceReaction::validate(Kinetics& kin)
+{
+    if (is_sticking_coefficient) {
+        double original_T = kin.thermo().temperature();
+        double original_P = kin.thermo().pressure();
+        fmt::memory_buffer err_reactions;
+        double T[] = {200.0, 500.0, 1000.0, 2000.0, 5000.0, 10000.0};
+        size_t length_T = sizeof(T) / sizeof(T[0]);
+        for (size_t i=0; i < length_T; i++) {
+            kin.thermo().setState_TP(T[i], original_P);
+            double rxn_deltaH = kin.reactionEnthalpy(reactants, products);
+            double k = rate.updateRC(log(T[i]), 1/T[i], rxn_deltaH);
+            if (k > 1) {
+                fmt_append(err_reactions,
+                          "\n Sticking coefficient is bigger than 1 for reaction '{}'\n"
+                          " at T = {:.1f}\n",
+                          equation(), T[i]);
+            }
+
+        }
+        kin.thermo().setState_TP(original_T, original_P);
+        if (err_reactions.size()) {
+            warn_user("BlowersMaselInterfaceReaction::validate", to_string(err_reactions));
+        }
+    }
+}
+
 ElementaryReaction3::ElementaryReaction3()
 {
     setRate(newReactionRate(type()));
@@ -1834,6 +1881,7 @@ std::vector<shared_ptr<Reaction>> getReactions(const AnyValue& items,
     for (const auto& node : items.asVector<AnyMap>()) {
         shared_ptr<Reaction> R(newReaction(node, kinetics));
         R->validate();
+        R->validate(kinetics);
         if (R->valid() && R->checkSpecies(kinetics)) {
             all_reactions.emplace_back(R);
         }

test/data/sticking_coeff_check.yaml

@@ -0,0 +1,56 @@
+units: {length: cm, quantity: mol, activation-energy: J/mol}
+
+phases:
+- name: gas
+  thermo: ideal-gas
+  elements: [O, H, C, N, Ar]
+  species:
+  - gri30.yaml/species: [ O2, OH]
+  skip-undeclared-elements: true
+  kinetics: gas
+  reactions:
+  - gri30.yaml/reactions: declared-species
+  transport: mixture-averaged
+- name: Pt_surf
+  thermo: ideal-surface
+  elements: [Pt, H, O, C]
+  species: [{Pt-surf-species: all}]
+  kinetics: surface
+  reactions: [Pt-reactions]
+
+Pt-surf-species:
+- name: PT(S)
+  composition: {Pt: 1}
+  thermo:
+    model: NASA7
+    temperature-ranges: [300.0, 1000.0, 3000.0]
+    data:
+    - [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+    - [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+- name: OH(S)
+  composition: {O: 1, H: 1, Pt: 1}
+  thermo:
+    model: NASA7
+    temperature-ranges: [300.0, 1000.0, 3000.0]
+    data:
+    - [-2.0340881, 9.3662683e-03, 6.6275214e-07, -5.2074887e-09, 1.7088735e-12,
+      -2.5319949e+04, 8.9863186]
+    - [1.8249973, 3.2501565e-03, -3.1197541e-07, -3.4603206e-10, 7.9171472e-14,
+      -2.6685492e+04, -12.280891]
+- name: O(S)
+  composition: {O: 1, Pt: 1}
+  thermo:
+    model: NASA7
+    temperature-ranges: [300.0, 1000.0, 3000.0]
+    data:
+    - [-0.94986904, 7.4042305e-03, -1.0451424e-06, -6.112042e-09, 3.3787992e-12,
+      -1.3209912e+04, 3.6137905]
+    - [1.945418, 9.1761647e-04, -1.1226719e-07, -9.9099624e-11, 2.4307699e-14,
+      -1.4005187e+04, -11.531663]
+
+Pt-reactions:
+- equation: O2 + 2 PT(S) => 2 O(S)  # Reaction 1
+  sticking-coefficient: {A: 2.0, b: 0, Ea: 0}
+- equation: OH + PT(S) => OH(S)  # Reaction 2
+  type: Blowers-Masel
+  sticking-coefficient: {A: 2.0, b: 0, Ea0: 0, w: 100000}