From 8250df79a8b34fc08717087f657f5604e118c7d2 Mon Sep 17 00:00:00 2001
From: pilar <pilar_monsalvete@yahoo.es>
Date: Tue, 5 Jan 2021 15:20:44 -0500
Subject: [PATCH] fixed xml files

---
 data/physics/ca_archetypes_reduced.xml        | 66 ++++++++---------
 data/physics/ca_constructions_reduced.xml     | 72 ++++++++++---------
 .../physics_feeders/ca_physics_parameters.py  |  1 -
 3 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/data/physics/ca_archetypes_reduced.xml b/data/physics/ca_archetypes_reduced.xml
index 40628f87..dd54c3c0 100644
--- a/data/physics/ca_archetypes_reduced.xml
+++ b/data/physics/ca_archetypes_reduced.xml
@@ -4,13 +4,13 @@
 		<constructions>
 			<construction id="1" type="roof" >
 			</construction>
-			<construction id="1" type="wall" >
+			<construction id="9" type="wall" >
 				<window_ratio units="-">0.11</window_ratio>
-				<window>1</window>
+				<window>33</window>
 			</construction>
-			<construction id="1" type="basement_wall" >
+			<construction id="17" type="basement_wall" >
 			</construction>
-			<construction id="1" type="floor" >
+			<construction id="25" type="floor" >
 			</construction>
 		</constructions>
 		<average_storey_height units="m">3.05</average_storey_height>
@@ -25,13 +25,13 @@
 		<constructions>
 			<construction id="2" type="roof" >
 			</construction>
-			<construction id="2" type="wall" >
+			<construction id="10" type="wall" >
 			<window_ratio units="-">0.11</window_ratio>
-			<window>2</window>
+			<window>34</window>
 			</construction>
-			<construction id="2" type="basement_wall" >
+			<construction id="18" type="basement_wall" >
 			</construction>
-			<construction id="2" type="floor" >
+			<construction id="26" type="floor" >
 			</construction>
 		</constructions>
 		<average_storey_height units="m">3.05</average_storey_height>
@@ -46,13 +46,13 @@
 		<constructions>
 			<construction id="3" type="roof" >
 			</construction>
-			<construction id="3" type="wall" >
+			<construction id="11" type="wall" >
 			<window_ratio units="-">0.11</window_ratio>
-			<window>2</window>
+			<window>34</window>
 			</construction>
-			<construction id="3" type="basement_wall" >
+			<construction id="19" type="basement_wall" >
 			</construction>
-			<construction id="3" type="floor" >
+			<construction id="27" type="floor" >
 			</construction>
 		</constructions>
 		<average_storey_height units="m">3.05</average_storey_height>
@@ -67,13 +67,13 @@
 		<constructions>
 			<construction id="4" type="roof" >
 			</construction>
-			<construction id="4" type="wall" >
+			<construction id="12" type="wall" >
 			<window_ratio units="-">0.11</window_ratio>
-			<window>2</window>
+			<window>34</window>
 			</construction>
-			<construction id="4" type="basement_wall" >
+			<construction id="20" type="basement_wall" >
 			</construction>
-			<construction id="4" type="floor" >
+			<construction id="28" type="floor" >
 			</construction>
 		</constructions>
 		<average_storey_height units="m">3.05</average_storey_height>
@@ -88,13 +88,13 @@
 		<constructions>
 			<construction id="5" type="roof" >
 			</construction>
-			<construction id="5" type="wall" >
+			<construction id="13" type="wall" >
 			<window_ratio units="-">0.11</window_ratio>
-			<window>2</window>
+			<window>34</window>
 			</construction>
-			<construction id="5" type="basement_wall" >
+			<construction id="21" type="basement_wall" >
 			</construction>
-			<construction id="5" type="floor" >
+			<construction id="29" type="floor" >
 			</construction>
 		</constructions>
 		<average_storey_height units="m">3.05</average_storey_height>
@@ -109,13 +109,13 @@
 		<constructions>
 			<construction id="6" type="roof" >
 			</construction>
-			<construction id="6" type="wall" >
+			<construction id="14" type="wall" >
 			<window_ratio units="-">0.11</window_ratio>
-			<window>2</window>
+			<window>34</window>
 			</construction>
-			<construction id="6" type="basement_wall" >
+			<construction id="22" type="basement_wall" >
 			</construction>
