fix(Heaters): Update Heaters

- support updated honeybee-ph (v1.28.10) hot water heat pumps - format `isort`, `black` - update requirements version - update tests
PH-Tools · Jun 17, 2024 · 010ae31 · 010ae31
1 parent 69b8c43
commit 010ae31
Show file tree

Hide file tree

Showing 12 changed files with 9,893 additions and 9,894 deletions.
diff --git a/PHX/from_HBJSON/create_shw_devices.py b/PHX/from_HBJSON/create_shw_devices.py
@@ -87,7 +87,9 @@ def build_phx_hw_heater(
         "PhHvacHotWaterHeaterBoiler": hvac.PhxHeaterBoilerFossil,
         "PhHvacHotWaterHeaterBoilerWood": hvac.PhxHeaterBoilerWood,
         "PhHvacHotWaterHeaterDistrict": hvac.PhxHeaterDistrictHeat,
-        "PhHvacHotWaterHeaterHeatPump": hvac.PhxHeatPumpHotWater,
+        "PhHvacHotWaterHeaterHeatPump_Annual": hvac.PhxHeatPumpAnnual,
+        "PhHvacHotWaterHeaterHeatPump_Monthly": hvac.PhxHeatPumpMonthly,
+        "PhHvacHotWaterHeaterHeatPump_Inside": hvac.PhxHeatPumpHotWater,
     }
 
     # -- Build the basic heater and set basic data

diff --git a/PHX/from_WUFI_XML/phx_schemas.py b/PHX/from_WUFI_XML/phx_schemas.py
@@ -1549,7 +1549,7 @@ def _PhxDevice_HeatPump_HotWater(_data: wufi_xml.WufiDevice) -> PhxHeatPumpHotWa
 
     phx_obj.display_name = _data.Name or "unnamed_hot_water_heat_pump"
     phx_obj.params.annual_COP = _data.PH_Parameters.AnnualCOP
-    phx_obj.params.annual_system_perf_ratio = _data.PH_Parameters.TotalSystemPerformanceRatioHeatGenerator
+    phx_obj.params.total_system_perf_ratio = _data.PH_Parameters.TotalSystemPerformanceRatioHeatGenerator
     phx_obj.params.annual_energy_factor = _data.PH_Parameters.HPWH_EF
     return phx_obj
 

diff --git a/PHX/model/hvac/heat_pumps.py b/PHX/model/hvac/heat_pumps.py
@@ -114,7 +114,7 @@ def ambient_temp_2(self, value: Optional[float]) -> None:
 class PhxHeatPumpHotWaterParams(_base.PhxMechanicalDeviceParams):
     hp_type: HeatPumpType = field(init=False, default=HeatPumpType.HOT_WATER)
     annual_COP: Optional[float] = None
-    annual_system_perf_ratio: Optional[float] = None
+    total_system_perf_ratio: Optional[float] = None
     annual_energy_factor: Optional[float] = None
 
 

diff --git a/PHX/to_WUFI_XML/xml_schemas.py b/PHX/to_WUFI_XML/xml_schemas.py
@@ -1261,7 +1261,7 @@ def _DeviceHeaterHeatPumpPhParamsHotWater(
         XML_Node("AuxiliaryEnergyDHW", _p.aux_energy_dhw),
         XML_Node("InConditionedSpace", _p.in_conditioned_space),
         XML_Node("AnnualCOP", _p.annual_COP),
-        XML_Node("TotalSystemPerformanceRatioHeatGenerator", _p.annual_system_perf_ratio),
+        XML_Node("TotalSystemPerformanceRatioHeatGenerator", _p.total_system_perf_ratio),
         XML_Node("HPWH_EF", _p.annual_energy_factor),
         XML_Node("HPType", _p.hp_type.value),
     ]

diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,8 @@
 honeybee-core>=1.58.14
-honeybee-energy>=1.105.64
-honeybee-ph>=1.28.6
+honeybee-energy>=1.106.2
+honeybee-ph>=1.28.10
 pydantic<2.0
-PH-units>=1.5.8
+PH-units>=1.5.9
 rich
 xlwings
 lxml
diff --git a/tests/_source_gh/hbph_test_models.gh b/tests/_source_gh/hbph_test_models.gh