Commit Graph

1806 Commits

Author SHA1 Message Date
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
6e2e6a0a4d Rechanged the Minimal.idf to give the necessary results, without additional stuff not used by the tool 2024-01-29 11:46:07 -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
d592de6759 Surfaces have now a more human-readable name 2023-12-07 13:20:21 -05:00
eeac9a24a8 Update energy plus
Shadow object surfaces are now building_name_{index}
Now version 23.2 is supported
Minimal.idf set the proper simulation method
2023-12-07 12:05:59 -05:00
b6d32e5086 The script is updated to implement the hub result factory 2023-12-06 16:29:59 -05:00
7328118861 Add debugging code to idf.py 2023-12-06 16:20:35 -05:00
9444de6bae Update add minimal.idf and energy+.idd for energyplus 23.2.0 2023-12-06 16:15:35 -05:00
27ceed01fe persistence changes 2023-12-06 15:15:36 -05:00
57c7a76529 The ep results importer for multiple buildings is completed 2023-12-06 13:53:31 -05:00
020190829f The energy plus result importer for multiple buildings is created and tested. Currently, buildings are enriched with hourly values but monthly and yearly values are not working. 2023-12-05 19:38:11 -05:00
c3f2cfb02a updated the idf.py 2023-12-05 13:13:19 -05:00
e3f1d52a21 Add .gitignore to exclude Python bytecode files 2023-12-05 12:47:44 -05:00
sanam
6990811ea7 remove .idea 2023-12-05 11:04:15 -05:00
sanam
143a8e5ca5 Merge remote-tracking branch 'origin/main' 2023-12-05 10:59:44 -05:00
92100df406 Changed the idf generator to incorporate zone lights and appliances calculation 2023-12-05 10:43:45 -05:00
sanam
400a05c096 Enriching Concordia json file 2023-12-05 10:34:23 -05:00
716465f1eb Update hub/version.py 2023-11-27 01:01:59 -05:00
81702e0008 Merge remote-tracking branch 'origin/main' 2023-11-27 07:01:30 +01:00
953b6796e9 correct persistence json read 2023-11-27 07:00:39 +01:00
898f364e28 Add additional idfobjects, keys, and cleaned up syntax 2023-11-24 14:45:27 -05:00
03da727d29 Update hub/version.py 2023-11-24 03:03:20 -05:00
b51d49d598 correct persistence json read 2023-11-24 09:01:49 +01:00
802641b4a3 Update hub/version.py 2023-11-24 02:04:37 -05:00
914375171a remove useless files 2023-11-24 08:03:55 +01:00
72b6cddea4 change result structure (concept proof) 2023-11-24 08:02:01 +01:00