-			<construction id="6" type="floor" >
+			<construction id="30" type="floor" >
 			</construction>
 		</constructions>
 		<average_storey_height units="m">3.05</average_storey_height>
@@ -130,13 +130,13 @@
 		<constructions>
 			<construction id="7" type="roof" >
 			</construction>
-			<construction id="7" type="wall" >
+			<construction id="15" type="wall" >
 			<window_ratio units="-">0.11</window_ratio>
-			<window>2</window>
+			<window>34</window>
 			</construction>
-			<construction id="7" type="basement_wall" >
+			<construction id="23" type="basement_wall" >
 			</construction>
-			<construction id="7" type="floor" >
+			<construction id="31" type="floor" >
 			</construction>
 		</constructions>
 		<average_storey_height units="m">3.05</average_storey_height>
@@ -151,13 +151,13 @@
 		<constructions>
 			<construction id="8" type="roof" >
 			</construction>
-			<construction id="8" type="wall" >
+			<construction id="16" type="wall" >
 			<window_ratio units="-">0.11</window_ratio>
-			<window>2</window>
+			<window>34</window>
 			</construction>
-			<construction id="8" type="basement_wall" >
+			<construction id="24" type="basement_wall" >
 			</construction>
-			<construction id="8" type="floor" >
+			<construction id="32" type="floor" >
 			</construction>
 		</constructions>
 		<average_storey_height units="m">3.05</average_storey_height>
@@ -168,4 +168,4 @@
 		<infiltration_rate_for_ventilation_system_off units="ACH">4.55</infiltration_rate_for_ventilation_system_off>
 		<infiltration_rate_for_ventilation_system_on units="ACH">0</infiltration_rate_for_ventilation_system_on>
 	</archetype>
-</archetypes>
+</archetypes>
\ No newline at end of file
diff --git a/data/physics/ca_constructions_reduced.xml b/data/physics/ca_constructions_reduced.xml
index 68da7a45..362aa10b 100644
--- a/data/physics/ca_constructions_reduced.xml
+++ b/data/physics/ca_constructions_reduced.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <library name="us_library">
 	<windows>
-		<window type="window" id="1" name="global">
+		<window type="window" id="33" name="global">
 			<shgc>0.46</shgc>
 			<g_value>0.5</g_value>
 			<frame_ratio units="-">0</frame_ratio>
 			<overall_u_value units="W/m2 K">0.555</overall_u_value>
 		</window>
-		<window type="window" id="2" name="global">
+		<window type="window" id="34" name="global">
 			<shgc>0.52</shgc>
 			<g_value>0.5</g_value>
 			<frame_ratio units="-">0</frame_ratio>
@@ -41,7 +41,7 @@
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
 		<construction type="roof" id="6" name="ceiling under attic_1961-1977">
-			<overall_u_value units="W/m2 K">0.225</overall_u_value>
+			<overall_u_value units="W/m2 K">0.256</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
@@ -55,122 +55,128 @@
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="wall" id="1" name="wall above grade_post 2010">
+
+		#wall above grade
+		<construction type="wall" id="9" name="wall above grade_post 2010">
 			<overall_u_value units="W/m2 K">0.324</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="wall" id="2" name="wall above grade_2001-2010">
+		<construction type="wall" id="10" name="wall above grade_2001-2010">
 			<overall_u_value units="W/m2 K">0.285</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="wall" id="3" name="wall above grade_1996-2000">
+		<construction type="wall" id="11" name="wall above grade_1996-2000">
 			<overall_u_value units="W/m2 K">0.355</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="wall" id="4" name="wall above grade_1984-1995">
+		<construction type="wall" id="12" name="wall above grade_1984-1995">
 			<overall_u_value units="W/m2 K">0.411</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="wall" id="5" name="wall above grade_1978-1983">
+		<construction type="wall" id="13" name="wall above grade_1978-1983">
 			<overall_u_value units="W/m2 K">0.546</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="wall" id="6" name="wall above grade_1961-1977">
-			<overall_u_value units="W/m2 K">0.432</overall_u_value>
+		<construction type="wall" id="14" name="wall above grade_1961-1977">
+			<overall_u_value units="W/m2 K">0.526</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="wall" id="7" name="wall above grade_1946-1960">
+		<construction type="wall" id="15" name="wall above grade_1946-1960">
 			<overall_u_value units="W/m2 K">0.579</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="wall" id="8" name="wall above grade_before 1946">
