Skip to content

Commit 144cfdd

Browse files
mortehamg-bauer
morteham
and
g-bauer
authored
Support for second order Feynman-Hibbs corrections using the SAFT-VRQ Mie EOS (#160)
* Added support for FH0 and FH2 * Tested mixtures with FH2 * Use Feynman-Hibbs order stored in SaftVRQMieParameters * Corrected pyhton interface * Corrected parameter paths * Added test case for FH2 * Added explicit integer values for variants in FeynmanHibbsOrder (same as implicit discriminants), implemented TryFrom<usize> * Rebase on PR that makes parameter construction fallible --------- Co-authored-by: Morten Hammer <[email protected]> Co-authored-by: Gernot Bauer <[email protected]>
1 parent c4f32f2 commit 144cfdd

File tree

14 files changed

+889
-151
lines changed

14 files changed

+889
-151
lines changed

‎examples/saftvrqmie/hydrogen_fh1_vs_fh2.ipynb‎

Lines changed: 184 additions & 0 deletions
Large diffs are not rendered by default.

‎examples/saftvrqmie/radial_distribution_function.ipynb‎

Lines changed: 27 additions & 27 deletions
Large diffs are not rendered by default.

‎parameters/saftvrqmie/aasen2019.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"sigma": 3.0243,
1414
"epsilon_k": 26.706,
1515
"lr": 9.0,
16-
"la": 6.0
16+
"la": 6.0,
17+
"fh": 1
1718
},
1819
"molarweight": 2.0157309551872
1920
},
@@ -31,7 +32,8 @@
3132
"sigma": 3.0235,
3233
"epsilon_k": 26.5860,
3334
"lr": 9.0,
34-
"la": 6.0
35+
"la": 6.0,
36+
"fh": 1
3537
},
3638
"molarweight": 2.0157309551872
3739
},
@@ -49,7 +51,8 @@
4951
"sigma": 3.0239,
5052
"epsilon_k": 26.7160,
5153
"lr": 9.0,
52-
"la": 6.0
54+
"la": 6.0,
55+
"fh": 1
5356
},
5457
"molarweight": 2.0157309551872
5558
},
@@ -67,7 +70,8 @@
6770
"sigma": 2.7778,
6871
"epsilon_k": 37.501,
6972
"lr": 13.0,
70-
"la": 6.0
73+
"la": 6.0,
74+
"fh": 1
7175
},
7276
"molarweight": 20.17969806457545
7377
},
@@ -85,7 +89,8 @@
8589
"sigma": 2.7443,
8690
"epsilon_k": 5.4195,
8791
"lr": 9.0,
88-
"la": 6.0
92+
"la": 6.0,
93+
"fh": 1
8994
},
9095
"molarweight": 4.002601643881807
9196
},
@@ -103,7 +108,8 @@
103108
"sigma": 3.0203,
104109
"epsilon_k": 30.273,
105110
"lr": 10.0,
106-
"la": 6.0
111+
"la": 6.0,
112+
"fh": 1
107113
},
108114
"molarweight": 4.028209954364
109115
}

