diff --git a/hub/catalog_factories/construction/eilat_catalog.py b/hub/catalog_factories/construction/eilat_catalog.py index 8868f3e1..0afe0f73 100644 --- a/hub/catalog_factories/construction/eilat_catalog.py +++ b/hub/catalog_factories/construction/eilat_catalog.py @@ -126,6 +126,10 @@ class EilatCatalog(Catalog): 'infiltration_rate_for_ventilation_system_off'] / cte.HOUR_TO_SECONDS infiltration_rate_for_ventilation_system_on = archetype[ '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 = [] for archetype_construction in archetype['constructions']: @@ -164,8 +168,8 @@ class EilatCatalog(Catalog): None, infiltration_rate_for_ventilation_system_off, infiltration_rate_for_ventilation_system_on, - 0, - 0)) + infiltration_rate_area_for_ventilation_system_off, + infiltration_rate_area_for_ventilation_system_on)) return _catalog_archetypes def names(self, category=None): diff --git a/hub/catalog_factories/construction/nrel_catalog.py b/hub/catalog_factories/construction/nrel_catalog.py index 6236a420..f825746b 100644 --- a/hub/catalog_factories/construction/nrel_catalog.py +++ b/hub/catalog_factories/construction/nrel_catalog.py @@ -129,6 +129,12 @@ class NrelCatalog(Catalog): infiltration_rate_for_ventilation_system_on = float( archetype['infiltration_rate_for_ventilation_system_on']['#text'] ) / 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 = [] for archetype_construction in archetype['constructions']['construction']: @@ -163,8 +169,8 @@ class NrelCatalog(Catalog): indirect_heated_ratio, infiltration_rate_for_ventilation_system_off, infiltration_rate_for_ventilation_system_on, - 0, - 0)) + infiltration_rate_area_for_ventilation_system_off, + infiltration_rate_area_for_ventilation_system_on)) return _catalog_archetypes def names(self, category=None): diff --git a/hub/imports/construction/eilat_physics_parameters.py b/hub/imports/construction/eilat_physics_parameters.py index 6aab492e..9f800079 100644 --- a/hub/imports/construction/eilat_physics_parameters.py +++ b/hub/imports/construction/eilat_physics_parameters.py @@ -66,6 +66,8 @@ class EilatPhysicsParameters: 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_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 _constructions = [] for catalog_construction in catalog_archetype.constructions: diff --git a/hub/imports/construction/nrel_physics_parameters.py b/hub/imports/construction/nrel_physics_parameters.py index d38a4bd4..36fc84b7 100644 --- a/hub/imports/construction/nrel_physics_parameters.py +++ b/hub/imports/construction/nrel_physics_parameters.py @@ -69,6 +69,8 @@ class NrelPhysicsParameters: 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_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 = [] for catalog_construction in catalog_archetype.constructions: construction = Construction()