Changes according to review, added SAFTVRQMie

feos-org · g-bauer · Apr 18, 2024 · Feb 12, 2024 · Feb 15, 2024 · Feb 16, 2024
commit e98410a3018eda40944348420f284007c1612f36
diff --git a/feos-core/src/equation_of_state/ideal_gas.rs b/feos-core/src/equation_of_state/ideal_gas.rs
@@ -2,6 +2,7 @@ use super::Components;
 use crate::StateHD;
 use ndarray::Array1;
 use num_dual::DualNum;
+use std::fmt::Display;
 
 /// Ideal gas Helmholtz energy contribution.
 pub trait IdealGas: Components + Sync + Send {

diff --git a/feos-core/src/equation_of_state/mod.rs b/feos-core/src/equation_of_state/mod.rs
@@ -52,6 +52,12 @@ impl<I: IdealGas> EquationOfState<I, NoResidual> {
     }
 }
 
+impl<I: IdealGas, R> Display for EquationOfState<I, R> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.ideal_gas)
+    }
+}
+
 impl<I: Components, R: Components> Components for EquationOfState<I, R> {
     fn components(&self) -> usize {
         assert_eq!(

diff --git a/feos-core/src/lib.rs b/feos-core/src/lib.rs
@@ -133,6 +133,12 @@ mod tests {
     // Only to be able to instantiate an `EquationOfState`
     struct NoIdealGas;
 
+    impl Display for NoIdealGas {
+        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+            write!(f, "NoIdealGas")
+        }
+    }
+
     impl Components for NoIdealGas {
         fn components(&self) -> usize {
             1

diff --git a/feos-derive/src/ideal_gas.rs b/feos-derive/src/ideal_gas.rs
@@ -8,8 +8,10 @@ pub(crate) fn expand_ideal_gas(input: DeriveInput) -> syn::Result<proc_macro2::T
     };
 
     let ideal_gas = impl_ideal_gas(variants);
+    let display = impl_display(variants);
     Ok(quote! {
         #ideal_gas
+        #display
     })
 }