Skip to content

Commit 92d1c5b

Browse files
committed
update
- update components - update Installer - update requirements versions
1 parent 8867c60 commit 92d1c5b

File tree

6 files changed

+72
-25
lines changed

6 files changed

+72
-25
lines changed

hbph_installer.gh

-1.09 KB
Binary file not shown.
Binary file not shown.

honeybee_ph_rhino/_component_info_.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
These are called when the component is instantiated within the Grasshopper canvas.
66
"""
77

8-
RELEASE_VERSION = "Honeybee-PH v1.6.01"
8+
RELEASE_VERSION = "Honeybee-PH v1.6.02"
99
CATEGORY = "HB-PH"
1010
SUB_CATEGORIES = {
1111
0: "00 | Utils",

honeybee_ph_rhino/gh_compo_io/hvac/create_space_conditioning_sys.py

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,21 @@ def convert_list_of_inputs(self, _input_list, _target_unit):
229229
@property
230230
def heating_system_percent_coverage(self):
231231
# type: () -> float
232-
"""Get the percent coverage of the heating system."""
232+
"""Get the percent coverage of the heating system.
233+
234+
Because I used a "_xx" prefix in the name for some reason, I need to pull this out separately.
235+
"""
233236
return float(self.input_dict.get("_percent_bldg_heating_covered", 1.0) or 1.0)
234237

238+
@property
239+
def display_name(self):
240+
# type: () -> str
241+
"""Get the percent coverage of the heating system.
242+
243+
Because I used a "_xx" prefix in the name for some reason, I need to pull this out separately.
244+
"""
245+
return self.input_dict.get("_display_name", "__unnamed_system__")
246+
235247
def run(self):
236248
# type: () -> Optional[Union[heating.PhHeatingSystem, heat_pumps.PhHeatPumpSystem]]
237249
"""Build the new PH Heating/Cooling System object."""
@@ -277,8 +289,11 @@ def run(self):
277289
if user_input:
278290
setattr(new_heating_system, attr_name, user_input)
279291

280-
# -- Set the heating percent covered
292+
# -- Set "_xx" attributes
293+
# -- This is needed because I chose to use a "_xx" prefix in the name for some reason
294+
# -- and so it would otherwise get excluded...
281295
new_heating_system.percent_coverage = self.heating_system_percent_coverage
296+
new_heating_system.display_name = self.display_name
282297

283298
# -- If its not a heat-pump with cooling, just return it.
284299
if isinstance(new_heating_system, heating.PhHeatingSystem):

honeybee_ph_rhino/gh_compo_io/shw/create_heater.py

Lines changed: 49 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
),
182182
3: ComponentInput(
183183
_name="in_conditioned_space",
184-
_description=r"(bool) Is the boiler installed inside the conditioned space? default=True.",
184+
_description=r"(bool) Is the heater installed inside the conditioned space? default=True.",
185185
_type_hint=Hints.GH_BooleanHint_CS(),
186186
),
187187
4: ComponentInput(
@@ -190,13 +190,8 @@
190190
_type_hint=Component.NewFloatHint(),
191191
),
192192
5: ComponentInput(
193-
_name="annual_system_perf_ratio",
194-
_description=r"(float) Annual system performance ratio of heat generator.",
195-
_type_hint=Component.NewFloatHint(),
196-
),
197-
6: ComponentInput(
198-
_name="annual_energy_factor",
199-
_description=r"(float) OPTIONAL - Annual energy-factor (EF) of the heat pump.",
193+
_name="total_system_perf_ratio",
194+
_description=r"(float) Total annual system performance ratio of heat generator.",
200195
_type_hint=Component.NewFloatHint(),
201196
),
202197
}
@@ -214,31 +209,63 @@
214209
),
215210
3: ComponentInput(
216211
_name="in_conditioned_space",
217-
_description=r"(bool) Is the boiler installed inside the conditioned space? default=True.",
212+
_description=r"(bool) Is the heater installed inside the conditioned space? default=True.",
218213
_type_hint=Hints.GH_BooleanHint_CS(),
219214
),
220215
4: ComponentInput(
221-
_name="rated_COP_at_T1",
222-
_description=r"(float) The rated Coefficient of Performance (COP) at temperature T1",
216+
_name="COP_1",
217+
_description=r"(float) The rated Coefficient of Performance (COP) at T='ambient_temp_1'",
223218
_type_hint=Component.NewFloatHint(),
224219
),
225220
5: ComponentInput(
226-
_name="rated_COP_at_T2",
227-
_description=r"(float) The rated Coefficient of Performance (COP) at temperature T2",
221+
_name="COP_2",
222+
_description=r"(float) The rated Coefficient of Performance (COP) T='ambient_temp_2'",
228223
_type_hint=Component.NewFloatHint(),
229224
),
230225
6: ComponentInput(
231-
_name="temp_T1",
226+
_name="ambient_temp_1",
232227
_description=r"(float) Temperature T1 (deg C)",
233228
_type_hint=Component.NewFloatHint(),
234229
),
235230
7: ComponentInput(
236-
_name="temp_T2",
231+
_name="ambient_temp_2",
237232
_description=r"(float) Temperature T2 (deg C)",
238233
_type_hint=Component.NewFloatHint(),
239234
),
240235
}
241236

237+
inputs_heat_pump_inside = {
238+
1: ComponentInput(
239+
_name="display_name",
240+
_description=r"(str) An optional name for the HW-Heater.",
241+
_type_hint=Component.NewStrHint(),
242+
),
243+
2: ComponentInput(
244+
_name="percent_coverage",
245+
_description=r"(float) The % of total HW energy covered by this device.",
246+
_type_hint=Component.NewFloatHint(),
247+
),
248+
3: ComponentInput(
249+
_name="in_conditioned_space",
250+
_description=r"(bool) Is the heater installed inside the conditioned space? default=True.",
251+
_type_hint=Hints.GH_BooleanHint_CS(),
252+
),
253+
4: ComponentInput(
254+
_name="annual_COP",
255+
_description=r"(float) Annual Coefficient of Performance (COP). Defined as: energy-out/energy-in.",
256+
_type_hint=Component.NewFloatHint(),
257+
),
258+
5: ComponentInput(
259+
_name="total_system_perf_ratio",
260+
_description=r"(float) Total annual system performance ratio of heat generator. Inverse of the COP. Defined as: energy-in/energy-out",
261+
_type_hint=Component.NewFloatHint(),
262+
),
263+
6: ComponentInput(
264+
_name="annual_energy_factor",
265+
_description=r"(float) Annual energy-factor (EF) of the heat pump.",
266+
_type_hint=Component.NewFloatHint(),
267+
),
268+
}
242269

243270
input_groups = {
244271
1: inputs_electric,
@@ -247,6 +274,7 @@
247274
4: inputs_district,
248275
5: inputs_heat_pump_annual,
249276
6: inputs_heat_pump_monthly,
277+
7: inputs_heat_pump_inside,
250278
}
251279

252280
valid_heater_types = [
@@ -256,6 +284,7 @@
256284
"4-District",
257285
"5-HeatPump",
258286
"6-HeatPump",
287+
"7-HeatPump",
259288
]
260289

261290

@@ -275,6 +304,8 @@ def get_component_inputs(_heater_type):
275304
return input_groups[5]
276305
elif "6" in str(_heater_type):
277306
return input_groups[6]
307+
elif "7" in str(_heater_type):
308+
return input_groups[7]
278309
else:
279310
return input_groups[1]
280311

@@ -291,8 +322,9 @@ class GHCompo_CreateSHWHeater(object):
291322
2: {"cls": hot_water_devices.PhHvacHotWaterHeaterBoiler, "name": "2-Boiler (gas/oil)"},
292323
3: {"cls": hot_water_devices.PhHvacHotWaterHeaterBoilerWood, "name": "3-Boiler (wood)"},
293324
4: {"cls": hot_water_devices.PhHvacHotWaterHeaterDistrict, "name": "4-District"},
294-
5: {"cls": hot_water_devices.PhHvacHotWaterHeaterHeatPump, "name": "5-HeatPump (annual COP)"},
295-
6: {"cls": hot_water_devices.PhHvacHotWaterHeaterHeatPump, "name": "6-HeatPump (monthly COP)"},
325+
5: {"cls": hot_water_devices.PhHvacHotWaterHeaterHeatPump_Annual, "name": "5-HeatPump (annual COP)"},
326+
6: {"cls": hot_water_devices.PhHvacHotWaterHeaterHeatPump_Monthly, "name": "6-HeatPump (monthly COP)"},
327+
7: {"cls": hot_water_devices.PhHvacHotWaterHeaterHeatPump_Inside, "name": "7-HeatPump (inside)"},
296328
}
297329

298330
valid_types = [heater_class["name"] for heater_class in heater_classes.values()]

requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
honeybee-core>=1.58.14
2-
honeybee-energy>=1.105.64
3-
ladybug-rhino>=1.42.13
4-
honeybee-ph>=1.28.6
5-
PHX>=1.45.2
6-
PH-units>=1.5.8
2+
honeybee-energy>=1.106.2
3+
ladybug-rhino>=1.42.15
4+
honeybee-ph>=1.28.10
5+
PHX>=1.47.1
6+
PH-units>=1.5.9

0 commit comments

Comments
 (0)