From 1080f06d593dfc9f91c3b617417dea954d281c69 Mon Sep 17 00:00:00 2001
From: pilar <pilar_monsalvete@yahoo.es>
Date: Tue, 3 Nov 2020 06:38:39 -0500
Subject: [PATCH] added residential types to library copying them from mid-rise
 apartment. This needs to be changed

---
 data/physics/us_archetypes.xml                | 24 +++++++++++++++++++
 .../us_base_physics_parameters.py             |  2 +-
 .../us_new_york_city_physics_parameters.py    |  4 ++--
 .../us_new_york_city_usage_parameters.py      |  4 ++--
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/data/physics/us_archetypes.xml b/data/physics/us_archetypes.xml
index c928bf16..cd378aeb 100644
--- a/data/physics/us_archetypes.xml
+++ b/data/physics/us_archetypes.xml
@@ -805,4 +805,28 @@
         <infiltration_rate_for_ventilation_system_off units="ACH">0.10</infiltration_rate_for_ventilation_system_off>
         <infiltration_rate_for_ventilation_system_on units="ACH">0</infiltration_rate_for_ventilation_system_on>
     </archetype>
+    <archetype id="36" building_type="residential" reference_standard="ASHRAE 90.1_2004" climate_zone="ASHRAE_2004:4A">
+        <constructions>
+            <construction id="19" type="exterior wall" >
+       			<window_ratio units="-">0.15</window_ratio>
+                <window>4</window>
+            </construction>
+            <construction id="22" type="exterior slab">
+                <window_ratio units="-">0</window_ratio>
+    			<window/>
+            </construction>
+            <construction id="17" type="roof" >
+       			<window_ratio units="-">0</window_ratio>
+    			<window/>
+            </construction>
+        </constructions>
+        <average_storey_height units="m">3.05</average_storey_height>
+        <number_of_storeys units="-">3</number_of_storeys>
+        <thermal_capacity units="kJ/K m2">90</thermal_capacity>
+        <extra_loses_due_to_thermal_bridges units="W/K m2">0.15</extra_loses_due_to_thermal_bridges>
+        <indirect_heated_ratio units="-">0.15</indirect_heated_ratio>
+        <infiltration_rate_for_ventilation_system_off units="ACH">0.50</infiltration_rate_for_ventilation_system_off>
+        <infiltration_rate_for_ventilation_system_on units="ACH">0</infiltration_rate_for_ventilation_system_on>
+    </archetype>
+
 </archetypes>
diff --git a/factories/physics_feeders/us_base_physics_parameters.py b/factories/physics_feeders/us_base_physics_parameters.py
index 4bc94987..c3fb461a 100644
--- a/factories/physics_feeders/us_base_physics_parameters.py
+++ b/factories/physics_feeders/us_base_physics_parameters.py
@@ -40,7 +40,7 @@ class UsBasePhysicsParameters:
       # ToDo: remove this in the future
       # ToDo: Raise WrongArchetype if not all the surface types are defined for the given city_object
       if archetype is None:
-        print('Building ', building.name, 'has unknown archetype')
+        print('Building ', building.name, 'has unknown archetype for building type: ', building_type)
         print('type: ', building_type, UsToLibraryTypes.yoc_to_standard(building.year_of_construction),
               self._climate_zone)
         continue
diff --git a/factories/physics_feeders/us_new_york_city_physics_parameters.py b/factories/physics_feeders/us_new_york_city_physics_parameters.py
index 4640bbbc..1f845780 100644
--- a/factories/physics_feeders/us_new_york_city_physics_parameters.py
+++ b/factories/physics_feeders/us_new_york_city_physics_parameters.py
@@ -3,7 +3,7 @@ UsNewYorkCityPhysicsParameters import the construction and material information
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
-from factories.physics_feeders.helpers.us_pluto_to_function import UsPlutoToFunction as Pf
+from factories.physics_feeders.helpers.us_pluto_to_function import UsPlutoToFunction as pf
 from factories.physics_feeders.us_base_physics_parameters import UsBasePhysicsParameters
 
 
@@ -14,4 +14,4 @@ class UsNewYorkCityPhysicsParameters(UsBasePhysicsParameters):
   def __init__(self, city, base_path):
     self._city = city
     climate_zone = 'ASHRAE_2004:4A'
-    super().__init__(climate_zone, self._city.buildings, Pf.function, base_path)
+    super().__init__(climate_zone, self._city.buildings, pf.function, base_path)
diff --git a/factories/usage_feeders/us_new_york_city_usage_parameters.py b/factories/usage_feeders/us_new_york_city_usage_parameters.py
index 60e16783..536d23a4 100644
--- a/factories/usage_feeders/us_new_york_city_usage_parameters.py
+++ b/factories/usage_feeders/us_new_york_city_usage_parameters.py
@@ -3,7 +3,7 @@ UsNewYorkCityUsageParameters model the usage properties for a NYC building
 SPDX - License - Identifier: LGPL - 3.0 - or -later
 Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
-from factories.usage_feeders.helpers.us_pluto_to_usage import UsPlutoToUsage as Pu
+from factories.usage_feeders.helpers.us_pluto_to_usage import UsPlutoToUsage as pu
 from factories.usage_feeders.us_base_usage_parameters import UsBaseUsageParameters
 
 
@@ -13,4 +13,4 @@ class UsNewYorkCityUsageParameters(UsBaseUsageParameters):
   """
   def __init__(self, city):
     self._city = city
-    super().__init__(self._city, Pu.usage)
+    super().__init__(self._city, pu.usage)