Commit Graph

1847 Commits

Author SHA1 Message Date
9a99f69bdf Merge remote-tracking branch 'origin/main' 2024-04-18 07:42:27 +02:00
fe99059e5a Bugfix in montreal custom catalog 2024-04-18 07:42:19 +02:00
d9d9a628b4 Update hub/version.py 2024-04-16 01:02:37 -04:00
d9a941a97a Correct unittests 2024-04-16 07:01:51 +02:00
b52e66c263 bugfix in heating peak load units 2024-04-15 07:13:53 +02:00
039a0f30ba Update hub/version.py 2024-04-03 01:18:06 -04:00
ebeafddc74 Update hub/version.py 2024-03-28 02:00:40 -04:00
355cc6ecdf bugfix in idf exporter 2024-03-28 06:59:57 +01:00
cbe720f0de Update hub/version.py 2024-03-27 12:08:52 -04:00
52382566d3 bugfix: correct minimal idf 2024-03-27 17:08:08 +01:00
4056a2ab8a Update hub/version.py 2024-03-26 01:05:46 -04:00
1f7b4924fe Merge remote-tracking branch 'origin/main' 2024-03-26 06:04:34 +01:00
20200f0efe Update hub/version.py 2024-03-25 12:47:13 -04:00
919ab60bd5 bugfix in emission systems 2024-03-25 17:27:02 +01:00
aa85473a81 Update hub/version.py 2024-03-25 10:40:46 -04:00
aac006f63a Merge remote-tracking branch 'origin/main' 2024-03-25 15:35:42 +01:00
199d7dc4f9 bugfix in emission systems 2024-03-25 15:35:00 +01:00
3a6a712cad Update hub/version.py 2024-03-25 10:10:56 -04:00
27291ad1b8 bugfix in emission systems 2024-03-25 15:10:03 +01:00
5fdfee9265 update version.py 2024-03-14 14:19:09 +01:00
0f0a923329 Merge pull request 'final_energy_system_model' (#60) from final_energy_system_model into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/60
2024-03-14 09:13:21 -04:00
bf23730281 correct the unit tests 2024-03-12 16:21:43 +01:00
11d493ba0e remove north_america catalog for energy systems 2024-03-12 14:56:22 +01:00
1266f50e29 Correct small error in unittest 2024-02-16 06:01:54 +01:00
674393970c Merge remote-tracking branch 'origin/main' into final_energy_system_model
# Conflicts:
#	.gitignore
#	hub/city_model_structure/building.py
#	hub/exports/building_energy/idf.py
#	hub/imports/geometry_factory.py
2024-02-16 05:50:45 +01:00
8d75fe1f3a remove pychache 2024-02-16 05:38:07 +01:00
57a9d24f4c Title: Improvement of Energy System Parameters Importer
>> To make life easier for people who want to work on energy systems in future, I tried to make my code as generic as possible.
2024-02-13 20:05:03 -05:00
087fead489 Title: Finalizing the energy system data model and system factory
A new XML file named montreal_future_systems.xml is created where the elements of the file are the same as attributes of various classes. Therefore, the catalogue importer and energy system importer should have been updated accordingly. The catalog importer is organized in a general method so whenever someone wants to create a new catalogue they can use the created code as the blueprint.
2024-02-07 20:51:10 -05:00
ebaec9bb7c Title: Finalizing the energy system data model and system factory
A new XML file named montreal_future_systems.xml is created where the elements of the file are the same as attributes of various classes. Therefore, the catalogue importer and energy system importer should have been updated accordingly. The catalog importer is organized in a general method so whenever someone wants to create a new catalogue they can use the created code as the blueprint.
2024-02-07 18:54:09 -05:00
3e193f04a6 The dual_supply_capability is added to the city model structure 2024-02-01 15:41:05 -05:00
ac4742d2c4 A new attribute "dual_supply_capability" is added to NonPVGeneration class in non_pv_generation_system.py and the catalogue importer is adjusted 2024-02-01 12:24:15 -05:00
f976040f45 A new attribute "dual_supply_capability" is added to NonPVGeneration class in non_pv_generation_system.py and the catalogue importer is adjusted 2024-02-01 12:23:58 -05:00
54b62ec2d0 update version 2024-01-25 06:57:33 +01:00
9357cef641 remove wrong indentation 2024-01-25 06:57:00 +01:00
002d5a659d Update hub/version.py 2024-01-22 12:48:42 -05:00
f9815dfa49 Update hub/version.py 2024-01-22 08:36:05 -05:00
eeda66f410 Merge pull request 'feature/upgrade_ep_to_23.2.0' (#59) from feature/upgrade_ep_to_23.2.0 into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/59
2024-01-22 08:34:47 -05:00
aa0f790d8e remove commented code and debug prints 2024-01-22 14:33:44 +01:00
e0e7daf64b Merge remote-tracking branch 'origin/main' into feature/upgrade_ep_to_23.2.0
# Conflicts:
#	hub/exports/building_energy/idf_files/Minimal.idf
2024-01-22 14:32:24 +01:00
5181ddcabb Update hub/version.py 2024-01-18 00:33:39 -05:00
68457b9d26 add nrcan data to the pip package 2024-01-18 06:32:44 +01:00
673cbac77a added storage_medium attribute to thermal_storage_system.py to enable us use water thermodynamic characteristics in the modelling 2024-01-17 13:05:10 -05:00
11f78ccb89 added storage_medium attribute to thermal_storage_system.py to enable us use water thermodynamic characteristics in the modelling 2024-01-10 16:10:42 -05:00
3891c866cf Merge branch 'bug/units' 2024-01-09 14:01:29 +01:00
5230da861c correct units according to oriol's instruction 2024-01-09 14:00:33 +01:00
87b2319fda Update hub/version.py 2024-01-09 07:48:37 -05:00
1916d21c4e restore unittests after debug is completed 2024-01-09 10:32:47 +01:00
57388a9dc4 replace github nrel with cerc offline nrcan_data 2024-01-09 10:31:59 +01:00
89d0d0eae8 replace github nrel with cerc nrcan_data, this may also be local instead 2024-01-09 10:15:43 +01:00
e025510c93 Merge pull request 'ep_23.2.0' (#58) from ep_23.2.0 into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/58
2023-12-07 13:22:23 -05:00