+		<construction type="wall" id="16" name="wall above grade_before 1946">
 			<overall_u_value units="W/m2 K">0.664</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="basement_wall" id="1" name="wall below grade_post 2010">
+
+		#wall below grade
+		<construction type="basement_wall" id="17" name="wall below grade_post 2010">
 			<overall_u_value units="W/m2 K">0.335</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="basement_wall" id="2" name="wall below grade_2001-2010">
+		<construction type="basement_wall" id="18" name="wall below grade_2001-2010">
 			<overall_u_value units="W/m2 K">0.312</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="basement_wall" id="3" name="wall below grade_1996-2000">
+		<construction type="basement_wall" id="19" name="wall below grade_1996-2000">
 			<overall_u_value units="W/m2 K">0.408</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="basement_wall" id="4" name="wall below grade_1984-1995">
+		<construction type="basement_wall" id="20" name="wall below grade_1984-1995">
 			<overall_u_value units="W/m2 K">0.510</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="basement_wall" id="5" name="wall below grade_1978-1983">
+		<construction type="basement_wall" id="21" name="wall below grade_1978-1983">
 			<overall_u_value units="W/m2 K">0.645</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="basement_wall" id="6" name="wall below grade_1961-1977">
-			<overall_u_value units="W/m2 K">1.204</overall_u_value>
+		<construction type="basement_wall" id="22" name="wall below grade_1961-1977">
+			<overall_u_value units="W/m2 K">1.369</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="basement_wall" id="7" name="wall below grade_1946-1960">
+		<construction type="basement_wall" id="23" name="wall below grade_1946-1960">
 			<overall_u_value units="W/m2 K">1.449</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="basement_wall" id="8" name="wall below grade_before 1946">
+		<construction type="basement_wall" id="24" name="wall below grade_before 1946">
 			<overall_u_value units="W/m2 K">2.083</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="floor" id="1" name="slab on grade_post 2010">
+
+		#slab on grade
+		<construction type="floor" id="25" name="slab on grade_post 2010">
 			<overall_u_value units="W/m2 K">0.510</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="floor" id="2" name="slab on grade_2001-2010">
+		<construction type="floor" id="26" name="slab on grade_2001-2010">
 			<overall_u_value units="W/m2 K">1.428</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="floor" id="3" name="slab on grade_1996-2000">
+		<construction type="floor" id="27" name="slab on grade_1996-2000">
 			<overall_u_value units="W/m2 K">1.428</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="floor" id="4" name="slab on grade_1984-1995">
+		<construction type="floor" id="28" name="slab on grade_1984-1995">
 			<overall_u_value units="W/m2 K">1.428</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="floor" id="5" name="slab on grade_1978-1983">
+		<construction type="floor" id="29" name="slab on grade_1978-1983">
 			<overall_u_value units="W/m2 K">1.428</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="floor" id="6" name="slab on grade_1961-1977">
-			<overall_u_value units="W/m2 K">3.333</overall_u_value>
-			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
-			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
-		</construction>
-		<construction type="floor" id="7" name="slab on grade_1946-1960">
+		<construction type="floor" id="30" name="slab on grade_1961-1977">
 			<overall_u_value units="W/m2 K">5</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
 		</construction>
-		<construction type="floor" id="8" name="slab on grade_before 1946">
+		<construction type="floor" id="31" name="slab on grade_1946-1960">
+			<overall_u_value units="W/m2 K">5</overall_u_value>
+			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
+			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
+		</construction>
+		<construction type="floor" id="32" name="slab on grade_before 1946">
 			<overall_u_value units="W/m2 K">5</overall_u_value>
 			<outside_solar_absorptance units="-">0.8</outside_solar_absorptance>
 			<shortwave_reflectance units="-">0.2</shortwave_reflectance>
diff --git a/factories/physics_feeders/ca_physics_parameters.py b/factories/physics_feeders/ca_physics_parameters.py
index 9547d918..125840e5 100644
--- a/factories/physics_feeders/ca_physics_parameters.py
+++ b/factories/physics_feeders/ca_physics_parameters.py
@@ -14,5 +14,4 @@ class CaPhysicsParameters(NrelInterface):
     self._city = city
     # todo: define climate zones for Canada and substitute this default value by a function that selects the correct one
     self._climate_zone = 'Summerland'
-#    super().__init__(base_path, 'us_constructions.xml', 'us_archetypes.xml')
     super().__init__(base_path, 'ca_constructions_reduced.xml', 'ca_archetypes_reduced.xml')