[Thermo] Check for null species thermo when adding species

Cantera · Nov 15, 2016 · b7fad42 · b7fad42
1 parent 6dc92b6
commit b7fad42
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp
@@ -714,6 +714,10 @@ void ThermoPhase::installSlavePhases(XML_Node* phaseNode)
 
 bool ThermoPhase::addSpecies(shared_ptr<Species> spec)
 {
+    if (!spec->thermo) {
+        throw CanteraError("ThermoPhase::addSpecies",
+            "Species {} has no thermo data", spec->name);
+    }
     bool added = Phase::addSpecies(spec);
     if (added) {
         spec->thermo->validate(spec->name);
@@ -725,6 +729,10 @@ bool ThermoPhase::addSpecies(shared_ptr<Species> spec)
 
 void ThermoPhase::modifySpecies(size_t k, shared_ptr<Species> spec)
 {
+    if (!spec->thermo) {
+        throw CanteraError("ThermoPhase::modifySpecies",
+            "Species {} has no thermo data", spec->name);
+    }
     Phase::modifySpecies(k, spec);
     if (speciesName(k) != spec->name) {
         throw CanteraError("ThermoPhase::modifySpecies",