unitforge 0.5.9__tar.gz → 0.5.10__tar.gz

{unitforge-0.5.9 → unitforge-0.5.10}/Cargo.lock

@@ -351,7 +351,7 @@ checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unitforge"
-version = "0.5.9"
+version = "0.5.10"
 dependencies = [
  "ndarray",
  "num-traits",
@@ -367,7 +367,7 @@ dependencies = [
 
 [[package]]
 name = "unitforge_macros"
-version = "0.5.8"
+version = "0.5.10"
 dependencies = [
  "regex",
 ]

{unitforge-0.5.9 → unitforge-0.5.10}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "unitforge"
-version = "0.5.9"
+version = "0.5.10"
 edition = "2021"
 authors = ["Dr.Q team <info@askdrq.com>", "Henrik Stromberg <henrik@askdrq.com>"]
 description = "A library for unit and quantity consistent computations in Rust"
@@ -20,7 +20,7 @@ pyo3 = { version = "0.28.3", features = ["extension-module", "auto-initialize",
 numpy = { version = "0.28.0", optional = true }
 strum = { version = "0.28.0", optional = true }
 strum_macros = { version = "0.28.0", optional = true }
-unitforge_macros = { version = "0.5.8", path = "unitforge_macros" }
+unitforge_macros = { version = "0.5.10", path = "unitforge_macros" }
 
 [features]
 default = []

{unitforge-0.5.9 → unitforge-0.5.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitforge
-Version: 0.5.9
+Version: 0.5.10
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: MIT License
@@ -9,7 +9,9 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Dist: numpy>=2.2.0
 Summary: A library for unit and quantity consistent computations in Rust
 Keywords: units,quantities,simulation,physics
+Author: Dr.Q team <info@askdrq.com>, Henrik Stromberg <henrik@askdrq.com>
 Author-email: "Dr.Q team" <info@askdrq.com>, Henrik Stromberg <henrik@askdrq.com>
+License: MIT
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Repository, https://gitlab.com/henrikjstromberg/unitforge

{unitforge-0.5.9 → unitforge-0.5.10}/src/lib.rs

@@ -107,10 +107,10 @@ pub mod quantities {
     pub use molar_mass::*;
     pub mod mass_per_distance;
     pub use mass_per_distance::*;
-    pub mod power;
-    pub use power::*;
     pub mod pressure_rate;
     pub use pressure_rate::*;
+    pub mod power;
+    pub use power::*;
     pub mod force_distance;
     pub use force_distance::*;
     pub mod force_stress;
@@ -145,6 +145,8 @@ pub mod quantities {
     pub use temperature::*;
     pub mod temperature_gradient;
     pub use temperature_gradient::*;
+    pub mod thermal_conductance;
+    pub use thermal_conductance::*;
     pub mod inverse_temperature;
     pub use inverse_temperature::*;
     pub mod thermal_conductivity;

unitforge-0.5.10/src/quantities/thermal_conductance.rs

@@ -0,0 +1,42 @@
+use crate::impl_macros::macros::*;
+
+#[cfg_attr(feature = "strum", derive(EnumIter))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Copy, Clone, PartialEq, Debug, Hash, Eq)]
+#[cfg_attr(feature = "pyo3", pyclass(eq, eq_int, from_py_object))]
+pub enum ThermalConductanceUnit {
+    mW_K,
+    W_K,
+    kW_K,
+}
+
+impl ThermalConductanceUnit {
+    pub const fn base_per_x_const(self) -> (f64, i32) {
+        match self {
+            ThermalConductanceUnit::mW_K => (1., -3),
+            ThermalConductanceUnit::W_K => (1., 0),
+            ThermalConductanceUnit::kW_K => (1., 3),
+        }
+    }
+}
+
+impl PhysicsUnit for ThermalConductanceUnit {
+    fn name(&self) -> &str {
+        match self {
+            ThermalConductanceUnit::mW_K => "mW/K",
+            ThermalConductanceUnit::W_K => "W/K",
+            ThermalConductanceUnit::kW_K => "kW/K",
+        }
+    }
+
+    fn base_per_x(&self) -> (f64, i32) {
+        (*self).base_per_x_const()
+    }
+}
+
+impl_quantity!(
+    ThermalConductance,
+    ThermalConductanceUnit,
+    [ThermalConductanceUnit::W_K]
+);
+impl_div_with_self_to_f64!(ThermalConductance);

{unitforge-0.5.9 → unitforge-0.5.10}/src/relations.rs

@@ -28,6 +28,13 @@ impl_mul_relation_with_other!(Distance, InverseArea, InverseDistance);
 impl_mul_relation_with_other!(InverseDistance, Area, Distance);
 impl_mul_relation_with_other!(Velocity, Time, Distance);
 impl_mul_relation_with_other!(Force, Distance, ForceDistance);
+impl_mul_relation_with_other!(Power, Time, ForceDistance);
+impl_mul_relation_with_other!(Force, Velocity, Power);
+impl_mul_relation_with_other!(HeatFlux, Area, Power);
+impl_mul_relation_with_other!(ThermalConductivity, TemperatureGradient, HeatFlux);
+impl_mul_relation_with_other!(TemperatureGradient, Distance, Temperature);
+impl_mul_relation_with_other!(ThermalConductivity, Distance, ThermalConductance);
+impl_mul_relation_with_other!(ThermalConductance, Temperature, Power);
 impl_mul_relation_with_other!(Force, Area, ForceArea);
 impl_mul_relation_with_other!(ForceArea, Distance, ForceVolume);
 impl_mul_relation_with_other!(AreaOfMoment, Stress, ForceArea);
@@ -80,12 +87,7 @@ impl_mul_relation_with_self!(Strain, StrainSquared);
 impl_mul_relation_with_self!(Stress, StressSquared);
 impl_mul_relation_with_other!(Stress, StressSquared, StressCubed);
 impl_mul_relation_with_self!(AngularVelocity, AngularAcceleration);
-impl_mul_relation_with_other!(ThermalConductivity, TemperatureGradient, HeatFlux);
-impl_mul_relation_with_other!(TemperatureGradient, Distance, Temperature);
-impl_mul_relation_with_other!(HeatFlux, Area, Power);
-impl_mul_relation_with_other!(Power, Time, ForceDistance);
 impl_mul_relation_with_other!(ForceDistance, Frequency, Power);
-impl_mul_relation_with_other!(Force, Velocity, Power);
 impl_mul_relation_with_other!(Density, SpecificHeatCapacity, VolumetricHeatCapacity);
 impl_mul_relation_with_other!(VolumetricHeatCapacity, Temperature, VolumetricEnergyDensity);
 impl_mul_relation_with_other!(SpecificHeatCapacity, Temperature, SpecificEnergy);

{unitforge-0.5.9 → unitforge-0.5.10}/tests/quantities.rs

@@ -361,6 +361,70 @@ mod test_thermo_and_rates {
         ));
     }
 
+    #[test]
+    fn thermal_quantities_convert_and_relate_to_energy() {
+        let conductivity = ThermalConductivity::new(1.0, ThermalConductivityUnit::kW_mK);
+        assert!(crate::approx_eq(
+            conductivity.to(ThermalConductivityUnit::mW_mK),
+            1_000_000.0,
+            1e-6
+        ));
+
+        let gradient = TemperatureGradient::new(2.0, TemperatureGradientUnit::K_m);
+        let flux = ThermalConductivity::new(1.0, ThermalConductivityUnit::kW_mK) * gradient;
+        assert!(crate::approx_eq(flux.to(HeatFluxUnit::kW_msq), 2.0, 1e-12));
+
+        let area = Area::new(0.5, AreaUnit::msq);
+        let power = flux * area;
+        assert!(crate::approx_eq(power.to(PowerUnit::W), 1000.0, 1e-12));
+
+        let duration = Time::new(30.0, TimeUnit::s);
+        let energy = power * duration;
+        assert!(crate::approx_eq(energy.to(EnergyUnit::J), 30_000.0, 1e-12));
+        assert!(crate::approx_eq(
+            (energy / duration).to(PowerUnit::kW),
+            1.0,
+            1e-12
+        ));
+    }
+
+    #[test]
+    fn thermal_conductance_relates_conductivity_length_and_power() {
+        let conductivity = ThermalConductivity::new(200.0, ThermalConductivityUnit::W_mK);
+        let characteristic_length = Distance::new(0.05, DistanceUnit::m);
+        let conductance = conductivity * characteristic_length;
+        assert!(crate::approx_eq(
+            conductance.to(ThermalConductanceUnit::W_K),
+            10.0,
+            1e-12
+        ));
+
+        let temperature_difference = Temperature::new(15.0, TemperatureUnit::K);
+        let power = conductance * temperature_difference;
+        assert!(crate::approx_eq(power.to(PowerUnit::W), 150.0, 1e-12));
+
+        assert!(crate::approx_eq(
+            (power / conductance).to(TemperatureUnit::K),
+            15.0,
+            1e-12
+        ));
+        assert!(crate::approx_eq(
+            (power / temperature_difference).to(ThermalConductanceUnit::W_K),
+            10.0,
+            1e-12
+        ));
+        assert!(crate::approx_eq(
+            (conductance / conductivity).to(DistanceUnit::m),
+            0.05,
+            1e-12
+        ));
+        assert!(crate::approx_eq(
+            (conductance / characteristic_length).to(ThermalConductivityUnit::W_mK),
+            200.0,
+            1e-12
+        ));
+    }
+
     #[test]
     fn specific_and_molar_gas_constants_relate_through_molar_mass() {
         let molar_mass = MolarMass::new(28.97, MolarMassUnit::g_mol);

{unitforge-0.5.9 → unitforge-0.5.10}/unitforge_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "unitforge_macros"
-version = "0.5.8"
+version = "0.5.10"
 edition = "2021"
 authors = ["Dr.Q team <info@askdrq.com>", "Henrik Stromberg <henrik@askdrq.com>"]
 description = "Proc macros for generating units, quantities, and Python bindings in unitforge"