Skip to content

Commit b946c0e

Browse files
prehnerg-bauer
andauthored
Update README for PC-SAFT parameters and add new binary record files (#200)
* Update README for PC-SAFT parameters * Fix benchmarks that broke some time along the way * Align how binary segment records are treated in Rust and Python * Add GC parameters from new study * Updated binary interaction parameters * print group count in markdown representation of `GcPcSaftEosParameters` * add SMARTS file and update README * Small formatting changes to README, updated parameter tutorial notebook (k_ij getter returns None of not specified) --------- Co-authored-by: Gernot Bauer <bauer@itt.uni-stuttgart.de>
1 parent c79c5b4 commit b946c0e

File tree

16 files changed

+152047
-112
lines changed

16 files changed

+152047
-112
lines changed

benches/dft_pore.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn fmt(c: &mut Criterion) {
2626
);
2727
let bulk = State::new_pure(&func, KELVIN, 0.75 / NAV / ANGSTROM.powi::<P3>()).unwrap();
2828
group.bench_function("liquid", |b| {
29-
b.iter(|| pore.initialize(&bulk, None, None).solve(None))
29+
b.iter(|| pore.initialize(&bulk, None, None).unwrap().solve(None))
3030
});
3131
}
3232

@@ -54,11 +54,11 @@ fn pcsaft(c: &mut Criterion) {
5454
let vle = PhaseEquilibrium::pure(&func, 300.0 * KELVIN, None, Default::default()).unwrap();
5555
let bulk = vle.liquid();
5656
group.bench_function("butane_liquid", |b| {
57-
b.iter(|| pore.initialize(bulk, None, None).solve(None))
57+
b.iter(|| pore.initialize(bulk, None, None).unwrap().solve(None))
5858
});
5959
let bulk = State::new_pure(&func, 300.0 * KELVIN, vle.vapor().density * 0.2).unwrap();
6060
group.bench_function("butane_vapor", |b| {
61-
b.iter(|| pore.initialize(&bulk, None, None).solve(None))
61+
b.iter(|| pore.initialize(&bulk, None, None).unwrap().solve(None))
6262
});
6363

6464
let parameters = PcSaftParameters::from_json(
@@ -80,15 +80,15 @@ fn pcsaft(c: &mut Criterion) {
8080
.unwrap();
8181
let bulk = vle.liquid();
8282
group.bench_function("butane_pentane_liquid", |b| {
83-
b.iter(|| pore.initialize(bulk, None, None).solve(None))
83+
b.iter(|| pore.initialize(bulk, None, None).unwrap().solve(None))
8484
});
8585
let bulk = StateBuilder::new(&func)
8686
.temperature(300.0 * KELVIN)
8787
.partial_density(&(&vle.vapor().partial_density * 0.2))
8888
.build()
8989
.unwrap();
9090
group.bench_function("butane_pentane_vapor", |b| {
91-
b.iter(|| pore.initialize(&bulk, None, None).solve(None))
91+
b.iter(|| pore.initialize(&bulk, None, None).unwrap().solve(None))
9292
});
9393
}
9494

@@ -122,7 +122,11 @@ fn gc_pcsaft(c: &mut Criterion) {
122122
.picard_iteration(None, None, Some(1e-5), None)
123123
.anderson_mixing(None, None, None, None, None);
124124
group.bench_function("butane_liquid", |b| {
125-
b.iter(|| pore.initialize(bulk, None, None).solve(Some(&solver)))
125+
b.iter(|| {
126+
pore.initialize(bulk, None, None)
127+
.unwrap()
128+
.solve(Some(&solver))
129+
})
126130
});
127131
}
128132

0 commit comments

Comments
 (0)