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
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
fac6844da1
started working on the test
2023-10-02 13:19:58 -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
b24a616d00
modified energy plus results importer test
2023-09-14 12:03: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
707b42f2a9
modified the test checking if it only returns the hourly, monthly and yearly demands for building 12
2023-09-13 16:36:27 -04:00
cd7104206a
changed name of test file
2023-09-13 04:40:11 -04: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
f0ffc26348
tried to create a test
2023-09-12 13:16:00 -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
