From 0ee5420b4b2db2c2061998a5bc05d10c9a07498a Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Sat, 2 Aug 2003 00:36:33 +0000
Subject: [PATCH] Added a specific named error condition for when the thermo
 factory can't find a match against a known ThermoPhase derivative class. This
 can be (and is in cttables) used to catch thrown errors, so that the kernel
 can be made extensible wrt other ThermoPhase derivative classes it may not
 know about.

---
 Cantera/src/ThermoFactory.cpp | 73 +----------------------------------
 Cantera/src/ThermoFactory.h   | 11 ++++++
 2 files changed, 13 insertions(+), 71 deletions(-)

diff --git a/Cantera/src/ThermoFactory.cpp b/Cantera/src/ThermoFactory.cpp
index 32a35d271..ac3c78682 100644
--- a/Cantera/src/ThermoFactory.cpp
+++ b/Cantera/src/ThermoFactory.cpp
@@ -68,78 +68,9 @@ namespace Cantera {
             break;
 
         default:
-            throw CanteraError("newThermo",
-                "newThermo: unknown equation of state: "+model);
+	    throw UnknownThermoPhaseModel("ThermoFactory::newThermoPhase",
+					  model);
         }
         return th;
     }
-
-//     /**
-//      * Return a thermo manager to handle the parameterizations
-//      * specified in a CTML phase specification.
-//      */
-//     ThermoPhase* ThermoFactory::newThermo(XML_Node& root, string id) {
-
-//         // Find the node with the specified id, check that it is
-//         // a 'phase' node, and set the phase id to 'id'.
-//         XML_Node* ph;
-//         ph = root.findID(id);
-//         if (ph == 0) return 0; // false;   // id not found
-//         XML_Node& node = *ph;
-
-//         if (node.name() != "phase") 
-//             throw CanteraError("newThermo","node with id = "+id
-//                 +" is not a phase object.");
-
-//         //Phase* p = new Phase;
-//         //p->setID(id);                // set the phase id
-
-//         // get equaton of state type
-//         XML_Node& eos = node.child("thermo");
-//         string eostype = eos["model"];
-//         int ieos=-1;
-//         for (int n = 0; n < ntypes; n++) {
-//             if (eostype == _types[n]) ieos = _itypes[n];
-//         }
-
-//         // build species thermo manager
-//         SpeciesThermo* spthermo = newSpeciesThermoMgr(&node);
-
-//         ThermoPhase* th=0;
-//         //        doublereal dens;
-//         map<string, double> d;
-//         switch (ieos) {
-
-//         case cIdealGas:
-//             th = new IdealGasPhase;
-//             break;
-
-//         case cIncompressible:
-//             th = new ConstDensityThermo;
-//             break;
-
-//         case cSurf:
-//             th = new SurfPhase;
-//             break;
-
-//         case cMetal:
-//             th = new MetalPhase;
-//             break;
-
-//         case cSolidCompound:
-//             th = new SolidCompound;
-//             break;
-
-//         default:
-//             throw CanteraError("newThermo",
-//                 "newThermo: unknown equation of state: "+eostype);
-//         }
-//         th->setSpeciesThermo(spthermo);
-
-//         // import the phase specification
-//         importPhase(node, th);
-
-//         return th;
-//     }
-
 }
diff --git a/Cantera/src/ThermoFactory.h b/Cantera/src/ThermoFactory.h
index a82b7a8af..9703a7f0a 100644
--- a/Cantera/src/ThermoFactory.h
+++ b/Cantera/src/ThermoFactory.h
@@ -17,8 +17,19 @@
 #include "ThermoPhase.h"
 #include "xml.h"
 
+
 namespace Cantera {
 
+
+    class UnknownThermoPhaseModel : public CanteraError {
+    public:
+	UnknownThermoPhaseModel(string proc, string thermoModel) :
+	    CanteraError(proc, "Specified ThermoPhase model "   
+			 + thermoModel + 
+			 " does not match any known type.") {}
+	virtual ~UnknownThermoPhaseModel() {}
+    };
+
     /**
      * Factory for thermodynamic property managers.
      */