From d15951d0461936efe168aebb86441dae1f3e1354 Mon Sep 17 00:00:00 2001 From: Samuel Letellier-Duchesne Date: Thu, 4 Aug 2022 08:53:45 -0400 Subject: [PATCH] An issue where a cooling setpoint higher than 50 was failing the template generation has been fixed (#363) * An issue where a cooling setpoint higher than 50 was failing the template generation * FIxes issue with Ventilation --- archetypal/template/conditioning.py | 4 ++-- archetypal/template/ventilation.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archetypal/template/conditioning.py b/archetypal/template/conditioning.py index 6a5be2e6..ffb9a57b 100644 --- a/archetypal/template/conditioning.py +++ b/archetypal/template/conditioning.py @@ -307,7 +307,7 @@ def CoolingSetpoint(self, value): assert ( self._heating_setpoint < value ), "Heating setpoint must be lower than the cooling setpoint." - self._cooling_setpoint = validators.float(value, minimum=-100, maximum=50) + self._cooling_setpoint = validators.float(value, minimum=-100, maximum=100) @property def HeatingSetpoint(self): @@ -319,7 +319,7 @@ def HeatingSetpoint(self, value): assert ( value < self._cooling_setpoint ), "Heating setpoint must be lower than the cooling setpoint." - self._heating_setpoint = validators.float(value) + self._heating_setpoint = validators.float(value, minimum=-100, maximum=100) @property def MaxCoolFlow(self): diff --git a/archetypal/template/ventilation.py b/archetypal/template/ventilation.py index fa16626d..9451fad1 100644 --- a/archetypal/template/ventilation.py +++ b/archetypal/template/ventilation.py @@ -1209,8 +1209,8 @@ def nominal_ventilation_aggregation(x): aggregated accordingly. """ how_dict = { - "Archetype": x["Archetype"][0], - "Zone Name": x["Zone Name"][0], + "Archetype": x["Archetype"].iloc[0], + "Zone Name": x["Zone Name"].iloc[0], "Name": top(x["Name"], x, "Zone Floor Area {m2}"), "Schedule Name": top(x["Schedule Name"], x, "Zone Floor Area {m2}"), "Fan Type {Exhaust;Intake;Natural}": top(