Commit Graph

737 Commits

Author SHA1 Message Date
a3c5219ccd Changed idf to start producing detailed systems 2023-11-16 14:26:41 -05:00
5fa55ea79f Update hub/version.py 2023-11-16 01:42:01 -05:00
68bb9223e3 persistence performance improvements 2023-11-16 07:39:46 +01:00
a1ca764057 Merge remote-tracking branch 'origin/main' 2023-11-15 04:50:22 +01:00
8c27e69a79 remove unused parameters and handlers 2023-11-15 04:50:15 +01:00
557d77661e Update hub/version.py 2023-11-06 04:15:14 -05:00
38d8013356 remove unused parameter 2023-11-06 10:14:27 +01:00
43fa1e0d92 Update hub/version.py 2023-11-03 04:31:21 -04:00
812c9541f4 Merge remote-tracking branch 'origin/main' 2023-11-03 09:30:54 +01:00
c1e392d828 rollback useless change 2023-11-03 09:30:49 +01:00
fe315bc6bb Update hub/version.py 2023-11-03 02:22:45 -04:00
087379b010 Merge remote-tracking branch 'origin/main' 2023-11-03 07:22:03 +01:00
452bfdf780 correct unit tests in ci/cd 2023-11-03 07:21:50 +01:00
63803efccb Update hub/version.py 2023-11-03 01:38:48 -04:00
0f0368c074 Merge remote-tracking branch 'origin/main' 2023-11-03 06:38:17 +01:00
08e701a972 Remove deprecated warning 2023-11-03 06:38:06 +01:00
914d521e81 Update hub/version.py 2023-11-02 11:00:48 -04:00
7f8e0d48ee Correct missing reflectance values 2023-11-02 15:59:30 +01:00
26c0ef7864 rollback change 2023-11-02 09:46:45 +01:00
5ce3a24e55 Update hub/version.py 2023-11-02 02:40:21 -04:00
0894c5dac6 Update hub/version.py 2023-11-02 02:22:19 -04:00
3dd928574a bug correction 2023-11-02 07:20:55 +01:00
9591db3bf8 Update hub/version.py 2023-10-31 10:21:01 -04:00
69f3b7f814 Merge pull request 'bug correction' (#54) from correct_layer_name into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/54
2023-10-31 10:20:21 -04:00
6e6c78b6f4 Update hub/version.py 2023-10-31 09:19:24 -04:00
75bb316848 bug correction 2023-10-31 14:17:59 +01:00
ed7d6d13f6 Update hub/version.py 2023-10-31 08:15:20 -04:00
42de9cea97 Merge pull request 'Bug correction in persistence' (#53) from correct_layer_name into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/53
2023-10-31 06:38:45 -04:00
255f9f861a Bug correction in persistence 2023-10-31 11:37:23 +01:00
4449d0b92d Update hub/version.py 2023-10-27 04:29:24 -04:00
89452dcf31 Merge remote-tracking branch 'origin/main' 2023-10-27 10:28:30 +02:00
6aafda7f42 Bug correction in persistence 2023-10-27 10:28:20 +02:00
6da8fde949 Update hub/version.py 2023-10-26 02:18:54 -04:00
6332519e12 Update hub/version.py 2023-10-26 01:04:17 -04:00
9ce97edc13 Merge pull request 'Bug correction in citygml factory' (#52) from geojson_exporter into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/52
2023-10-26 01:03:17 -04:00
98676e81e0 Bug correction in citygml factory 2023-10-26 07:02:26 +02:00
5cba38cf65 Update hub/version.py 2023-10-24 10:09:24 -04:00
3512d4b1e4 Merge pull request 'Add crs to the geometry importer as a parameter' (#51) from geojson_exporter into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/51
2023-10-24 10:03:49 -04:00
b0fabf3b7f Add crs to the geometry importer as a parameter 2023-10-24 15:46:40 +02:00
6d987f43f7 Update hub/version.py 2023-10-24 02:04:05 -04:00
6ee1466b8e Add geojson exporter 2023-10-24 08:00:48 +02:00
a31281cae7 Code quality improvements and basic creation og geojson from gml 2023-10-20 14:19:46 +02:00
8d5010218b Update hub/version.py 2023-10-19 02:23:18 -04:00
2afce4acce Corrected obj and glb exporters, building now exposes lower and upper corner 2023-10-19 07:39:35 +02: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
f865490ff9 Corrected bug in distribution_systems_electrical_consumption, but need to be confirmed with pilar 2023-10-13 09:11:03 +02:00
31a4893ed8 Corrections in persistence, distribution_systems_electrical_consumption property seems to be bugged 2023-10-13 08:57:42 +02:00
1a7ad20135 new catalog model and factory finished and test passed 2023-10-12 11:59:52 -04:00
fe76d2fe3d Correct the positions for the boxes 2023-10-11 17:16:18 +02:00
57ee3e734b finished generic system and system parts 2023-10-11 09:14:38 -04:00
7cb4600c15 Correct the positions for the boxes 2023-10-11 14:32:31 +02:00
3578d2faae add temporary indentation to tilesets 2023-10-11 06:01:15 +02:00
d6bfe730eb add non-standard render position to tileset 2023-10-11 06:00:34 +02:00
84f5ebe4a0 checking a problem with lists assignation where a single value should be assigned 2023-10-10 16:22:45 -04:00
6b24a59178 Add exports for cesium tileset and glb format 2023-10-10 11:16:26 +02: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
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
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
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
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
a97c068513 Add removal of decompressed pickle file 2023-10-04 15:11:35 -04:00
f0ad1462d0 finished the first part of the test. 2023-10-03 17:50:17 -04:00
23a8fbe86d continued working on the importer 2023-10-03 13:07:20 -04:00
087384475f changing from generation system to generation systemS in system importer north america 2023-10-03 09:40:32 -04:00
b914c9e7bf made final changes to north_america_custom_energy_system_parameters.py 2023-10-02 12:39:30 -04:00
cf783d8998 add max height to the city in geojson when the high field is given 2023-09-29 07:54:46 +02:00
8bd75c790f Bug correction for building upper_corner it's no longer set to -inf 2023-09-29 05:55:36 +02:00
eaa3064a3f continued working on energy system importer 2023-09-28 19:19:32 -04:00
207058a16f obj export improvements 2023-09-28 15:20:28 +02:00
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
3809cf2885 continued the work on importer 2023-09-27 13:00:04 -04:00
8b66e20e9a some refactoring 2023-09-27 05:35:28 -04:00
6d34e41e90 Started working on north america energy system importer. 2023-09-26 18:54:58 -04:00
f495c1d27a Merge remote-tracking branch 'origin/solved_bugs_found_in_idf' 2023-09-26 10:33:41 +02:00
a43c971bbb modified working hours to give hours a month, not only total 2023-09-25 05:19:02 -04:00
4ce9f99e4d cleaning mix-branches 2023-09-25 03:41:52 -04:00
e3c9c64e9f Merge remote-tracking branch 'origin/Stochastic_occupancy_model' into energy_plus_result_factory
# Conflicts:
#	.gitignore
2023-09-25 03:35:51 -04:00
8099037225 prints to check error 2023-09-25 03:34:57 -04:00
sanam
12d20f2d7a Stochastic schedule folder created 2023-09-22 09:42:10 -04:00
sanam
bf004f9e18 Stochastic schedule folder created 2023-09-21 14:33:13 -04:00
sanam
482c06e4c2 new class created 2023-09-20 11:30:41 -04:00
cb3e100fd4 I completed the generation_system.py
Created generic_storage_system.py, thermal_storage_system.py, and electrical_storage_system.py and added them to energy_system.py and generic_energy_system.py
2023-09-19 20:35:08 -04:00
41cf280aab work started on generation_system.py and generic_generation_system.py 2023-09-18 15:55:50 -04:00
ee875859e8 work started on generation_system.py and generic_generation_system.py 2023-09-18 15:44:52 -04:00
989d89df80 Merge remote-tracking branch 'origin/main' into main 2023-09-18 12:57:34 -04:00
73dffdc367 Merge branch 'systems_catalog_improvement' into energy_plus_result_factory
# Conflicts:
#	.gitignore
2023-09-14 12:34:50 -04:00
aa6b3c9e74 add two todos to change name into material_name in the layer class 2023-09-14 06:42:28 +02:00
29ba43f1d9 Update function comment and remove empty function 2023-09-12 14:59:44 -04:00
70cc659c14 Add load_compressed function to city.py 2023-09-12 14:57:13 -04:00
cde3bfb4ae tried to get monthly values from the method in helpers/monthly values. 2023-09-08 11:50:20 -04:00
8f8a6dbf71 small changes in importer 2023-09-08 05:05:58 -04:00
1392c05489 results_factory.py is modified
The enrich method is added to energy_plus_workflow.py
The Levis_out.csv is added to test_data
2023-09-07 18:16:07 -04:00
a0d2f7e5bc chnages were made to energy_plus_workflow.py 2023-09-06 14:55:14 -04:00
2a5c552f17 added new functions to dictionaries 2023-09-06 04:40:56 -04:00
86b7378a54 Merge remote-tracking branch 'origin/main' into main 2023-09-06 04:33:49 -04:00
cf6542cb0c Update hub/version.py 2023-09-04 10:49:09 -04:00
4004ff3c84 Merge remote-tracking branch 'origin/update_documentation'
# Conflicts:
#	setup.py
2023-09-04 16:46:38 +02:00
4ae09915b1 erased not needed prints 2023-09-01 13:02:01 -04:00
9624be2cf9 solved bugs introduced with changes in thermal_zone_from_internal_zones new structure 2023-09-01 12:53:01 -04:00
c072527dc6 small changes to pv_generation_system.py 2023-08-29 14:03:30 -04:00
56c84ad399 solved bugs in adapting montreal_custom_catalog.py to new catalog data 2023-08-29 13:29:51 -04:00
a5f70f4720 erased forgotten not needed print 2023-08-29 13:12:56 -04:00
b7c2bbae96 removed last two values in generationSystems as they are not used anymore 2023-08-29 13:02:28 -04:00
8763523d3b added S to some lists, updated montreal_custom_catalog.py to new catalog classes and removed __future__ from those classes that didn't need it 2023-08-29 12:50:49 -04:00
7810f8f91d extracted storage type from abstract class 2023-08-29 12:34:04 -04:00
d4b424357d added to_dictionary to abstract class 2023-08-29 12:31:06 -04:00
8dbeeaafa1 changed some units in electrical storage 2023-08-29 12:29:11 -04:00
c77b2254f1 separated storage class in three, one abstract 2023-08-29 12:26:19 -04:00
b1d42ee00b Merge remote-tracking branch 'origin/systems_catalog_improvement' into systems_catalog_improvement
# Conflicts:
#	hub/catalog_factories/data_models/energy_systems/electrical_storage_system.py
#	hub/catalog_factories/data_models/energy_systems/energy_storage_system.py
#	hub/catalog_factories/data_models/energy_systems/thermal_storage_system.py
2023-08-29 12:25:04 -04:00
6ac63adaaf separated storage class in three, one abstract 2023-08-29 12:22:06 -04:00
644b1c9346 energy_storage_system.py is modified and inherited by thermal_storage_system.py and electrical_storage_system.py 2023-08-29 11:45:02 -04:00
8f1f344769 Update hub/version.py 2023-08-29 01:41:57 -04:00
6551eb6402 partial correction for persistence
IMPORTANT: This version neec top be checked for meb import as seems that the cooling and heating demand aren't imported properly.
2023-08-29 05:55:40 +02:00
24a670755a performance_curves.py is fixed
material_name is replaced with material_id in north_america_energy_system_catalog.py
The unused variables are fixed.
The code is modified to accommodate the reorganization Pilar did in generation_systems
The system.py is modified to be able to accommodate more than one distribution or emission system
2023-08-28 18:37:55 -04:00
cfb76a9ebd partial correction for persistence
IMPORTANT: This version neec top be checked for meb import as seems that the cooling and heating demand aren't imported properly.
2023-08-28 18:34:10 +02:00
5d4813f2f6 some changes in code to be reviewed by Saeed 2023-08-28 10:18:18 -04:00
2f62ce3fdb Update hub/version.py 2023-08-25 13:24:34 -04:00
58e7ce7574 Bug correction in meb
Now it skip the building when the archetype it's not available
2023-08-25 13:21:09 -04:00
43e5bb7310 nothing is changed 2023-08-25 10:22:46 -04:00
fe0a2d3003 north_america_energy_system_catalog.py is completed and all the bugs have been resolved. 2023-08-24 15:09:17 -04:00
3deb63b14a north_america_energy_system_catalog.py is completed
montreal_custom_catalog.py is fixed
2023-08-23 17:09:55 -04:00
9b0bdf2b7e load_generation and load_storage in north_america_energy_system_catalog.py is completed 2023-08-22 19:09:35 -04:00
ade5ef94bb Change INSEL setup for Linux to TBD 2023-08-22 15:59:03 -04:00
ff1bb80a6c Merge remote-tracking branch 'origin/main' 2023-08-22 10:26:29 -04:00
76d3ba8495 Update hub/version.py 2023-08-22 10:26:22 -04:00
491b976fd9 Correct error in meb (temporary workaround) 2023-08-22 10:25:40 -04:00
072d2a6d9d modifications done to the xml file and north_america_energy_system_catalog.py 2023-08-21 17:41:12 -04:00
72b5ff1040 north_america_components.xml is modified
The montreal_custom_catalog.py is modified
2023-08-18 18:22:10 -04:00
e20a700deb emission_system.py is rolled back to original
performance_curves.py is imported in generation_system.py
The order of arguments in pv_generation_system.py is fixed
Modulation range is replaced with maximum and minimum heat output in generation_system.py
maximum,minimum, and nominal cooling output are also added to generation_system.py
2023-08-17 18:48:48 -04:00
0528aa0718 started to work on systems 2023-08-16 20:07:24 -04:00
923b1fe267 generation components are all added to north_america_energy_system_catalog.py
pv_generation_system.py is modified
Tools4CitiesESMF.xml is modified
2023-08-16 19:33:18 -04:00
32a40f17a6 fixing pv problem 2023-08-16 16:28:20 -04:00
e91e61741e add generation and config 2023-08-16 15:58:49 -04:00
16618fb54a started north america energy system catalog importer. NOT WORKING 2023-08-15 16:27:05 -04:00
21ca1e1e28 modified energy_storage_system.py and energy_system_catalog.py generation_system.py
The xml data is modified
2023-08-15 14:49:17 -04:00