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

Adding in HKFT parameterization

Browse source
This commit is contained in:
Harry Moffat 2008-08-20 19:52:29 +00:00
parent f36a5c4863
commit 2c29a41bcf
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Cantera/src/thermo/HKFT_PDSS.cpp
View file

@ -17,6 +17,8 @@ namespace Cantera {
HKFT_PDSS::HKFT_PDSS(ThermoPhase *tp, int spindex) : HKFT_PDSS::HKFT_PDSS(ThermoPhase *tp, int spindex) :
PDSS(tp, spindex) PDSS(tp, spindex)
{ {
@ -343,5 +345,12 @@ namespace Cantera {
return (0.0); return (0.0);
} }
//! Internal formula for the calculation of a_g()
double HKFT_PDSS::ag(const double temp) const {
static double ag_coeff[3] = { -2.037662, 5.747000E-3, -6.557892E-6};
double t2 = temp * temp;
double val = ag_coeff[0] + ag_coeff[1] * temp * ag_coeff[2] * t2;
return val;
}
} }

3
Cantera/src/thermo/HKFT_PDSS.h
View file

@ -134,6 +134,9 @@ namespace Cantera {
virtual void initThermo(); virtual void initThermo();
virtual void setParametersFromXML(const XML_Node& eosdata); virtual void setParametersFromXML(const XML_Node& eosdata);
private:
double ag(const double temp) const;
protected: protected:

4
Cantera/src/thermo/Makefile.in
View file

@ -58,13 +58,13 @@ ELECTRO_OBJ = MolalityVPSSTP.o VPStandardStateTP.o \
WaterPropsIAPWSphi.o WaterPropsIAPWS.o WaterProps.o \ WaterPropsIAPWSphi.o WaterPropsIAPWS.o WaterProps.o \
PDSS.o WaterPDSS.o \ PDSS.o WaterPDSS.o \
HMWSoln.o HMWSoln_input.o DebyeHuckel.o \ HMWSoln.o HMWSoln_input.o DebyeHuckel.o \
IdealGasPDSS.o WaterSSTP.o IdealGasPDSS.o WaterSSTP.o HKFT_PDSS.o
ELECTRO_H = MolalityVPSSTP.h VPStandardStateTP.h \ ELECTRO_H = MolalityVPSSTP.h VPStandardStateTP.h \
IdealMolalSoln.h \ IdealMolalSoln.h \
WaterPropsIAPWSphi.h WaterPropsIAPWS.h WaterProps.h \ WaterPropsIAPWSphi.h WaterPropsIAPWS.h WaterProps.h \
PDSS.h WaterPDSS.h HMWSoln.h electrolytes.h \ PDSS.h WaterPDSS.h HMWSoln.h electrolytes.h \
DebyeHuckel.h IdealGasPDSS.h WaterSSTP.h DebyeHuckel.h IdealGasPDSS.h WaterSSTP.h HKFT_PDSS.h
endif endif
ifeq ($(do_issp),1) ifeq ($(do_issp),1)
ISSP_OBJ = IdealSolidSolnPhase.o StoichSubstanceSSTP.o SingleSpeciesTP.o ISSP_OBJ = IdealSolidSolnPhase.o StoichSubstanceSSTP.o SingleSpeciesTP.o