Skip to content

Commit

Permalink
Merge branch 'development' into 774_retrofit_combos
Browse files Browse the repository at this point in the history
  • Loading branch information
FWuellhorst authored Nov 11, 2024
2 parents 69778ec + b83d754 commit bc90f70
Showing 2 changed files with 15 additions and 14 deletions.
27 changes: 13 additions & 14 deletions teaser/data/input/teaserjson_input.py
Original file line number Diff line number Diff line change
@@ -106,31 +106,30 @@ def load_teaser_json(path, project):
bldg.window_area = bldg_in["window_area"]

try:
ahu_in = bldg_in["central_ahu"]
bldg.central_ahu = BuildingAHU(parent=bldg)
bldg.central_ahu.heating = bldg_in["central_ahu"]["heating"]
bldg.central_ahu.cooling = bldg_in["central_ahu"]["cooling"]
bldg.central_ahu.dehumidification = bldg_in["central_ahu"][
"dehumidification"
]
bldg.central_ahu.humidification = bldg_in["central_ahu"]["humidification"]
bldg.central_ahu.heat_recovery = bldg_in["central_ahu"]["heat_recovery"]
bldg.central_ahu.by_pass_dehumidification = bldg_in["central_ahu"][
bldg.central_ahu.heating = ahu_in["heating"]
bldg.central_ahu.cooling = ahu_in["cooling"]
bldg.central_ahu.dehumidification = ahu_in["dehumidification"]
bldg.central_ahu.humidification = ahu_in["humidification"]
bldg.central_ahu.heat_recovery = ahu_in["heat_recovery"]
bldg.central_ahu.by_pass_dehumidification = ahu_in[
"by_pass_dehumidification"
]
bldg.central_ahu.efficiency_recovery = bldg_in["central_ahu"][
bldg.central_ahu.efficiency_recovery = ahu_in[
"efficiency_recovery"
]
bldg.central_ahu.efficiency_recovery_false = bldg_in["central_ahu"][
bldg.central_ahu.efficiency_recovery_false = ahu_in[
"efficiency_recovery_false"
]
bldg.central_ahu.min_relative_humidity_profile = bldg_in["central_ahu"][
bldg.central_ahu.min_relative_humidity_profile = ahu_in[
"min_relative_humidity_profile"
]
bldg.central_ahu.max_relative_humidity_profile = bldg_in["central_ahu"][
bldg.central_ahu.max_relative_humidity_profile = ahu_in[
"max_relative_humidity_profile"
]
bldg.central_ahu.v_flow_profile = bldg_in["central_ahu"]["v_flow_profile"]
bldg.central_ahu.temperature_profile = bldg_in["central_ahu"][
bldg.central_ahu.v_flow_profile = ahu_in["v_flow_profile"]
bldg.central_ahu.temperature_profile = ahu_in[
"temperature_profile"
]
except KeyError:
2 changes: 2 additions & 0 deletions teaser/logic/buildingobjects/building.py
Original file line number Diff line number Diff line change
@@ -668,6 +668,8 @@ def with_ahu(self, value):
if value is True and self.central_ahu is None:
self.central_ahu = BuildingAHU(self)
self._with_ahu = True
elif value and self.central_ahu and self._with_ahu is False:
self._with_ahu = True
elif value is False and self.central_ahu:
self.central_ahu = None
self._with_ahu = False

0 comments on commit bc90f70

Please sign in to comment.