‎parameters/saftvrqmie/aasen2019_fh2.json‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
[
2+
{
3+
"identifier": {
4+
"cas": "1333-74-0",
5+
"name": "hydrogen",
6+
"iupac_name": "hydrogen",
7+
"smiles": "[HH]",
8+
"inchi": "InChI=1S/H2/h1H",
9+
"formula": "H2"
10+
},
11+
"model_record": {
12+
"m": 1.0,
13+
"sigma": 2.9195,
14+
"epsilon_k": 55.7290,
15+
"lr": 20.0,
16+
"la": 6.0,
17+
"fh": 2
18+
},
19+
"molarweight": 2.0157309551872
20+
},
21+
{
22+
"identifier": {
23+
"cas": "1333-74-0",
24+
"name": "para-hydrogen",
25+
"iupac_name": "para-hydrogen",
26+
"smiles": "[HH]",
27+
"inchi": "InChI=1S/H2/h1H",
28+
"formula": "H2"
29+
},
30+
"model_record": {
31+
"m": 1.0,
32+
"sigma": 2.9185,
33+
"epsilon_k": 55.5190,
34+
"lr": 20.0,
35+
"la": 6.0,
36+
"fh": 2
37+
},
38+
"molarweight": 2.0157309551872
39+
},
40+
{
41+
"identifier": {
42+
"cas": "1333-74-0",
43+
"name": "ortho-hydrogen",
44+
"iupac_name": "ortho-hydrogen",
45+
"smiles": "[HH]",
46+
"inchi": "InChI=1S/H2/h1H",
47+
"formula": "H2"
48+
},
49+
"model_record": {
50+
"m": 1.0,
51+
"sigma": 2.9191,
52+
"epsilon_k": 55.7490,
53+
"lr": 20.0,
54+
"la": 6.0,
55+
"fh": 2
56+
},
57+
"molarweight": 2.0157309551872
58+
},
59+
{
60+
"identifier": {
61+
"cas": "7440-01-9",
62+
"name": "neon",
63+
"iupac_name": "neon",
64+
"smiles": "[Ne]",
65+
"inchi": "InChI=1S/Ne",
66+
"formula": "Ne"
67+
},
68+
"model_record": {
69+
"m": 1.0,
70+
"sigma": 2.7760,
71+
"epsilon_k": 37.716,
72+
"lr": 13.0,
73+
"la": 6.0,
74+
"fh": 2
75+
},
76+
"molarweight": 20.17969806457545
77+
},
78+
{
79+
"identifier": {
80+
"cas": "7440-59-7",
81+
"name": "helium",
82+
"iupac_name": "helium",
83+
"smiles": "[He]",
84+
"inchi": "InChI=1S/He",
85+
"formula": "He"
86+
},
87+
"model_record": {
88+
"m": 1.0,
89+
"sigma": 2.5490,
90+
"epsilon_k": 10.9520,
91+
"lr": 13.0,
92+
"la": 6.0,
93+
"fh": 2
94+
},
95+
"molarweight": 4.002601643881807
96+
},
97+
{
98+
"identifier": {
99+
"cas": "7782-39-0",
100+
"name": "deuterium",
101+
"iupac_name": "deuterium",
102+
"smiles": "[HH]",
103+
"inchi": "InChI=1S/H2/h1H/i1+1D",
104+
"formula": "D2"
105+
},
106+
"model_record": {
107+
"m": 1.0,
108+
"sigma": 2.9897,
109+
"epsilon_k": 36.9130,
110+
"lr": 12.0,
111+
"la": 6.0,
112+
"fh": 2
113+
},
114+
"molarweight": 4.028209954364
115+
}
116+
]

