thermolib 0.7.6__tar.gz → 0.7.7__tar.gz

thermolib-0.7.7/Cargo.lock

@@ -0,0 +1,252 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "anyhow"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
+[[package]]
+name = "itoa"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "portable-atomic"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884"
+dependencies = [
+ "anyhow",
+ "cfg-if",
+ "indoc",
+ "libc",
+ "memoffset",
+ "once_cell",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "serde"
+version = "1.0.217"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.217"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.134"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "thermolib"
+version = "0.7.7"
+dependencies = [
+ "anyhow",
+ "pyo3",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "unindent"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"

{thermolib-0.7.6 → thermolib-0.7.7}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thermolib"
-version = "0.7.6"
+version = "0.7.7"
 edition = "2021"
 license = "MIT"
 description = "An open-source library for the calculation of fluid properties"
@@ -11,7 +11,6 @@ repository = "https://github.com/shaw-yu2020/thermolib"
 [dependencies]
 anyhow = "1.0"
 thiserror = "1.0"
-eframe = "0.27.2"
 serde_json = "1.0.110"
 
 [dependencies.serde]

{thermolib-0.7.6 → thermolib-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: thermolib
-Version: 0.7.6
+Version: 0.7.7
 License-File: LICENSE
 Summary: An open-source library for the calculation of fluid properties
 License: MIT

{thermolib-0.7.6 → thermolib-0.7.7}/src/helmholtz/alpha.rs

@@ -3,6 +3,7 @@ use super::{HelmholtzErr, Phase};
 use super::{IdealHelmholtz, ResidualHelmholtz};
 use super::{PsEqn, RholEqn, RhovEqn};
 use anyhow::anyhow;
+#[cfg(feature = "with_pyo3")]
 use pyo3::{pyclass, pymethods};
 use serde::{Deserialize, Serialize};
 /// Helmholtz EOS
@@ -26,7 +27,7 @@ use serde::{Deserialize, Serialize};
 ///     assert_eq!(96.51, (SO2.s().unwrap() * 1e2).round() / 1e2);
 /// }
 /// ```
-#[pyclass]
+#[cfg_attr(feature = "with_pyo3", pyclass)]
 #[derive(Debug, Deserialize, Serialize)]
 #[allow(non_snake_case)]
 pub struct Helmholtz {
@@ -44,6 +45,35 @@ pub struct Helmholtz {
     #[serde(skip, default)]
     phase: Phase,
 }
+impl Helmholtz {
+    /// read helmholtz equation of state from fluid.json file
+    pub fn read_json(path: &str) -> anyhow::Result<Helmholtz> {
+        let mut file_json: Option<std::fs::File>;
+        file_json = match std::fs::File::open(std::path::Path::new(path)) {
+            Ok(file) => Some(file),
+            Err(_) => None,
+        };
+        if file_json.is_none() {
+            file_json = match std::fs::File::open(
+                std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
+                    .join("res")
+                    .join(path),
+            ) {
+                Ok(file) => Some(file),
+                Err(_) => None,
+            };
+        };
+        let mut file_json = file_json.ok_or(anyhow!(HelmholtzErr::NoJson))?;
+        let mut str_json = String::new();
+        let _ = std::io::Read::read_to_string(&mut file_json, &mut str_json);
+        let eos: Option<Helmholtz> = match serde_json::from_str(&str_json) {
+            Ok(eos) => Some(eos),
+            Err(_) => None,
+        };
+        let eos = eos.ok_or(anyhow!(HelmholtzErr::NoHelmholtz))?;
+        Ok(eos)
+    }
+}
 #[allow(non_snake_case)]
 impl Helmholtz {
     fn calc_p(&self, T: f64, rho: f64) -> f64 {
@@ -119,36 +149,13 @@ impl Helmholtz {
             / delta
     }
 }
-#[pymethods]
+#[cfg_attr(feature = "with_pyo3", pymethods)]
 #[allow(non_snake_case)]
 impl Helmholtz {
-    /// read helmholtz equation of state from fluid.json file
+    #[cfg(feature = "with_pyo3")]
     #[new]
-    pub fn read_json(path: &str) -> anyhow::Result<Helmholtz> {
-        let mut file_json: Option<std::fs::File>;
-        file_json = match std::fs::File::open(std::path::Path::new(path)) {
-            Ok(file) => Some(file),
-            Err(_) => None,
-        };
-        if file_json.is_none() {
-            file_json = match std::fs::File::open(
-                std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
-                    .join("res")
-                    .join(path),
-            ) {
-                Ok(file) => Some(file),
-                Err(_) => None,
-            };
-        };
-        let mut file_json = file_json.ok_or(anyhow!(HelmholtzErr::NoJson))?;
-        let mut str_json = String::new();
-        let _ = std::io::Read::read_to_string(&mut file_json, &mut str_json);
-        let eos: Option<Helmholtz> = match serde_json::from_str(&str_json) {
-            Ok(eos) => Some(eos),
-            Err(_) => None,
-        };
-        let eos = eos.ok_or(anyhow!(HelmholtzErr::NoHelmholtz))?;
-        Ok(eos)
+    pub fn new_py(path: &str) -> anyhow::Result<Helmholtz> {
+        Self::read_json(path)
     }
     pub fn set_molar_unit(&mut self) {
         if self.R > 10.0 {

{thermolib-0.7.6 → thermolib-0.7.7}/src/liquid_metal.rs

@@ -1,7 +1,5 @@
-use anyhow::anyhow;
+#[cfg(feature = "with_pyo3")]
 use pyo3::{pyclass, pymethods};
-use std::collections::HashMap;
-use std::sync::OnceLock;
 use thiserror::Error;
 #[derive(Debug, Error)]
 enum LiquidMetalErr {
@@ -17,9 +15,12 @@ enum LiquidMetalErr {
 mod eta;
 mod lambda;
 mod rho;
+use anyhow::anyhow;
 use eta::metals2etaparams;
 use lambda::metals2lambdaparams;
 use rho::metals2rhoparams;
+use std::collections::HashMap;
+use std::sync::OnceLock;
 /// liquid metal
 /// + Density, unit: kg/m3
 /// + Thermal Conductivity, unit: W/m/K
@@ -35,15 +36,13 @@ use rho::metals2rhoparams;
 /// let lambda = metal.calc_lambda(T).unwrap(); // W/m/K
 /// assert_eq!(54.88, (lambda * 1e2).round() / 1e2);
 /// ```
-#[pyclass]
+#[cfg_attr(feature = "with_pyo3", pyclass)]
 #[allow(non_snake_case)]
 pub struct LiquidMetal {
     metal: Metals,
 }
-#[pymethods]
-#[allow(non_snake_case)]
 impl LiquidMetal {
-    #[new]
+    #[allow(non_snake_case)]
     pub fn new_metal(name: &str) -> anyhow::Result<LiquidMetal> {
         if let Some(metal) = string2metals().get(name) {
             Ok(Self {
@@ -53,6 +52,15 @@ impl LiquidMetal {
             Err(anyhow!(LiquidMetalErr::NoLiquidMetal))
         }
     }
+}
+#[cfg_attr(feature = "with_pyo3", pymethods)]
+#[allow(non_snake_case)]
+impl LiquidMetal {
+    #[cfg(feature = "with_pyo3")]
+    #[new]
+    pub fn new_py(name: &str) -> anyhow::Result<LiquidMetal> {
+        Self::new_metal(name)
+    }
     /// calculate density of liquid metals at 0.1 MPa, unit: kg/m3
     pub fn calc_rho(&self, T: f64) -> anyhow::Result<f64> {
         if let Some(rho_params) = metals2rhoparams().get(&self.metal) {