From 56fae48277ea052b80475d9943bf2f641c842319 Mon Sep 17 00:00:00 2001 From: jgavalda Date: Wed, 7 Jun 2023 16:17:46 -0400 Subject: [PATCH 1/2] Changed systems xml file to include new systems without cooling --- .../montreal_custom_systems.xml | 58 +++++++++++++------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/hub/data/energy_systems/montreal_custom_systems.xml b/hub/data/energy_systems/montreal_custom_systems.xml index cdf914a5..d3a7591d 100644 --- a/hub/data/energy_systems/montreal_custom_systems.xml +++ b/hub/data/energy_systems/montreal_custom_systems.xml @@ -41,44 +41,44 @@ Water distribution heating 10 - 4 - 1 + 2 + 0 Water distribution cooling - 10 + 5 4 - 1 + 0 Central air distribution heating 10 - 13 + 0 13 Central air distribution cooling - 10 - 13 + 5 + 0 13 Local air distribution heating - 10 + 5 8 - 8 + 0 Local air distribution cooling - 10 + 2 8 - 8 + 0 Refrigerant distribution 1 1 - 2 + 0 No distribution @@ -94,7 +94,7 @@ fan-coils - 2 + 1 inductors @@ -122,7 +122,7 @@ 2 - 1 + 8 1 @@ -194,7 +194,7 @@ 2 - 5 + 8 3 @@ -218,7 +218,7 @@ 2 - 1 + 8 3 @@ -296,7 +296,7 @@ 7 - 1 + 3 2 @@ -307,7 +307,7 @@ 7 - 2 + 4 2 @@ -435,5 +435,27 @@ 15 + + + 1 + + + + + 1 + 15 + + + + + 16 + + + + + 16 + 15 + + From 4e382f0633bee722a8c232d335f32c2017ba2071 Mon Sep 17 00:00:00 2001 From: p_monsalvete Date: Thu, 8 Jun 2023 09:58:57 -0400 Subject: [PATCH 2/2] updated systems catalog test --- tests/test_systems_catalog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_systems_catalog.py b/tests/test_systems_catalog.py index 25562b4a..48af728c 100644 --- a/tests/test_systems_catalog.py +++ b/tests/test_systems_catalog.py @@ -15,7 +15,7 @@ class TestSystemsCatalog(TestCase): catalog = EnergySystemsCatalogFactory('montreal_custom').catalog catalog_categories = catalog.names() archetypes = catalog.names('archetypes') - self.assertEqual(19, len(archetypes['archetypes'])) + self.assertEqual(23, len(archetypes['archetypes'])) systems = catalog.names('systems') self.assertEqual(18, len(systems['systems'])) generation_equipments = catalog.names('generation_equipments')