Skip to content

Commit

Permalink
Re-export items of feos-core and feos-dft in feos (#212)
Browse files Browse the repository at this point in the history
  • Loading branch information
prehner authored Dec 18, 2023
1 parent 0da3f50 commit b33931b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
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
File renamed without changes.
15 changes: 13 additions & 2 deletions src/lib.rs
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
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

0 comments on commit b33931b

Please sign in to comment.