181
181
),
182
182
3 : ComponentInput (
183
183
_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." ,
185
185
_type_hint = Hints .GH_BooleanHint_CS (),
186
186
),
187
187
4 : ComponentInput (
190
190
_type_hint = Component .NewFloatHint (),
191
191
),
192
192
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." ,
200
195
_type_hint = Component .NewFloatHint (),
201
196
),
202
197
}
214
209
),
215
210
3 : ComponentInput (
216
211
_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." ,
218
213
_type_hint = Hints .GH_BooleanHint_CS (),
219
214
),
220
215
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' " ,
223
218
_type_hint = Component .NewFloatHint (),
224
219
),
225
220
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' " ,
228
223
_type_hint = Component .NewFloatHint (),
229
224
),
230
225
6 : ComponentInput (
231
- _name = "temp_T1 " ,
226
+ _name = "ambient_temp_1 " ,
232
227
_description = r"(float) Temperature T1 (deg C)" ,
233
228
_type_hint = Component .NewFloatHint (),
234
229
),
235
230
7 : ComponentInput (
236
- _name = "temp_T2 " ,
231
+ _name = "ambient_temp_2 " ,
237
232
_description = r"(float) Temperature T2 (deg C)" ,
238
233
_type_hint = Component .NewFloatHint (),
239
234
),
240
235
}
241
236
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
+ }
242
269
243
270
input_groups = {
244
271
1 : inputs_electric ,
247
274
4 : inputs_district ,
248
275
5 : inputs_heat_pump_annual ,
249
276
6 : inputs_heat_pump_monthly ,
277
+ 7 : inputs_heat_pump_inside ,
250
278
}
251
279
252
280
valid_heater_types = [
256
284
"4-District" ,
257
285
"5-HeatPump" ,
258
286
"6-HeatPump" ,
287
+ "7-HeatPump" ,
259
288
]
260
289
261
290
@@ -275,6 +304,8 @@ def get_component_inputs(_heater_type):
275
304
return input_groups [5 ]
276
305
elif "6" in str (_heater_type ):
277
306
return input_groups [6 ]
307
+ elif "7" in str (_heater_type ):
308
+ return input_groups [7 ]
278
309
else :
279
310
return input_groups [1 ]
280
311
@@ -291,8 +322,9 @@ class GHCompo_CreateSHWHeater(object):
291
322
2 : {"cls" : hot_water_devices .PhHvacHotWaterHeaterBoiler , "name" : "2-Boiler (gas/oil)" },
292
323
3 : {"cls" : hot_water_devices .PhHvacHotWaterHeaterBoilerWood , "name" : "3-Boiler (wood)" },
293
324
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)" },
296
328
}
297
329
298
330
valid_types = [heater_class ["name" ] for heater_class in heater_classes .values ()]
0 commit comments