forked from s_ranjbar/city_retrofit
Changes hub to incorporate change of units in infiltration
This commit is contained in:
parent
648548ea2c
commit
d37ce01304
|
@ -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.METERS_TO_FEET * cte.MINUTES_TO_SECONDS)
|
||||
ventilation_rate = space_type['ventilation_per_area'] * cte.CUBICFEET_TO_CUBIC_METERS_HOUR
|
||||
if ventilation_rate == 0:
|
||||
# cfm/person to m3/m2.s
|
||||
ventilation_rate = space_type['ventilation_per_person'] / (cte.METERS_TO_FEET * cte.MINUTES_TO_SECONDS)\
|
||||
/ occupancy_density
|
||||
ventilation_rate = space_type['ventilation_per_person'] * cte.CUBICFEET_TO_CUBIC_METERS_HOUR\
|
||||
* occupancy_density
|
||||
|
||||
lighting_radiative_fraction = space_type['lighting_fraction_radiant']
|
||||
lighting_convective_fraction = 0
|
||||
|
|
|
@ -23,6 +23,7 @@ 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'
|
||||
|
|
|
@ -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 * cte.HOUR_TO_SECONDS
|
||||
usage.mechanical_air_change = archetype.ventilation_rate / volume_per_area
|
||||
else:
|
||||
usage.mechanical_air_change = 0
|
||||
_occupancy = Occupancy()
|
||||
|
|
Loading…
Reference in New Issue
Block a user