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

Fixed an issue that arose when there was a mixed set of standard

Browse source 
state types.
This commit is contained in:
Harry Moffat 2009-03-04 01:01:57 +00:00
parent d61b277fff
commit f999f1cfc0
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Cantera/src/thermo/VPSSMgrFactory.cpp
View file

@ -301,9 +301,19 @@ namespace Cantera {
if (iwater == 1) {
if (ihptx == 0) {
vpss = new VPSSMgr_Water_ConstVol(vp_ptr, spth);
if (inasaIG || ishomateIG || isimpleIG) {
throw CanteraError("newVPSSMgr", "Ideal gas with liquid water");
} else {
vpss = new VPSSMgr_Water_ConstVol(vp_ptr, spth);
}
} else {
vpss = new VPSSMgr_Water_HKFT(vp_ptr, spth);
if (inasaIG || ishomateIG || isimpleIG) {
throw CanteraError("newVPSSMgr", "Ideal gas with liquid water");
} else if (inasaCV || ishomateCV || isimpleCV) {
vpss = new VPSSMgr_General(vp_ptr, spth);
} else {
vpss = new VPSSMgr_Water_HKFT(vp_ptr, spth);
}
}
}
if (vpss == 0) {