Skip to content

Allow multiple association sites per molecule #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prehner merged 17 commits into from
Jun 20, 2025
Merged

Allow multiple association sites per molecule #233

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4bbe0bf
Allow multiple association sites per molecule in PC-SAFT
prehner Apr 25, 2025
4229791
adjust other models
prehner Apr 30, 2025
d501f13
thank god for unit tests
prehner Apr 30, 2025
692a754
Handle association outside of individual models
prehner May 9, 2025
3c94591
cleanup
prehner May 9, 2025
39cdc7f
Parameter struct without changes to pcsaft
prehner May 25, 2025
d692d8d
Fully implemented new parameter struct
prehner Jun 12, 2025
21bf6a8
remove all_models from default features
prehner Jun 12, 2025
cdaa96d
Python wheel online!
prehner Jun 13, 2025
bbb744c
everything compiling
prehner Jun 16, 2025
32e1016
convert some panics into errors
prehner Jun 16, 2025
613871b
Update parameter files
prehner Jun 16, 2025
21e1507
revive some tests
prehner Jun 16, 2025
3d3cf85
Fix in association
prehner Jun 17, 2025
9b7a1c7
Fix association DFT
prehner Jun 18, 2025
6a8baca
small refactors and updated example notebooks
prehner Jun 20, 2025
aee477d
rename ParametersHetero
prehner Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revive some tests
  • Loading branch information
@prehner
prehner committed Jun 16, 2025
commit 21e15076662673d45e4dda5b53eeb3db575a0564
82 changes: 40 additions & 42 deletions crates/feos/src/pcsaft/eos/polar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,12 +429,14 @@ impl DipoleQuadrupole {
mod tests {
use super::*;
use crate::hard_sphere::HardSphereProperties;
use crate::pcsaft::PcSaftParameters;
use crate::pcsaft::eos::dispersion::Dispersion;
use crate::pcsaft::parameters::utils::{
carbon_dioxide_parameters, dme_co2_parameters, dme_parameters,
};
use approx::assert_relative_eq;
use feos_core::StateHD;
use feos_core::parameter::IdentifierOption;

#[test]
fn test_dipolar_contribution() {
Expand All @@ -448,27 +450,25 @@ mod tests {
assert_relative_eq!(a, -1.40501033595417E-002, epsilon = 1e-6);
}

// #[test]
// fn test_dipolar_contribution_mix() {
// let dp = Dipole {
// parameters: Arc::new(PcSaftPars::new(
// &PcSaftParameters::from_json(
// vec!["acetone", "butanal", "dimethyl ether"],
// "../../parameters/pcsaft/gross2006.json",
// None,
// IdentifierOption::Name,
// )
// .unwrap(),
// )),
// };
// let t = 350.0;
// let v = 1000.0;
// let n = [1.0, 2.0, 3.0];
// let s = StateHD::new(t, v, arr1(&n));
// let d = dp.parameters.hs_diameter(t);
// let a = dp.helmholtz_energy(&s, &d);
// assert_relative_eq!(a, -1.4126308106201688, epsilon = 1e-10);
// }
#[test]
fn test_dipolar_contribution_mix() {
let parameters = PcSaftPars::new(
&PcSaftParameters::from_json(
vec!["acetone", "butanal", "dimethyl ether"],
"../../parameters/pcsaft/gross2006.json",
None,
IdentifierOption::Name,
)
.unwrap(),
);
let t = 350.0;
let v = 1000.0;
let n = [1.0, 2.0, 3.0];
let s = StateHD::new(t, v, arr1(&n));
let d = parameters.hs_diameter(t);
let a = Dipole.helmholtz_energy(&parameters, &s, &d);
assert_relative_eq!(a, -1.4126308106201688, epsilon = 1e-10);
}

#[test]
fn test_quadrupolar_contribution() {
Expand All @@ -482,27 +482,25 @@ mod tests {
assert_relative_eq!(a, -4.38559558854186E-002, epsilon = 1e-6);
}

// #[test]
// fn test_quadrupolar_contribution_mix() {
// let qp = Quadrupole {
// parameters: Arc::new(PcSaftPars::new(
// &PcSaftParameters::from_json(
// vec!["carbon dioxide", "chlorine", "ethylene"],
// "../../parameters/pcsaft/gross2005_literature.json",
// None,
// IdentifierOption::Name,
// )
// .unwrap(),
// )),
// };
// let t = 350.0;
// let v = 1000.0;
// let n = [1.0, 2.0, 3.0];
// let s = StateHD::new(t, v, arr1(&n));
// let d = qp.parameters.hs_diameter(t);
// let a = qp.helmholtz_energy(&s, &d);
// assert_relative_eq!(a, -0.327493924806138, epsilon = 1e-10);
// }
#[test]
fn test_quadrupolar_contribution_mix() {
let parameters = PcSaftPars::new(
&PcSaftParameters::from_json(
vec!["carbon dioxide", "chlorine", "ethylene"],
"../../parameters/pcsaft/gross2005_literature.json",
None,
IdentifierOption::Name,
)
.unwrap(),
);
let t = 350.0;
let v = 1000.0;
let n = [1.0, 2.0, 3.0];
let s = StateHD::new(t, v, arr1(&n));
let d = parameters.hs_diameter(t);
let a = Quadrupole.helmholtz_energy(&parameters, &s, &d);
assert_relative_eq!(a, -0.327493924806138, epsilon = 1e-10);
}

#[test]
fn test_dipolar_quadrupolar_contribution() {
Expand Down