From 4676ee4de72c3a9b6624390c9faace92ddfaf31f Mon Sep 17 00:00:00 2001 From: David Parkhurst Date: Sun, 20 Oct 2019 12:27:48 -0600 Subject: [PATCH] added more P-R gas paramteters --- prep.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/prep.cpp b/prep.cpp index 395c037a..b99716d5 100644 --- a/prep.cpp +++ b/prep.cpp @@ -4026,8 +4026,14 @@ calc_PR(std::vector phase_ptrs, LDBLE P, LDBLE TK, LDBLE V_m) a_aa *= 0.51; else if (!strcmp(phase_ptr1->name, "Mtg(g)")) a_aa *= 0.51; + else if (!strcmp(phase_ptr1->name, "Methane(g)")) + a_aa *= 0.51; else if (!strcmp(phase_ptr1->name, "N2(g)")) 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)")) { @@ -4039,8 +4045,14 @@ calc_PR(std::vector phase_ptrs, LDBLE P, LDBLE TK, LDBLE V_m) a_aa *= 0.51; else if (!strcmp(phase_ptr->name, "Mtg(g)")) a_aa *= 0.51; + else if (!strcmp(phase_ptr->name, "Methane(g)")) + a_aa *= 0.51; else if (!strcmp(phase_ptr->name, "N2(g)")) 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_sum2 += phase_ptr1->fraction_x * a_aa;