From 255896715c0562323aa75ca8ff1e894362f8403b Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 12 Apr 2013 23:05:59 +0000 Subject: [PATCH] Allow RedlichKwongMFTP objects to be constructed by newThermoPhase --- src/thermo/ThermoFactory.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/thermo/ThermoFactory.cpp b/src/thermo/ThermoFactory.cpp index aa28f786e..90d52a552 100644 --- a/src/thermo/ThermoFactory.cpp +++ b/src/thermo/ThermoFactory.cpp @@ -65,7 +65,7 @@ ThermoFactory* ThermoFactory::s_factory = 0; mutex_t ThermoFactory::thermo_mutex; //! Define the number of %ThermoPhase types for use in this factory routine -static int ntypes = 24; +static int ntypes = 26; //! Define the string name of the %ThermoPhase types that are handled by this factory routine static string _types[] = {"IdealGas", "Incompressible", @@ -75,7 +75,8 @@ static string _types[] = {"IdealGas", "Incompressible", "IdealMolalSolution", "IdealGasVPSS", "IdealSolnVPSS", "MineralEQ3", "MetalSHEelectrons", "Margules", "PhaseCombo_Interaction", "IonsFromNeutralMolecule", "FixedChemPot", "MolarityIonicVPSSTP", - "MixedSolventElectrolyte", "Redlich-Kister" + "MixedSolventElectrolyte", "Redlich-Kister", "RedlichKwong", + "RedlichKwongMFTP" }; //! Define the integer id of the %ThermoPhase types that are handled by this factory routine @@ -86,7 +87,8 @@ static int _itypes[] = {cIdealGas, cIncompressible, cIdealMolalSoln, cVPSS_IdealGas, cIdealSolnGasVPSS_iscv, cMineralEQ3, cMetalSHEelectrons, cMargulesVPSSTP, cPhaseCombo_Interaction, cIonsFromNeutral, cFixedChemPot, - cMolarityIonicVPSSTP, cMixedSolventElectrolyte, cRedlichKisterVPSSTP + cMolarityIonicVPSSTP, cMixedSolventElectrolyte, cRedlichKisterVPSSTP, + cRedlichKwongMFTP, cRedlichKwongMFTP }; ThermoPhase* ThermoFactory::newThermoPhase(const std::string& model)