From 6629ae295122167a4a517bef6b6be7e6c94b2267 Mon Sep 17 00:00:00 2001 From: DaJansenGit Date: Wed, 10 Jul 2019 13:04:26 +0200 Subject: [PATCH] Revert "remove boolean modes for internal gains mode" This reverts commit d08a873aa2da812bea2c8e45c81e3fffec683589. --- .../boundaryconditions/boundaryconditions.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/teaser/logic/buildingobjects/boundaryconditions/boundaryconditions.py b/teaser/logic/buildingobjects/boundaryconditions/boundaryconditions.py index 36e434f70..8b9d21df4 100644 --- a/teaser/logic/buildingobjects/boundaryconditions/boundaryconditions.py +++ b/teaser/logic/buildingobjects/boundaryconditions/boundaryconditions.py @@ -139,14 +139,14 @@ class BoundaryConditions(UseConditions): AixLib: Used for night set-back for simple heater. INTERNAL GAINS - internal_gains_mode: int [1, 2] + internalgains_mode: int [1, 2] mode for the internal gains calculation: 0: Temperature and activity type dependent calculation. The calculation is based on VDI2078 (default) 1: Temperature and activity type independent calculation, the max. heatflowrate is prescribed by the parameter fixed_heat_flow_rate_persons - additional_internal_gains_mode: int [1, 2] + additional_gains_mode: int [1, 2] mode for additional internal gains (other than thermal gains), default is None 1: Moisture @@ -296,10 +296,12 @@ def __init__(self, parent=None): self.heating_time = [5, 18] self._persons = 5.0 - self.internal_gains_mode = 0 - self.additional_internal_gains_mode = None - self.internal_gains_mode_temperature_independent = 2 + self.internalgains_mode = 0 + self.additional_gains_mode = None + self.internalgains_mode_temperature_independent = 2 self.fixed_heat_flow_rate_persons = 70 + self.internalgains_temperature_dependent = True + self.internalgains_with_moisture = False # todo check that only one of the three modes can be selected self.activity_type_persons = 3 self.ratio_conv_rad_persons = 0.5