[thermo] Raise IndexError for invalid species index

Cantera · Jan 18, 2021 · 17b70eb · 17b70eb
1 parent a531922
commit 17b70eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/interfaces/cython/cantera/test/test_thermo.py b/interfaces/cython/cantera/test/test_thermo.py
@@ -65,6 +65,8 @@ def test_species(self):
             self.assertEqual(name, self.phase.species_name(i))
             self.assertEqual(i, self.phase.species_index(name))
             self.assertEqual(i, self.phase.species_index(i))
+        with self.assertRaisesRegex(ct.CanteraError, 'IndexError thrown by Phase::checkSpeciesIndex'):
+            self.phase.species(self.phase.n_species)
 
     def test_elements(self):
         self.assertEqual(self.phase.n_elements, 3)

diff --git a/src/thermo/Phase.cpp b/src/thermo/Phase.cpp
@@ -990,6 +990,7 @@ shared_ptr<Species> Phase::species(const std::string& name) const
 
 shared_ptr<Species> Phase::species(size_t k) const
 {
+    checkSpeciesIndex(k);
     return m_species.at(m_speciesNames[k]);
 }