Skip to content

Commit 8f336eb

Browse files
ksbeattieksbeattie
authored
Merge branch 'main' into fix-issue_1287-bug-in-subcritical-powerplant-report-method
2 parents 93784d2 + 30cbaeb commit 8f336eb

File tree

16 files changed

+4802
-9
lines changed

16 files changed

+4802
-9
lines changed

‎.github/workflows/core.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
strategy:
9191
fail-fast: false
9292
matrix:
93-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
93+
python-version: ['3.10', '3.11', '3.12', '3.13']
9494
os:
9595
- linux
9696
- win64

‎.github/workflows/integration.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
strategy:
127127
fail-fast: false
128128
matrix:
129-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
129+
python-version: ['3.10', '3.11', '3.12', '3.13']
130130
os:
131131
- linux
132132
- win64
@@ -164,7 +164,7 @@ jobs:
164164
strategy:
165165
fail-fast: false
166166
matrix:
167-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
167+
python-version: ['3.10', '3.11', '3.12', '3.13']
168168
os:
169169
- linux
170170
- win64

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ Most of the functionality is implemented in Python. In accordance with
8282
the end-of-life for many Python 2 libraries, the IDAES Toolkit is written
8383
for Python 3. The following sub-versions are supported:
8484

85-
* Python 3.9
8685
* Python 3.10
8786
* Python 3.11
8887
* Python 3.12

‎docs/reference_guides/model_libraries/generic/property_models/helmholtz_parameters.rst‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,15 @@ Parameters for the type 3 version are similar to type 1.
282282
\log_e \delta + n^\circ_1 + n^\circ_2 \tau + n^\circ_3 \log_e \tau +
283283
\sum_{i = 4}^{h} n^\circ_i \tau^{\gamma^\circ_i}
284284
285+
**Type 4**
286+
287+
Parameters for the type 4 version are similar to type 1
288+
289+
.. math::
290+
\log_e \delta + n^\circ_1 + n^\circ_2 \tau + (n^\circ_3 - 1) \log_e \tau +
291+
\sum_{i = 4}^h n^\circ_i \log_e \left[ 1 - \exp(\frac{-\gamma^\circ_i \tau}{T_c})\right]
292+
293+
285294
Residual Part of Dimensionless Helmholtz Free Energy
286295
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
287296

@@ -379,6 +388,16 @@ free energy expression::
379388
\sum^{h_0}_{i=1} n_i \delta^{d_i} \tau^{t_1} +
380389
\sum^m_{j=1} \left[ \exp(-\delta^j) \sum^{h_j}_{i = h_{j-1} + 1} n_i \delta^{d_i} \tau^{t_1} \right]
381390
391+
392+
**Type 5**
393+
394+
.. math::
395+
\phi^r(\delta, \tau) = \sum^{h_1}_{i=1} n_i \delta^{d_i} \tau^{t_1} +
396+
\sum_{i =h_1 + 1}^{h_2} n_i \delta^{d_i} \tau^{t_1} \exp(-\delta^{c_i}) +
397+
\sum_{i = h_2 + 1}^{h_3} n_i \delta^{d_i} \tau^{t_1} \exp\left[-\alpha_i(\delta - \varepsilon_i)^2 - \beta_i(\tau - \gamma_i)^2 \right] +
398+
\sum_{i = h_3+1}^{h_4} n_i \delta^{d_i} \tau^{t_1} \exp\left[-\alpha_i(\delta - \varepsilon_i)^2 - \frac{1}{\beta_i(\tau - \gamma_i)^2 + b_i} \right]
399+
400+
382401
Approximate Saturated Reduced Density
383402
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
384403

‎idaes/models/properties/general_helmholtz/components/parameters/co2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
"0": 78.63
301301
},
302302
"n": {
303-
"0": 2.471
303+
"0": 1.254
304304
},
305305
"type": 1
306306
}

‎idaes/models/properties/general_helmholtz/components/parameters/nh3.json‎

