From 57f039641299264337fc4e350ddb993b76f27e93 Mon Sep 17 00:00:00 2001 From: Philipp Rehner Date: Mon, 7 Aug 2023 21:39:24 +0200 Subject: [PATCH] Added changelog entries --- feos-core/CHANGELOG.md | 15 ++++++++------- feos-core/Cargo.toml | 3 --- feos-core/src/state/mod.rs | 10 ---------- feos-dft/CHANGELOG.md | 1 + 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/feos-core/CHANGELOG.md b/feos-core/CHANGELOG.md index 799404473..c7db4132a 100644 --- a/feos-core/CHANGELOG.md +++ b/feos-core/CHANGELOG.md @@ -12,8 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `JobackParameters` struct that implements `Parameters` including Python bindings. [#158](https://github.com/feos-org/feos/pull/158) - Added `Parameter::from_model_records` as a simpler interface to generate parameters. [#169](https://github.com/feos-org/feos/pull/169) - Added optional `Phase` argument for constructors of dynamic properties of `DataSet`s. [#174](https://github.com/feos-org/feos/pull/174) -- Added `molar_weight` method to `Residual` trait. [#177](https://github.com/feos-org/feos/pull/158) -- Added molar versions for entropy, enthalpy, etc. for residual properties. [#177](https://github.com/feos-org/feos/pull/158) +- Added `molar_weight` method to `Residual` trait. [#177](https://github.com/feos-org/feos/pull/177) +- Added molar versions for entropy, enthalpy, etc. for residual properties. [#177](https://github.com/feos-org/feos/pull/177) ### Changed - Changed constructors of `Parameter` trait to return `Result`s. [#161](https://github.com/feos-org/feos/pull/161) @@ -28,16 +28,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bubble and dew point iterations will not attempt a second iteration if no solution is found for the given initial pressure. [#166](https://github.com/feos-org/feos/pull/166) - Made the binary records in the constructions and getters of the `Parameter` trait optional. [#169](https://github.com/feos-org/feos/pull/169) - Changed the second argument of `new_binary` in Python from a `BinaryRecord` to the corresponding binary model record (analogous to the Rust implementation). [#169](https://github.com/feos-org/feos/pull/169) -- Renamed `c_v` and `c_p` to `isochoric_heat_capacity` and `isobaric_heat_capacity`, respectively, and added prefixes for molar and specific properties. [#177](https://github.com/feos-org/feos/pull/158) -- `State.helmholtz_energy_contributions` in Python now accepts optional `Contributions`. [#177](https://github.com/feos-org/feos/pull/158) -- Changed `StateVec` Python getters for entropy and enthalpy to functions that accept optional `Contributions`. [#177](https://github.com/feos-org/feos/pull/158) -- `PhaseDiagram.to_dict` in Python now accepts optional `Contributions` and includes mass specific properties. [#177](https://github.com/feos-org/feos/pull/158) +- Renamed `c_v` and `c_p` to `isochoric_heat_capacity` and `isobaric_heat_capacity`, respectively, and added prefixes for molar and specific properties. [#177](https://github.com/feos-org/feos/pull/177) +- `State.helmholtz_energy_contributions` in Python now accepts optional `Contributions`. [#177](https://github.com/feos-org/feos/pull/177) +- Changed `StateVec` Python getters for entropy and enthalpy to functions that accept optional `Contributions`. [#177](https://github.com/feos-org/feos/pull/177) +- `PhaseDiagram.to_dict` in Python now accepts optional `Contributions` and includes mass specific properties. [#177](https://github.com/feos-org/feos/pull/177) +- Replaced the run-time unit checks from the `quantity` crate with compile-time unit checks with custom implementations in the new `feos_core.si` module. [#181](https://github.com/feos-org/feos/pull/181) ### Removed - Removed `EquationOfState` trait. [#158](https://github.com/feos-org/feos/pull/158) - Removed ideal gas dependencies from `PureRecord` and `SegmentRecord`. [#158](https://github.com/feos-org/feos/pull/158) - Removed Python getter and setter functions and optional arguments for ideal gas records in macros. [#158](https://github.com/feos-org/feos/pull/158) -- Removed `MolarWeight` trait. [#177](https://github.com/feos-org/feos/pull/158) +- Removed `MolarWeight` trait. [#177](https://github.com/feos-org/feos/pull/177) ### Fixed - The vapor and liquid states in a bubble or dew point iteration are assigned correctly according to the inputs, rather than based on the mole density which can be incorrect for mixtures with large differences in molar weights. [#166](https://github.com/feos-org/feos/pull/166) diff --git a/feos-core/Cargo.toml b/feos-core/Cargo.toml index 4e5087721..71d7745af 100644 --- a/feos-core/Cargo.toml +++ b/feos-core/Cargo.toml @@ -36,9 +36,6 @@ approx = "0.4" regex = "1.9" once_cell = "1.18" -[dev-dependencies] -#approx = "0.4" - [features] default = [] rayon = ["dep:rayon", "ndarray/rayon"] diff --git a/feos-core/src/state/mod.rs b/feos-core/src/state/mod.rs index 9d6427585..378db9e61 100644 --- a/feos-core/src/state/mod.rs +++ b/feos-core/src/state/mod.rs @@ -207,16 +207,6 @@ pub enum Derivative { DN(usize), } -// impl Derivative { -// pub fn reference(&self) -> SINumber { -// match self { -// Derivative::DV => SIUnit::reference_volume(), -// Derivative::DT => SIUnit::reference_temperature(), -// Derivative::DN(_) => SIUnit::reference_moles(), -// } -// } -// } - #[derive(Clone, Copy, Eq, Hash, PartialEq, Debug)] pub(crate) enum PartialDerivative { Zeroth, diff --git a/feos-dft/CHANGELOG.md b/feos-dft/CHANGELOG.md index 1464fdf1e..766c0816b 100644 --- a/feos-dft/CHANGELOG.md +++ b/feos-dft/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `HelmholtzEnergyFunctional`: added `Components` trait as trait bound and removed `ideal_gas` method. [#158](https://github.com/feos-org/feos/pull/158) - `DFT` now implements `Residual` and furthermore `IdealGas` if `F` implements `IdealGas`. [#158](https://github.com/feos-org/feos/pull/158) - What properties (and contributions) of `DFTProfile` are available now depends on whether an ideal gas model is provided or not. [#158](https://github.com/feos-org/feos/pull/158) +- Pore volumes and other integrated properties (loadings, energies, ...) are now always reported in units of volume. For translationally symmetric pores this is achieved by multiplying with the reference length (1 Å) in every direction with symmetries. [#181](https://github.com/feos-org/feos/pull/181) ### Removed - Removed `DefaultIdealGasContribution` [#158](https://github.com/feos-org/feos/pull/158)