research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix incorrect references to SpeciesThermo from VPSSMgr

Browse source
This commit is contained in:
Ray Speth 2015-07-13 18:48:23 -04:00
parent 7d36e1eb13
commit 9e8b8e4f63
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/thermo/VPSSMgrFactory.cpp
View file

@ -252,7 +252,7 @@ VPSSMgrFactory::newVPSSMgr(VPStandardStateTP* vp_ptr,
try {
getVPSSMgrTypes(spDataNodeList, inasaIG, inasaCV, ishomateIG, ishomateCV,
isimpleIG, isimpleCV, iwater, itpx, ihptx, iother);
} catch (UnknownSpeciesThermoModel) {
} catch (UnknownVPSSMgrModel) {
iother = 1;
popError();
}

10
src/thermo/VPSSMgrFactory.h
View file

@ -150,7 +150,7 @@ private:
////////////////////// Convenience functions ////////////////////
//
// These functions allow using a different factory class that
// derives from SpeciesThermoFactory.
// derives from VPSSMgrFactory.
//
//////////////////////////////////////////////////////////////////
@ -163,12 +163,12 @@ private:
* and return the proper species property manager to use.
*
* These functions allow using a different factory class that
* derives from SpeciesThermoFactory.
* derives from VPSSMgrFactory.
*
* @param type Species thermo type.
* @param vp_ptr Variable pressure standard state ThermoPhase object
* that will be the owner.
* @param f Pointer to a SpeciesThermoFactory. optional parameter.
* @param f Pointer to a VPSSMgrFactory. optional parameter.
* Defaults to NULL.
*/
VPSSMgr* newVPSSMgr(VPSSMgr_enumType type,
@ -181,14 +181,14 @@ VPSSMgr* newVPSSMgr(VPSSMgr_enumType type,
* and return the proper species property manager to use.
*
* These functions allow using a different factory class that
* derives from SpeciesThermoFactory.
* derives from VPSSMgrFactory.
*
* @param vp_ptr Variable pressure standard state ThermoPhase object
* that will be the owner.
* @param phaseNode_ptr Pointer to the ThermoPhase phase XML Node
* @param spDataNodeList This vector contains a list
* of species XML nodes that will be in the phase
* @param f Pointer to a SpeciesThermoFactory. optional
* @param f Pointer to a VPSSMgrFactory. optional
* parameter. Defaults to NULL.
*/
VPSSMgr* newVPSSMgr(VPStandardStateTP* vp_ptr,