Lines changed: 257 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,257 @@
1+
{
2+
"comp": "nh3",
3+
"basic": {
4+
"R": 0.48820939114,
5+
"MW": 17.03052,
6+
"T_star": 405.56,
7+
"rho_star": 233.25,
8+
"Tc": 405.56,
9+
"rhoc": 233.25,
10+
"Pc": 11363.4,
11+
"Tt": 195.49,
12+
"Pt": 6.055813,
13+
"rhot_l": 733.8486491,
14+
"rhot_v": 0.063731569,
15+
"P_min": 6.055813,
16+
"P_max": 1000000.0,
17+
"rho_max": 904.8315276,
18+
"T_min": 195.49,
19+
"T_max": 725.0
20+
},
21+
"eos": {
22+
"reference": [
23+
"SKehui Gao, Jiangtao Wu, Ian H. Bell, Allan H. Harvey, and Eric W. Lemmon (2023)",
24+
" A Reference Equation of State with an Associating Term for Thermodynamic Properties of Ammonia"
25+
],
26+
"c": {
27+
"6": 2,
28+
"7": 2,
29+
"8": 1
30+
},
31+
"d": {
32+
"1": 4,
33+
"2": 1,
34+
"3": 1,
35+
"4": 2,
36+
"5": 3,
37+
"6": 3,
38+
"7": 2,
39+
"8": 3,
40+
"9": 1,
41+
"10": 1,
42+
"11": 1,
43+
"12": 2,
44+
"13": 2,
45+
"14": 1,
46+
"15": 3,
47+
"16": 3,
48+
"17": 1,
49+
"18": 1,
50+
"19": 1,
51+
"20": 1
52+
53+
},
54+
"t": {
55+
"1": 1.0,
56+
"2": 0.382,
57+
"3": 1.00,
58+
"4": 1.0,
59+
"5": 0.677,
60+
"6": 2.915,
61+
"7": 3.51,
62+
"8": 1.063,
63+
"9": 0.655,
64+
"10": 1.3,
65+
"11": 3.1,
66+
"12": 1.4395,
67+
"13": 1.623,
68+
"14": 0.643,
69+
"15": 1.13,
70+
"16": 4.5,
71+
"17": 1.0,
72+
"18": 4.0,
73+
"19": 4.3315,
74+
"20": 4.015
75+
},
76+
"n": {
77+
"1": 0.006132232,
78+
"2": 1.7395866,
79+
"3": -2.2261792,
80+
"4": -0.30127553,
81+
"5": 0.08967023,
82+
"6": -0.076387037,
83+
"7": -0.84063963,
84+
"8": -0.27026327,
85+
"9": 6.212578,
86+
"10": -5.7844357,
87+
"11": 2.4817542,
88+
"12": -2.3739168,
89+
"13": 0.01493697,
90+
"14": -3.7749264,
91+
"15": 0.0006254348,
92+
"16": -1.7359e-05,
93+
"17": -0.13462033,
94+
"18": 0.07749072839,
95+
"19": -1.6909858,
96+
"20": 0.93739074
97+
},
98+
"a": {
99+
"9": 0.42776,
100+
"10": 0.6424,
101+
"11": 0.8175,
102+
"12": 0.7995,
103+
"13": 0.91,
104+
"14": 0.3574,
105+
"15": 1.21,
106+
"16": 4.14,
107+
"17": 22.56,
108+
"18": 22.68,
109+
"19": 2.8452,
110+
"20": 2.8342
111+
},
112+
"b": {
113+
"9": 1.708,
114+
"10": 1.4865,
115+
"11": 2.0915,
116+
"12": 2.43,
117+
"13": 0.488,
118+
"14": 1.1,
119+
"15": 0.85,
120+
"16": 1.14,
121+
"17": 945.64,
122+
"18": 993.85,
123+
"19": 0.3696,
124+
"20": 0.2962
125+
},
126+
"bi":{
127+
"19": 1.244,
128+
"20": 0.6826
129+
},
130+
"g": {
131+
"9": 1.036,
132+
"10": 1.2777,
133+
"11": 1.083,
134+
"12": 1.2906,
135+
"13": 0.928,
136+
"14": 0.934,
137+
"15": 0.919,
138+
"16": 1.852,
139+
"17": 1.05897,
140+
"18": 1.05277,
141+
"19": 1.108,
142+
"20": 1.313
143+
},
144+
"e": {
145+
"9": -0.0726,
146+
"10": -0.1274,
147+
"11": 0.7527,
148+
"12": 0.57,
149+
"13": 2.2,
150+
"14": -0.243,
151+
"15": 2.96,
152+
"16": 3.02,
153+
"17": 0.9574,
154+
"18": 0.9576,
155+
"19": 0.4478,
156+
"20": 0.44689
157+
},
158+
"reference_state_offset": [
159+
160+
],
161+
"n0": {
162+
"1": -6.59406093943886,
163+
"2": 5.60101151987913,
164+
"3": 4.0,
165+
"4": 2.224,
166+
"5": 3.148,
167+
"6": 0.9579
168+
},
169+
"g0": {
170+
"4":1646,
171+
"5":3965,
172+
"6":7231
173+
},
174+
"last_term_ideal": 6,
175+
"last_term_residual": [5, 8, 18, 20],
176+
"phi_ideal_type": 4,
177+
"phi_residual_type": 5
178+
},
179+
"aux": {
180+
"reference": [
181+
"Gao, Kehui, et al. A reference equation of state with an associating term for the thermodynamic properties of ammonia.",
182+
" Journal of Physical and Chemical Reference Data 52.1 (2023)."
183+
],
184+
"delta_l_sat_approx": {
185+
"c": 1,
186+
"n": {
187+
"1": 0.051236,
188+
"2": 3.7925,
189+
"3": -3.5929,
190+
"4": 4.6409,
191+
"5": -1.9893,
192+
"6": 1.5978
193+
},
194+
"t": {
195+
"1": 0.07,
196+
"2": 0.46,
197+
"3": 0.77,
198+
"4": 1.05,
199+
"5": 1.25,
200+
"6": 8.0
201+
},
202+
"type": 1
203+
},
204+
"delta_v_sat_approx": {
205+
"c": 1,
206+
"n": {
207+
"1": -0.089966,
208+
"2": -3.8722,
209+
"3": -8.1183,
210+
"4": -25.293,
211+
"5": -54.279,
212+
"6": -400.83
213+
},
214+
"t": {
215+
"1": 0.112,
216+
"2": 0.473,
217+
"3": 1.5,
218+
"4": 3.875,
219+
"5": 8.0,
220+
"6": 20.0
221+
},
222+
"type": 2
223+
}
224+
},
225+
"transport": {
226+
"thermal_conductivity": {
227+
"reference": [
228+
"Monogenidou, S. A., Marc J. Assael, and Marcia L. Huber.",
229+
"Reference correlation for the thermal conductivity of ammonia ",
230+
"from the triple-point temperature to 680 K and pressures up to 80 MPa. ",
231+
"Journal of Physical and Chemical Reference Data 47.4 (2018)."
232+
]
233+
},
234+
"viscosity": {
235+
"reference": [
236+
"Fenghour, A., et al. The viscosity of ammonia.",
237+
" Journal of Physical and Chemical Reference Data 24.5 (1995): 1649-1667."
238+
]
239+
},
240+
"surface_tension": {
241+
"reference": [
242+
"Mulero, A., I. Cachadina, Parra, M., Recommended Correlations for the Surface ",
243+
" Tension of Common Fluids, J. Phys. Chem. Ref. Data 41, 043105, (2012)."
244+
],
245+
"Tc": 405.4,
246+
"s": {
247+
"0": 102.8,
248+
"1": -94.53
249+
},
250+
"n": {
251+
"0": 1.211,
252+
"1": 5.585
253+
},
254+
"type": 1
255+
}
256+
}
257+
}

0 commit comments

Comments
 (0)