Commit Graph

1662 Commits

Author SHA1 Message Date
6e1914963d The error in montreal_custom_energy_system_parameters.py is fixed
Random assignation of systems to city buildings is done
2023-12-28 13:48:22 -05:00
a2d733d1d1 had to commit before creating new branch 2023-12-21 11:28:31 -05:00
19dcb988f9 The heating and cooling demand units are changed from J to W 2023-12-20 15:53:28 -05:00
0a4465f669 geojson_creator.py is changed to a function getting x, y, and diff as input to generate the .geojson file
in main.py city is created and using ep_workflow.py the building demands are calculated and buildings are enriched.
2023-12-20 15:33:50 -05:00
6a81e8c411 Merge branch 'your_branch' into merged_branch 2023-12-19 13:55:33 -05:00
b4154c11d5 first commit 2023-12-19 13:51:06 -05:00
b66b0aa578 Merge branch 'ep_branch' into main_branch 2023-12-19 13:34:55 -05:00
a51343d9c3 Merge remote-tracking branch 'origin/main' 2023-12-19 11:37:50 -05:00
fef4dd012a Including a central point and plotting buildings in a square 2023-12-19 11:37:24 -05:00
9377e80ff7 Remove excess files 2023-12-15 15:17:14 -05:00
5da9766da6 Add initial version of building selection tool 2023-12-15 13:50:41 -05:00
ed445529f9 Initial commit 2023-12-12 18:34:30 -05:00
b6d32e5086 The script is updated to implement the hub result factory 2023-12-06 16:29:59 -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
9c1e05939a The city energy system importer for the north america is modified and tested. 2023-10-17 17:25:13 -04:00
978cc9d1ea added system schematics to the data folder and to the catalog importer 2023-10-16 17:48:42 -04:00
0240e89170 modified a small bug in north_america_energy_system_catalog.py 2023-10-16 17:24:39 -04:00
c6d4feec89 Modified the classes and the north amercia catalog importer based on the changes Pilar made in the data model structure 2023-10-16 16:44:53 -04:00
3f649fd020 finished central data model new structure for energy systems, importer and test 2023-10-13 13:31:46 -04:00
d94bce4174 half made changes in central data model for systems 2023-10-13 08:23:40 -04:00
1a7ad20135 new catalog model and factory finished and test passed 2023-10-12 11:59:52 -04:00
57ee3e734b finished generic system and system parts 2023-10-11 09:14:38 -04:00
84f5ebe4a0 checking a problem with lists assignation where a single value should be assigned 2023-10-10 16:22:45 -04:00
11dc02d0e8 starting point, not working 2023-10-10 05:03:31 -04:00
d29161b05e rolled back and error introduced in a previous commit 2023-10-06 04:54:20 -04:00
a331dce966 fixed error in logic in _create_generic_systems 2023-10-06 04:14:52 -04:00
3f91da9f45 Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model
# Conflicts:
#	hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
2023-10-06 04:13:32 -04:00
f13d7fd860 fixed error in logic in _associate_energy_systems 2023-10-06 04:11:56 -04:00
ef89da8552 created a loop for generation systems in _associate_energy_systems 2023-10-05 16:18:08 -04:00
9654bee978 modified the names and changed all singulars to plurals 2023-10-05 14:45:33 -04:00
dae117fb44 Merge remote-tracking branch 'origin/energy_plus_result_factory' into energy_plus_result_factory 2023-10-05 14:20:24 -04:00
91fa9d5ca1 modified the names and changed all singulars to plurals 2023-10-05 14:20:02 -04:00
8e145eefa1 Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model 2023-10-05 13:22:42 -04:00
6f40a15609 Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model 2023-10-05 13:22:32 -04:00
4a14deece1 Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model 2023-10-05 13:22:19 -04:00
ca48d6448b changed all the singular names to plural and turned distribution and emission systems into lists 2023-10-05 13:18:57 -04:00
f2bfc297b3 Basic style correction and missing docstrings 2023-10-05 11:30:20 +02:00
d5c443a57b Merge remote-tracking branch 'origin/main' into energy_system_central_data_model 2023-10-05 11:02:13 +02:00
568317ebf1 Merge pull request 'fixing_working_hours_problem' (#47) from fixing_working_hours_problem into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/47
2023-10-05 04:40:58 -04:00
af32decf96 Merge pull request 'added_new_functions_to_dictionaries' (#48) from added_new_functions_to_dictionaries into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/48
2023-10-05 04:40:19 -04:00
bb05b01312 Merge pull request 'feature/load_compressed_city' (#46) from feature/load_compressed_city into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/46
2023-10-05 04:38:59 -04:00
cbda6ce13d Tried to modify the test_systems_factory.py but received an error saying GenerationSystem object is not iterable 2023-10-04 17:07:19 -04:00
2b696f9251 Merge branch 'main' into feature/load_compressed_city 2023-10-04 15:12:42 -04:00