Added Peng/Robinson gas parameters and molar volume for solids to keyword PHASES

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8538 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-03-01 07:31:56 +00:00
parent c43019c496
commit 3f0cd06d6e
2 changed files with 3 additions and 1 deletions

View File

@ -160,7 +160,7 @@
// Typedefs and structure definitions
//
typedef enum { kcal, cal, kjoules, joules } DELTA_H_UNIT;
typedef enum { cm3_per_mol } DELTA_V_UNIT;
typedef enum { cm3_per_mol, dm3_per_mol, m3_per_mol } DELTA_V_UNIT;
enum entity_type
{ Solution, Reaction, Exchange, Surface, Gas_phase, Pure_phase, Ss_phase,
Kinetics, Mix, Temperature, Pressure, UnKnown

View File

@ -2987,11 +2987,13 @@ read_phase_vm(char *ptr, LDBLE * delta_v, DELTA_V_UNIT * units)
{
/* Convert dm3/mol to cm3/mol */
factor = 1e3;
*units = dm3_per_mol;
}
else if (strstr(token, "m3") != NULL)
{
/* Convert m3/mol to cm3/mol */
factor = 1e6;
*units = m3_per_mol;
}
for (int i = 0; i < 1; i++)