fix(power): Fix / Add Power conversion factors

PH-Tools · Jan 12, 2023 · 7ac446a · 7ac446a
1 parent c77188f
commit 7ac446a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 2 deletions.
diff --git a/ph_units/unit_types/power.py b/ph_units/unit_types/power.py
@@ -12,6 +12,7 @@ class Kilowatts(Base_UnitType):
     __factors__ = {
         "SI": "{}*1",
         "KW": "{}*1",
+        "W": "{}*1000",
         "BTU/HR": "{}*3412.141156",
         "KBTU/HR": "{}*3.412141156",
     }
@@ -88,4 +89,22 @@ class BtuPerHour(Base_UnitType):
 
     __symbol__ = "BTUH"
     __aliases__ = ["BTU/HR", "BTU/H", "BTUHR"]
-    __factors__ = {"SI": "{}*0.586142222", "W": "{}*0.586142222"}
+    __factors__ = {
+        "SI": "{}*0.293071111",
+        "KBTUH": "{}/1000",
+        "W": "{}*0.293071111",
+        "KW": "{}*0.000293071",
+    }
+
+
+class KiloBtuPerHour(Base_UnitType):
+    """KBTU/H"""
+
+    __symbol__ = "KBTUH"
+    __aliases__ = ["KBTU/HR", "KBTU/H", "KBTUHR"]
+    __factors__ = {
+        "SI": "{}*0.293071111",
+        "BTUH": "{}*1000",
+        "W": "{}*293.0711111",
+        "KW": "{}*0.293071111",
+    }
diff --git a/ph_units/unit_types/volume_flow.py b/ph_units/unit_types/volume_flow.py
@@ -38,7 +38,7 @@ class MeterCubedPerHour(Base_UnitType):
     """M3/HR"""
 
     __symbol__ = "M3/HR"
-    __aliases__ = ["CM/H", "CMH"]
+    __aliases__ = ["CM/H", "CMH", "M3/H"]
     __factors__ = {
         "SI": "{}*1",
         "M3/S": "({}/60)/60",

diff --git a/tests/test_power.py b/tests/test_power.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# -*- Python Version: 2.7 -*-
+
+from ph_units.converter import convert
+
+
+def test_kW():
+    assert convert(1, "KW", "SI") == 1
+    assert convert(1, "KW", "KW") == 1
+    assert convert(1, "KW", "W") == 1_000
+    assert convert(1, "KW", "BTU/HR") == 3412.141156
+    assert convert(1, "KW", "KBTU/HR") == 3.412141156
+
+
+def test_Btu_hr():
+    assert convert(1, "BTUH", "SI") == 0.293071111  # W
+    assert convert(1, "BTUH", "W") == 0.293071111
+    assert convert(1, "BTUH", "KW") == 0.000293071
+    assert convert(650_678, "BTUH", "KW") == 190.694852138
+
+
+def test_kBtu_aliases():
+    assert convert(1, "KBTUH", "SI") == 0.293071111
+    assert convert(1, "KBTU/HR", "SI") == 0.293071111
+    assert convert(1, "KBTU/H", "SI") == 0.293071111
+    assert convert(1, "KBTUHR", "SI") == 0.293071111
+
+
+def test_kBtu_hr():
+    assert convert(1, "KBTUH", "SI") == 0.293071111
+    assert convert(1, "KBTUH", "BTUH") == 1_000
+    assert convert(1, "KBTUH", "W") == 293.0711111
+    assert convert(1, "KBTUH", "KW") == 0.293071111