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 @@ - + 0.11 - 1 + 33 - + - + 3.05 @@ -25,13 +25,13 @@ - + 0.11 - 2 + 34 - + - + 3.05 @@ -46,13 +46,13 @@ - + 0.11 - 2 + 34 - + - + 3.05 @@ -67,13 +67,13 @@ - + 0.11 - 2 + 34 - + - + 3.05 @@ -88,13 +88,13 @@ - + 0.11 - 2 + 34 - + - + 3.05 @@ -109,13 +109,13 @@ - + 0.11 - 2 + 34 - + - + 3.05 @@ -130,13 +130,13 @@ - + 0.11 - 2 + 34 - + - + 3.05 @@ -151,13 +151,13 @@ - + 0.11 - 2 + 34 - + - + 3.05 @@ -168,4 +168,4 @@ 4.55 0 - + \ 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 @@ - + 0.46 0.5 0 0.555 - + 0.52 0.5 0 @@ -41,7 +41,7 @@ 0.2 - 0.225 + 0.256 0.8 0.2 @@ -55,122 +55,128 @@ 0.8 0.2 - + + #wall above grade + 0.324 0.8 0.2 - + 0.285 0.8 0.2 - + 0.355 0.8 0.2 - + 0.411 0.8 0.2 - + 0.546 0.8 0.2 - - 0.432 + + 0.526 0.8 0.2 - + 0.579 0.8 0.2 - + 0.664 0.8 0.2 - + + #wall below grade + 0.335 0.8 0.2 - + 0.312 0.8 0.2 - + 0.408 0.8 0.2 - + 0.510 0.8 0.2 - + 0.645 0.8 0.2 - - 1.204 + + 1.369 0.8 0.2 - + 1.449 0.8 0.2 - + 2.083 0.8 0.2 - + + #slab on grade + 0.510 0.8 0.2 - + 1.428 0.8 0.2 - + 1.428 0.8 0.2 - + 1.428 0.8 0.2 - + 1.428 0.8 0.2 - - 3.333 - 0.8 - 0.2 - - + 5 0.8 0.2 - + + 5 + 0.8 + 0.2 + + 5 0.8 0.2 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')