s_ranjbar/system_assignation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,694 Commits 6 Branches 0 Tags 702 MiB
system_simulation
Commit Graph

1694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sanam
143a8e5ca5 Merge remote-tracking branch 'origin/main' 2023-12-05 10:59:44 -05:00
jgavalda
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
Saeed Ranjbar
9c1e05939a The city energy system importer for the north america is modified and tested. 2023-10-17 17:25:13 -04:00
Saeed Ranjbar
978cc9d1ea added system schematics to the data folder and to the catalog importer 2023-10-16 17:48:42 -04:00
Saeed Ranjbar
0240e89170 modified a small bug in north_america_energy_system_catalog.py 2023-10-16 17:24:39 -04:00
Saeed Ranjbar
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
p_monsalvete
3f649fd020 finished central data model new structure for energy systems, importer and test 2023-10-13 13:31:46 -04:00
p_monsalvete
d94bce4174 half made changes in central data model for systems 2023-10-13 08:23:40 -04:00
p_monsalvete
1a7ad20135 new catalog model and factory finished and test passed 2023-10-12 11:59:52 -04:00
p_monsalvete
57ee3e734b finished generic system and system parts 2023-10-11 09:14:38 -04:00
p_monsalvete
84f5ebe4a0 checking a problem with lists assignation where a single value should be assigned 2023-10-10 16:22:45 -04:00
p_monsalvete
11dc02d0e8 starting point, not working 2023-10-10 05:03:31 -04:00
p_monsalvete
d29161b05e rolled back and error introduced in a previous commit 2023-10-06 04:54:20 -04:00
p_monsalvete
a331dce966 fixed error in logic in _create_generic_systems 2023-10-06 04:14:52 -04:00
p_monsalvete
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
p_monsalvete
f13d7fd860 fixed error in logic in _associate_energy_systems 2023-10-06 04:11:56 -04:00
Saeed Ranjbar
ef89da8552 created a loop for generation systems in _associate_energy_systems 2023-10-05 16:18:08 -04:00
Saeed Ranjbar
9654bee978 modified the names and changed all singulars to plurals 2023-10-05 14:45:33 -04:00
Saeed Ranjbar
dae117fb44 Merge remote-tracking branch 'origin/energy_plus_result_factory' into energy_plus_result_factory 2023-10-05 14:20:24 -04:00
Saeed Ranjbar
91fa9d5ca1 modified the names and changed all singulars to plurals 2023-10-05 14:20:02 -04:00
Saeed Ranjbar
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
Saeed Ranjbar
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
Saeed Ranjbar
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
Saeed Ranjbar
ca48d6448b changed all the singular names to plural and turned distribution and emission systems into lists 2023-10-05 13:18:57 -04:00
guille
f2bfc297b3 Basic style correction and missing docstrings 2023-10-05 11:30:20 +02:00
guille
d5c443a57b Merge remote-tracking branch 'origin/main' into energy_system_central_data_model 2023-10-05 11:02:13 +02:00
Guille Gutierrez
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
Guille Gutierrez
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
Guille Gutierrez
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
Saeed Ranjbar
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
Koa Wells
2b696f9251 Merge branch 'main' into feature/load_compressed_city 2023-10-04 15:12:42 -04:00
Koa Wells
a97c068513 Add removal of decompressed pickle file 2023-10-04 15:11:35 -04:00
Saeed Ranjbar
f0ad1462d0 finished the first part of the test. 2023-10-03 17:50:17 -04:00
Saeed Ranjbar
23a8fbe86d continued working on the importer 2023-10-03 13:07:20 -04:00
p_monsalvete
087384475f changing from generation system to generation systemS in system importer north america 2023-10-03 09:40:32 -04:00
Saeed Ranjbar
fac6844da1 started working on the test 2023-10-02 13:19:58 -04:00
Saeed Ranjbar
b914c9e7bf made final changes to north_america_custom_energy_system_parameters.py 2023-10-02 12:39:30 -04:00
guille
cf783d8998 add max height to the city in geojson when the high field is given 2023-09-29 07:54:46 +02:00
guille
8bd75c790f Bug correction for building upper_corner it's no longer set to -inf 2023-09-29 05:55:36 +02:00
Saeed Ranjbar
eaa3064a3f continued working on energy system importer 2023-09-28 19:19:32 -04:00
guille
207058a16f obj export improvements 2023-09-28 15:20:28 +02:00
Saeed Ranjbar
8dbbfb9460 finished creating generic generation system in the _create_generic_systems method in north_america_custom_energy_system_parameters.py 2023-09-27 17:48:23 -04:00
Saeed Ranjbar
3809cf2885 continued the work on importer 2023-09-27 13:00:04 -04:00
p_monsalvete
8b66e20e9a some refactoring 2023-09-27 05:35:28 -04:00
Saeed Ranjbar
6d34e41e90 Started working on north america energy system importer. 2023-09-26 18:54:58 -04:00
guille
f495c1d27a Merge remote-tracking branch 'origin/solved_bugs_found_in_idf' 2023-09-26 10:33:41 +02:00
p_monsalvete
a43c971bbb modified working hours to give hours a month, not only total 2023-09-25 05:19:02 -04:00
p_monsalvete
4ce9f99e4d cleaning mix-branches 2023-09-25 03:41:52 -04:00
p_monsalvete
e3c9c64e9f Merge remote-tracking branch 'origin/Stochastic_occupancy_model' into energy_plus_result_factory 
# Conflicts:
#	.gitignore
 2023-09-25 03:35:51 -04:00