m_osman/city_retrofit
1
0
Fork 0
forked from s_ranjbar/city_retrofit
Code Pull Requests Activity

Merge branch 'print_erased' into 'master'

Browse Source 
Print erased

See merge request Guille/hub!26
This commit is contained in:
Guillermo Gutierrez Morote 2022-06-08 21:23:18 +00:00
commit 04ef5d2c2e
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
city_model_structure/building_demand/thermal_zone.py
View File

@ -467,7 +467,7 @@ class ThermalZone:
_base_schedule.time_step = cte.HOUR _base_schedule.time_step = cte.HOUR
_base_schedule.data_type = cte.ANY_NUMBER _base_schedule.data_type = cte.ANY_NUMBER
_schedules_defined = True _schedules_defined = True
values = numpy.zeros(24, 8) values = numpy.zeros([24, 8])
for usage_zone in self.usage_zones: for usage_zone in self.usage_zones:
for internal_gain in usage_zone.internal_gains: for internal_gain in usage_zone.internal_gains:
_average_internal_gain += internal_gain.average_internal_gain * usage_zone.percentage _average_internal_gain += internal_gain.average_internal_gain * usage_zone.percentage

1
exports/formats/idf.py
View File

@ -455,7 +455,6 @@ class Idf:
construction_name = f'{boundary.construction_name}_{boundary.vegetation.name}' construction_name = f'{boundary.construction_name}_{boundary.vegetation.name}'
else: else:
construction_name = boundary.construction_name construction_name = boundary.construction_name
print(outside_boundary_condition, sun_exposure, wind_exposure)
surface = self._idf.newidfobject(self._SURFACE, Name=f'{boundary.parent_surface.name}', surface = self._idf.newidfobject(self._SURFACE, Name=f'{boundary.parent_surface.name}',
Surface_Type=idf_surface_type, Surface_Type=idf_surface_type,
Zone_Name=thermal_zone.id, Zone_Name=thermal_zone.id,

2
imports/usage/comnet_usage_parameters.py
View File

@ -298,7 +298,7 @@ class ComnetUsageParameters:
_radiative_heat_gain = archetype.occupancy.sensible_radiative_internal_gain _radiative_heat_gain = archetype.occupancy.sensible_radiative_internal_gain
_total_heat_gain = (_latent_heat_gain + _convective_heat_gain + _radiative_heat_gain) _total_heat_gain = (_latent_heat_gain + _convective_heat_gain + _radiative_heat_gain)
_schedule_values = numpy.zeros(24, 7) _schedule_values = numpy.zeros([24, 8])
_sum = 0 _sum = 0
for day, _schedule in enumerate(archetype.occupancy.schedules): for day, _schedule in enumerate(archetype.occupancy.schedules):
for v, value in enumerate(_schedule.values): for v, value in enumerate(_schedule.values):

2
unittests/test_enrichement.py
View File

@ -60,7 +60,7 @@ class TestGeometryFactory(TestCase):
self.assertIsNotNone(thermal_zone.days_year, 'thermal_zone days a year is none') self.assertIsNotNone(thermal_zone.days_year, 'thermal_zone days a year is none')
self.assertIsNotNone(thermal_zone.occupancy, 'thermal_zone occupancy is none') self.assertIsNotNone(thermal_zone.occupancy, 'thermal_zone occupancy is none')
self.assertIsNotNone(thermal_zone.thermal_control, 'thermal_zone thermal control is none') self.assertIsNotNone(thermal_zone.thermal_control, 'thermal_zone thermal control is none')
self.assertIsNotNone(thermal_zone.get_internal_gains(), 'thermal_zone internal gains returns none') self.assertIsNotNone(thermal_zone.internal_gains, 'thermal_zone internal gains returns none')
def _check_extra_thermal_zone(self, thermal_zone): def _check_extra_thermal_zone(self, thermal_zone):
self.assertIsNotNone(thermal_zone.lighting, 'thermal_zone lighting is none') self.assertIsNotNone(thermal_zone.lighting, 'thermal_zone lighting is none')