s_ranjbar/summer_course_2024
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rolled back some changes and hardcoded values

Browse Source
This commit is contained in:
Pilar Monsalvete 2023-05-02 14:36:04 -04:00
parent 78b21093bb
commit 9317e46d5e
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hub/catalog_factories/usage/nrcan_catalog.py
View File

@ -130,11 +130,11 @@ class NrcanCatalog(Catalog):
# ACH
mechanical_air_change = space_type['ventilation_air_changes']
# cfm/ft2 to m3/m2.s
ventilation_rate = space_type['ventilation_per_area'] * cte.CUBICFEET_TO_CUBIC_METERS_HOUR
ventilation_rate = space_type['ventilation_per_area'] / (cte.METERS_TO_FEET * cte.MINUTES_TO_SECONDS)
if ventilation_rate == 0:
# cfm/person to m3/m2.s
ventilation_rate = space_type['ventilation_per_person'] * cte.CUBICFEET_TO_CUBIC_METERS_HOUR\
* occupancy_density
ventilation_rate = space_type['ventilation_per_person'] / (cte.METERS_TO_FEET * cte.MINUTES_TO_SECONDS)\
/ occupancy_density
lighting_radiative_fraction = space_type['lighting_fraction_radiant']
lighting_convective_fraction = 0

6
hub/city_model_structure/building_demand/thermal_zone.py
View File

@ -603,11 +603,9 @@ class ThermalZone:
_mean_peak_flow = 0
_mean_service_temperature = 0
for usage in self.usages:
#todo: change hardcoded density DHW
#_mean_peak_density_load += usage.percentage * 1 #usage.domestic_hot_water.density
_mean_peak_density_load += usage.percentage * usage.domestic_hot_water.density
_mean_peak_flow += usage.percentage * usage.domestic_hot_water.peak_flow
# todo: change hardcoded service temperature
_mean_service_temperature += usage.percentage * 45
_mean_service_temperature += usage.percentage * usage.domestic_hot_water.service_temperature
self._domestic_hot_water.density = _mean_peak_density_load
self._domestic_hot_water.peak_flow = _mean_peak_flow
self._domestic_hot_water.service_temperature = _mean_service_temperature

1
hub/helpers/constants.py
View File

@ -23,7 +23,6 @@ METERS_TO_FEET = 3.28084
BTU_H_TO_WATTS = 0.29307107
KILO_WATTS_HOUR_TO_JULES = 3600000
GALLONS_TO_QUBIC_METERS = 0.0037854117954011185
CUBICFEET_TO_CUBIC_METERS_HOUR=1.699
# time
SECOND = 'second'

2
hub/imports/usage/nrcan_usage_parameters.py
View File

@ -83,7 +83,7 @@ class NrcanUsageParameters:
if archetype.mechanical_air_change > 0:
usage.mechanical_air_change = archetype.mechanical_air_change
elif archetype.ventilation_rate > 0:
usage.mechanical_air_change = archetype.ventilation_rate / volume_per_area
usage.mechanical_air_change = archetype.ventilation_rate / volume_per_area * cte.HOUR_TO_SECONDS
else:
usage.mechanical_air_change = 0
_occupancy = Occupancy()