Preamble to InterfaceKinetics refactoring

.github/workflows/main.yml

@@ -348,6 +348,34 @@ jobs:
     - name: Test Cantera
       run: python3 `which scons` test show_long_tests=yes verbose_tests=yes
 
+  check-deprecations:
+    name: Run test suite without legacy typedefs
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      name: Checkout the repository
+      with:
+        submodules: recursive
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+        architecture: x64
+    - name: Install Apt dependencies
+      run: |
+        sudo apt update
+        sudo apt install libboost-dev gfortran libopenmpi-dev
+    - name: Upgrade pip
+      run: python3 -m pip install -U pip setuptools wheel
+    - name: Install Python dependencies
+      run: python3 -m pip install ruamel.yaml scons numpy cython h5py pandas pytest
+        pytest-github-actions-annotate-failures
+    - name: Build Cantera
+      run: python3 `which scons` build env_vars=all -j2 debug=n --debug=time no_legacy_reactions=y
+    - name: Test Cantera
+      run:
+        python3 `which scons` test show_long_tests=yes verbose_tests=yes --debug=time
+
   windows:
     name: ${{ matrix.os }}, MSVC ${{ matrix.vs-toolset }}, Python ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
@@ -517,7 +545,7 @@ jobs:
     - name: Set Up Python
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: 3.8
         architecture: x64
     - name: Install Python dependencies
       run: |

SConstruct

@@ -584,6 +584,13 @@ config_options = [
            definitions (see Eq. 9.75 in Kee, Coltrin and Glarborg, 'Chemically Reacting
            Flow', Wiley Interscience, 2003).""",
         True),
+    BoolOption(
+        "no_legacy_reactions",
+        """If disabled ('no'/default), legacy 'Reaction' and associated rate objects
+           that are deprecated in Cantera 2.6 are used. If enabled ('yes'), internal
+           objects will use new objects introduced in Cantera 2.6. The flag is used
+           for testing purposes only and has no effect on results.""",
+        False),
 ]
 
 config = Configuration()
@@ -1759,6 +1766,7 @@ cdefine("CT_USE_SYSTEM_EIGEN_PREFIXED", "system_eigen_prefixed")
 cdefine('CT_USE_SYSTEM_FMT', 'system_fmt')
 cdefine('CT_USE_SYSTEM_YAMLCPP', 'system_yamlcpp')
 cdefine('CT_USE_DEMANGLE', 'has_demangle')
+cdefine("CT_NO_LEGACY_REACTIONS_26", "no_legacy_reactions")
 
 config_h_build = env.Command('build/src/config.h.build',
                              'include/cantera/base/config.h.in',

doc/sphinx/cython/kinetics.rst

@@ -71,12 +71,17 @@ BlowersMaselInterfaceReaction
    :no-undoc-members:
 
 Reaction Rates
----------------------------------------
+--------------
 
 ReactionRate
 ^^^^^^^^^^^^
 .. autoclass:: ReactionRate()
 
+ArrheniusTypeRate
+^^^^^^^^^^^^^^^^^
+.. autoclass:: ArrheniusTypeRate(input_data)
+   :no-undoc-members:
+
 ArrheniusRate
 ^^^^^^^^^^^^^
 .. autoclass:: ArrheniusRate(A, b, Ea)
@@ -87,6 +92,11 @@ BlowersMaselRate
 .. autoclass:: BlowersMaselRate(A, b, Ea, w)
    :no-undoc-members:
 
+TwoTempPlasmaRate
+^^^^^^^^^^^^^^^^^
+.. autoclass:: TwoTempPlasmaRate(A, b, Ea_gas, Ea_electron)
+   :no-undoc-members:
+
 FalloffRate
 ^^^^^^^^^^^
 .. autoclass:: FalloffRate()

include/cantera/base/config.h.in

@@ -82,4 +82,7 @@ typedef int ftnlen;       // Fortran hidden string length type
 //    Use legacy rate constant by default
 {CT_LEGACY_RATE_CONSTANTS!s}
 
+//    Do not use reactions deprecated in Cantera 2.6
+{CT_NO_LEGACY_REACTIONS_26!s}
+
 #endif