Commit 8c95503
authored
Fix DETPFlash reduced Gibbs scaling for GammaPhi/PTFlashWrapper (#517)
* Fix DETPFlash reduced Gibbs scaling for GammaPhi/PTFlashWrapper
- Fix DETPFlash objective scaling: accumulate phase reduced Gibbs (G/RT) and normalize by total moles to return molar reduced Gibbs g = G/(nRT) in Obj_de_tp_flash.
- Previously: GammaPhi/PTFlashWrapper path produced reduced Gibbs, but the objective applied an extra /RT, causing inconsistent g vs RRTPFlash/MichelsenTPFlash.
- Make __eval_G_DETPFlash(model::EoSModel, ...) return reduced Gibbs consistently (g/RT) to match PTFlashWrapper/GammaPhi path.
- Fix gammaphi_gibbs empty-phase return: always return (g, v) tuple for sum(w)==0 to avoid type/unwrap inconsistency.
- Refactor gammaphi_gibbs typing: introduce a single promoted eltype and reuse it for both g and v zeros.
- Add minimal SASS ask–tell usage example at top of sass_at.jl.
modified: src/methods/property_solvers/multicomponent/tp_flash/DifferentialEvolutiontp_flash.jl
modified: src/models/CompositeModel/GammaPhi.jl
modified: src/modules/solvers/metaheuristics/sass_at.jl
modified: test/test_methods_api_flash.jl
* fix CI1 parent d6bdcb8 commit 8c95503
File tree
4 files changed
+42
-16
lines changed- src
- methods/property_solvers/multicomponent/tp_flash
- models/CompositeModel
- modules/solvers/metaheuristics
- test
4 files changed
+42
-16
lines changedLines changed: 8 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | | - | |
| 172 | + | |
173 | 173 | | |
174 | 174 | | |
175 | 175 | | |
176 | 176 | | |
177 | 177 | | |
178 | | - | |
| 178 | + | |
179 | 179 | | |
180 | | - | |
| 180 | + | |
181 | 181 | | |
182 | 182 | | |
183 | 183 | | |
184 | 184 | | |
185 | 185 | | |
186 | 186 | | |
187 | | - | |
188 | | - | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
189 | 190 | | |
190 | 191 | | |
191 | 192 | | |
192 | 193 | | |
193 | 194 | | |
| 195 | + | |
194 | 196 | | |
195 | 197 | | |
196 | | - | |
| 198 | + | |
197 | 199 | | |
198 | 200 | | |
199 | 201 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
279 | 279 | | |
280 | 280 | | |
281 | 281 | | |
| 282 | + | |
282 | 283 | | |
283 | 284 | | |
284 | | - | |
285 | | - | |
286 | | - | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
287 | 288 | | |
288 | 289 | | |
289 | 290 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
1 | 24 | | |
2 | 25 | | |
3 | 26 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
| 72 | + | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
78 | | - | |
| 78 | + | |
79 | 79 | | |
80 | | - | |
| 80 | + | |
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
| |||
245 | 245 | | |
246 | 246 | | |
247 | 247 | | |
248 | | - | |
| 248 | + | |
249 | 249 | | |
250 | 250 | | |
251 | 251 | | |
| |||
488 | 488 | | |
489 | 489 | | |
490 | 490 | | |
491 | | - | |
| 491 | + | |
492 | 492 | | |
493 | 493 | | |
494 | 494 | | |
| |||
503 | 503 | | |
504 | 504 | | |
505 | 505 | | |
506 | | - | |
| 506 | + | |
507 | 507 | | |
508 | 508 | | |
509 | 509 | | |
| |||
0 commit comments