Changed the NREL and EILAT handlers to incorporate infiltration per area
This commit is contained in:
parent
726070d503
commit
fbe1701e65
|
@ -126,6 +126,10 @@ class EilatCatalog(Catalog):
|
||||||
'infiltration_rate_for_ventilation_system_off'] / cte.HOUR_TO_SECONDS
|
'infiltration_rate_for_ventilation_system_off'] / cte.HOUR_TO_SECONDS
|
||||||
infiltration_rate_for_ventilation_system_on = archetype[
|
infiltration_rate_for_ventilation_system_on = archetype[
|
||||||
'infiltration_rate_for_ventilation_system_on'] / cte.HOUR_TO_SECONDS
|
'infiltration_rate_for_ventilation_system_on'] / cte.HOUR_TO_SECONDS
|
||||||
|
infiltration_rate_area_for_ventilation_system_off = archetype[
|
||||||
|
'infiltration_rate_area_for_ventilation_system_off']
|
||||||
|
infiltration_rate_area_for_ventilation_system_on = archetype[
|
||||||
|
'infiltration_rate_area_for_ventilation_system_on']
|
||||||
|
|
||||||
archetype_constructions = []
|
archetype_constructions = []
|
||||||
for archetype_construction in archetype['constructions']:
|
for archetype_construction in archetype['constructions']:
|
||||||
|
@ -164,8 +168,8 @@ class EilatCatalog(Catalog):
|
||||||
None,
|
None,
|
||||||
infiltration_rate_for_ventilation_system_off,
|
infiltration_rate_for_ventilation_system_off,
|
||||||
infiltration_rate_for_ventilation_system_on,
|
infiltration_rate_for_ventilation_system_on,
|
||||||
0,
|
infiltration_rate_area_for_ventilation_system_off,
|
||||||
0))
|
infiltration_rate_area_for_ventilation_system_on))
|
||||||
return _catalog_archetypes
|
return _catalog_archetypes
|
||||||
|
|
||||||
def names(self, category=None):
|
def names(self, category=None):
|
||||||
|
|
|
@ -129,6 +129,12 @@ class NrelCatalog(Catalog):
|
||||||
infiltration_rate_for_ventilation_system_on = float(
|
infiltration_rate_for_ventilation_system_on = float(
|
||||||
archetype['infiltration_rate_for_ventilation_system_on']['#text']
|
archetype['infiltration_rate_for_ventilation_system_on']['#text']
|
||||||
) / cte.HOUR_TO_SECONDS
|
) / cte.HOUR_TO_SECONDS
|
||||||
|
infiltration_rate_area_for_ventilation_system_off = float(
|
||||||
|
archetype['infiltration_rate_area_for_ventilation_system_on']['#text']
|
||||||
|
)
|
||||||
|
infiltration_rate_area_for_ventilation_system_on = float(
|
||||||
|
archetype['infiltration_rate_area_for_ventilation_system_on']['#text']
|
||||||
|
)
|
||||||
|
|
||||||
archetype_constructions = []
|
archetype_constructions = []
|
||||||
for archetype_construction in archetype['constructions']['construction']:
|
for archetype_construction in archetype['constructions']['construction']:
|
||||||
|
@ -163,8 +169,8 @@ class NrelCatalog(Catalog):
|
||||||
indirect_heated_ratio,
|
indirect_heated_ratio,
|
||||||
infiltration_rate_for_ventilation_system_off,
|
infiltration_rate_for_ventilation_system_off,
|
||||||
infiltration_rate_for_ventilation_system_on,
|
infiltration_rate_for_ventilation_system_on,
|
||||||
0,
|
infiltration_rate_area_for_ventilation_system_off,
|
||||||
0))
|
infiltration_rate_area_for_ventilation_system_on))
|
||||||
return _catalog_archetypes
|
return _catalog_archetypes
|
||||||
|
|
||||||
def names(self, category=None):
|
def names(self, category=None):
|
||||||
|
|
|
@ -66,6 +66,8 @@ class EilatPhysicsParameters:
|
||||||
thermal_archetype.indirect_heated_ratio = 0
|
thermal_archetype.indirect_heated_ratio = 0
|
||||||
thermal_archetype.infiltration_rate_for_ventilation_system_on = catalog_archetype.infiltration_rate_for_ventilation_system_on
|
thermal_archetype.infiltration_rate_for_ventilation_system_on = catalog_archetype.infiltration_rate_for_ventilation_system_on
|
||||||
thermal_archetype.infiltration_rate_for_ventilation_system_off = catalog_archetype.infiltration_rate_for_ventilation_system_off
|
thermal_archetype.infiltration_rate_for_ventilation_system_off = catalog_archetype.infiltration_rate_for_ventilation_system_off
|
||||||
|
thermal_archetype.infiltration_rate_area_for_ventilation_system_on = catalog_archetype.infiltration_rate_area_for_ventilation_system_on
|
||||||
|
thermal_archetype.infiltration_rate_area_for_ventilation_system_off = catalog_archetype.infiltration_rate_area_for_ventilation_system_off
|
||||||
effective_thermal_capacity = 0
|
effective_thermal_capacity = 0
|
||||||
_constructions = []
|
_constructions = []
|
||||||
for catalog_construction in catalog_archetype.constructions:
|
for catalog_construction in catalog_archetype.constructions:
|
||||||
|
|
|
@ -69,6 +69,8 @@ class NrelPhysicsParameters:
|
||||||
thermal_archetype.indirect_heated_ratio = catalog_archetype.indirect_heated_ratio
|
thermal_archetype.indirect_heated_ratio = catalog_archetype.indirect_heated_ratio
|
||||||
thermal_archetype.infiltration_rate_for_ventilation_system_on = catalog_archetype.infiltration_rate_for_ventilation_system_on
|
thermal_archetype.infiltration_rate_for_ventilation_system_on = catalog_archetype.infiltration_rate_for_ventilation_system_on
|
||||||
thermal_archetype.infiltration_rate_for_ventilation_system_off = catalog_archetype.infiltration_rate_for_ventilation_system_off
|
thermal_archetype.infiltration_rate_for_ventilation_system_off = catalog_archetype.infiltration_rate_for_ventilation_system_off
|
||||||
|
thermal_archetype.infiltration_rate_area_for_ventilation_system_on = catalog_archetype.infiltration_rate_area_for_ventilation_system_on
|
||||||
|
thermal_archetype.infiltration_rate_area_for_ventilation_system_off = catalog_archetype.infiltration_rate_area_for_ventilation_system_off
|
||||||
_constructions = []
|
_constructions = []
|
||||||
for catalog_construction in catalog_archetype.constructions:
|
for catalog_construction in catalog_archetype.constructions:
|
||||||
construction = Construction()
|
construction = Construction()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user