From 8742d6addb3ae93d3273290f7ce3e202a2f9b59b Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Wed, 9 Nov 2011 18:39:51 +0000
Subject: [PATCH] Added MolarityIonicVPSS to the ThermoFactory

---
 Cantera/src/thermo/MolarityIonicVPSSTP.cpp | 9 ++++-----
 Cantera/src/thermo/ThermoFactory.cpp       | 4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Cantera/src/thermo/MolarityIonicVPSSTP.cpp b/Cantera/src/thermo/MolarityIonicVPSSTP.cpp
index 1e7831ba9..99f715427 100644
--- a/Cantera/src/thermo/MolarityIonicVPSSTP.cpp
+++ b/Cantera/src/thermo/MolarityIonicVPSSTP.cpp
@@ -261,10 +261,9 @@ namespace Cantera {
      */ 
     stemp = thermoNode.attrib("model");
     string formString = lowercase(stemp);
-    if (formString != "molarityionicvpss") {
+    if (formString != "molarityionicvpss" && formString != "molarityionicvpsstp") {
       throw CanteraError("MolarityIonicVPSSTP::constructPhaseXML",
-			 "model name isn't MolarityIonicVPSS: " + formString);
-    
+			 "model name isn't MolarityIonicVPSSTP: " + formString);
     }
 
     /*
@@ -713,9 +712,9 @@ namespace Cantera {
     XML_Node& thermoNode = phaseNode.child("thermo");
     std::string mStringa = thermoNode.attrib("model");
     std::string mString = lowercase(mStringa);
-    if (mString != "molarityionicvpss") {
+    if (mString != "molarityionicvpss" && mString != "molarityionicvpsstp") {
       throw CanteraError(subname.c_str(),
-			 "Unknown thermo model: " + mStringa + " - This object only knows \"MolarityIonicVPSS\" ");
+			 "Unknown thermo model: " + mStringa + " - This object only knows \"MolarityIonicVPSSTP\" ");
     }
     /*
      * Go get all of the coefficients and factors in the
diff --git a/Cantera/src/thermo/ThermoFactory.cpp b/Cantera/src/thermo/ThermoFactory.cpp
index 0cf6338fc..ea51c3f6d 100644
--- a/Cantera/src/thermo/ThermoFactory.cpp
+++ b/Cantera/src/thermo/ThermoFactory.cpp
@@ -167,6 +167,10 @@ namespace Cantera {
       th = new RedlichKisterVPSSTP();
       break;
 
+    case cMolarityIonicVPSSTP:
+      th = new MolarityIonicVPSSTP();
+      break;
+
     case cPhaseCombo_Interaction:
       th = new PhaseCombo_Interaction();
       break;