max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '86888c465e9f7ff2ab6e5dfea003fc6ba73383b6'

Browse Source
This commit is contained in:
Scott R Charlton 2019-10-21 16:25:10 -06:00
commit 82dc185a90
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phreeqcpp/prep.cpp
View File

@ -4026,8 +4026,14 @@ calc_PR(std::vector<struct phase *> phase_ptrs, LDBLE P, LDBLE TK, LDBLE V_m)
a_aa *= 0.51; a_aa *= 0.51;
else if (!strcmp(phase_ptr1->name, "Mtg(g)")) else if (!strcmp(phase_ptr1->name, "Mtg(g)"))
a_aa *= 0.51; a_aa *= 0.51;
else if (!strcmp(phase_ptr1->name, "Methane(g)"))
a_aa *= 0.51;
else if (!strcmp(phase_ptr1->name, "N2(g)")) else if (!strcmp(phase_ptr1->name, "N2(g)"))
a_aa *= 0.51; a_aa *= 0.51;
else if (!strcmp(phase_ptr1->name, "Ethane(g)"))
a_aa *= 0.51;
else if (!strcmp(phase_ptr1->name, "Propane(g)"))
a_aa *= 0.45;
} }
if (!strcmp(phase_ptr1->name, "H2O(g)")) if (!strcmp(phase_ptr1->name, "H2O(g)"))
{ {
@ -4039,8 +4045,14 @@ calc_PR(std::vector<struct phase *> phase_ptrs, LDBLE P, LDBLE TK, LDBLE V_m)
a_aa *= 0.51; a_aa *= 0.51;
else if (!strcmp(phase_ptr->name, "Mtg(g)")) else if (!strcmp(phase_ptr->name, "Mtg(g)"))
a_aa *= 0.51; a_aa *= 0.51;
else if (!strcmp(phase_ptr->name, "Methane(g)"))
a_aa *= 0.51;
else if (!strcmp(phase_ptr->name, "N2(g)")) else if (!strcmp(phase_ptr->name, "N2(g)"))
a_aa *= 0.51; a_aa *= 0.51;
else if (!strcmp(phase_ptr->name, "Ethane(g)"))
a_aa *= 0.51;
else if (!strcmp(phase_ptr->name, "Propane(g)"))
a_aa *= 0.45;
} }
a_aa_sum += phase_ptr->fraction_x * phase_ptr1->fraction_x * a_aa; a_aa_sum += phase_ptr->fraction_x * phase_ptr1->fraction_x * a_aa;
a_aa_sum2 += phase_ptr1->fraction_x * a_aa; a_aa_sum2 += phase_ptr1->fraction_x * a_aa;