‎parameters/saftvrqmie/aasen2020_binary_fh2.json‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
[
2+
{
3+
"id1": {
4+
"cas": "1333-74-0",
5+
"name": "hydrogen",
6+
"iupac_name": "hydrogen",
7+
"smiles": "[HH]",
8+
"inchi": "InChI=1S/H2/h1H",
9+
"formula": "H2"
10+
},
11+
"id2": {
12+
"cas": "7440-01-9",
13+
"name": "neon",
14+
"iupac_name": "neon",
15+
"smiles": "[Ne]",
16+
"inchi": "InChI=1S/Ne",
17+
"formula": "Ne"
18+
},
19+
"model_record": {
20+
"k_ij": 0.105,
21+
"l_ij": 0.0
22+
}
23+
},
24+
{
25+
"id1": {
26+
"cas": "1333-74-0",
27+
"name": "hydrogen",
28+
"iupac_name": "hydrogen",
29+
"smiles": "[HH]",
30+
"inchi": "InChI=1S/H2/h1H",
31+
"formula": "H2"
32+
},
33+
"id2": {
34+
"cas": "7440-59-7",
35+
"name": "helium",
36+
"iupac_name": "helium",
37+
"smiles": "[He]",
38+
"inchi": "InChI=1S/He",
39+
"formula": "He"
40+
},
41+
"model_record": {
42+
"k_ij": 0.15,
43+
"l_ij": -0.025
44+
}
45+
},
46+
{
47+
"id1": {
48+
"cas": "1333-74-0",
49+
"name": "hydrogen",
50+
"iupac_name": "hydrogen",
51+
"smiles": "[HH]",
52+
"inchi": "InChI=1S/H2/h1H",
53+
"formula": "H2"
54+
},
55+
"id2": {
56+
"cas": "7782-39-0",
57+
"name": "deuterium",
58+
"iupac_name": "deuterium",
59+
"smiles": "[HH]",
60+
"inchi": "InChI=1S/H2/h1H/i1+1D",
61+
"formula": "D2"
62+
},
63+
"model_record": {
64+
"k_ij": -0.04,
65+
"l_ij": 0.0
66+
}
67+
},
68+
{
69+
"id1": {
70+
"cas": "7440-59-7",
71+
"name": "helium",
72+
"iupac_name": "helium",
73+
"smiles": "[He]",
74+
"inchi": "InChI=1S/He",
75+
"formula": "He"
76+
},
77+
"id2": {
78+
"cas": "7782-39-0",
79+
"name": "deuterium",
80+
"iupac_name": "deuterium",
81+
"smiles": "[HH]",
82+
"inchi": "InChI=1S/H2/h1H/i1+1D",
83+
"formula": "D2"
84+
},
85+
"model_record": {
86+
"k_ij": 0.12,
87+
"l_ij": -0.05
88+
}
89+
},
90+
{
91+
"id1": {
92+
"cas": "7440-59-7",
93+
"name": "helium",
94+
"iupac_name": "helium",
95+
"smiles": "[He]",
96+
"inchi": "InChI=1S/He",
97+
"formula": "He"
98+
},
99+
"id2": {
100+
"cas": "7440-01-9",
101+
"name": "neon",
102+
"iupac_name": "neon",
103+
"smiles": "[Ne]",
104+
"inchi": "InChI=1S/Ne",
105+
"formula": "Ne"
106+
},
107+
"model_record": {
108+
"k_ij": -0.06,
109+
"l_ij": 0.0
110+
}
111+
},
112+
{
113+
"id1": {
114+
"cas": "7440-01-9",
115+
"name": "neon",
116+
"iupac_name": "neon",
117+
"smiles": "[Ne]",
118+
"inchi": "InChI=1S/Ne",
119+
"formula": "Ne"
120+
},
121+
"id2": {
122+
"cas": "7782-39-0",
123+
"name": "deuterium",
124+
"iupac_name": "deuterium",
125+
"smiles": "[HH]",
126+
"inchi": "InChI=1S/H2/h1H/i1+1D",
127+
"formula": "D2"
128+
},
129+
"model_record": {
130+
"k_ij": 0.14,
131+
"l_ij": 0.0
132+
}
133+
}
134+
]

‎parameters/saftvrqmie/hammer2023.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"sigma": 3.0243,
1414
"epsilon_k": 26.706,
1515
"lr": 9.0,
16-
"la": 6.0
16+
"la": 6.0,
17+
"fh": 1
1718
},
1819
"molarweight": 2.0157309551872
1920
},
@@ -31,7 +32,8 @@
3132
"sigma": 3.0235,
3233
"epsilon_k": 26.5860,
3334
"lr": 9.0,
34-
"la": 6.0
35+
"la": 6.0,
36+
"fh": 1
3537
},
3638
"molarweight": 2.0157309551872
3739
},
@@ -49,7 +51,8 @@
4951
"sigma": 3.0239,
5052
"epsilon_k": 26.7160,
5153
"lr": 9.0,
52-
"la": 6.0
54+
"la": 6.0,
55+
"fh": 1
5356
},
5457
"molarweight": 2.0157309551872
5558
},
@@ -67,7 +70,8 @@
6770
"sigma": 2.7778,
6871
"epsilon_k": 37.501,
6972
"lr": 13.0,
70-
"la": 6.0
73+
"la": 6.0,
74+
"fh": 1
7175
},
7276
"molarweight": 20.17969806457545
7377
},
@@ -85,7 +89,8 @@
8589
"sigma": 2.7443,
8690
"epsilon_k": 5.4195,
8791
"lr": 9.0,
88-
"la": 6.0
92+
"la": 6.0,
93+
"fh": 1
8994
},
9095
"molarweight": 4.002601643881807
9196
},
@@ -103,7 +108,8 @@
103108
"sigma": 3.0087,
104109
"epsilon_k": 39.2388,
105110
"lr": 11.0,
106-
"la": 7.0
111+
"la": 7.0,
112+
"fh": 1
107113
},
108114
"molarweight": 4.028209954364
109115
}

0 commit comments

Comments
 (0)