Skip to content

Re-export items of feos-core and feos-dft in feos #212

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 3 commits into from
Dec 18, 2023
Merged

Re-export items of feos-core and feos-dft in feos #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c964bf1
Re-export items of feos-core and feos-dft in feos
prehner Dec 17, 2023
28b38b5
Fix module name
prehner Dec 17, 2023
b783eb3
update changelog
prehner Dec 18, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added `PureRecord`, `SegmentRecord`, `Identifier`, and `IdentifierOption` to `feos.ideal_gas`. [#205](https://github.com/feos-org/feos/pull/205)
- Added implementation of the Joback ideal gas model that was previously part of `feos-core`. [#204](https://github.com/feos-org/feos/pull/204)
- Added an implementation of the ideal gas heat capacity based on DIPPR equations. [#204](https://github.com/feos-org/feos/pull/204)
- Added re-exports for the members of `feos-core` and `feos-dft` in the new modules `feos::core` and `feos::dft`. [#212](https://github.com/feos-org/feos/pull/212)

### Changed
- Split `feos.ideal_gas` into `feos.joback` and `feos.dippr`. [#204](https://github.com/feos-org/feos/pull/204)
Expand Down
0 src/dft.rs → src/functional.rs
View file
Open in desktop
File renamed without changes.
15 changes: 13 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
#![allow(clippy::too_many_arguments)]

#[cfg(feature = "dft")]
mod dft;
mod functional;
#[cfg(feature = "dft")]
pub use dft::FunctionalVariant;
pub use functional::FunctionalVariant;
mod eos;
pub use eos::ResidualModel;

Expand All @@ -65,3 +65,14 @@ pub mod ideal_gas;

#[cfg(feature = "python")]
mod python;

pub mod core {
//! Re-export of all functionalities in [feos_core].
pub use feos_core::*;
}

#[cfg(feature = "dft")]
pub mod dft {
//! Re-export of all functionalities in [feos_dft].
pub use feos_dft::*;
}
2 changes: 1 addition & 1 deletion src/python/dft.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::dft::FunctionalVariant;
#[cfg(feature = "estimator")]
use crate::estimator::*;
use crate::functional::FunctionalVariant;
#[cfg(feature = "gc_pcsaft")]
use crate::gc_pcsaft::python::PyGcPcSaftFunctionalParameters;
#[cfg(feature = "gc_pcsaft")]
Expand Down