s_ranjbar/energy_system_modelling_workflow
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,844 Commits 16 Branches 84 Tags 540 MiB
00e2a9d9bf
Commit Graph

1844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guille Gutierrez
f39c1deff4 Update 'hub/version.py' 2023-07-07 14:36:02 -04:00
p_monsalvete
c8379eeb38 Merge remote-tracking branch 'origin/main' into main 2023-07-07 14:35:24 -04:00
guille
1acdebd6e7 Merge remote-tracking branch 'origin/main' 2023-07-07 14:33:41 -04:00
guille
1ee5fd9dc5 Bug in geojson import 2023-07-07 14:33:34 -04:00
Guille Gutierrez
dfd41250e5 Merge pull request 'modified ground_temperature name due to an overwriting of year in month' (#28) from bug_in_ground_temperature into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/28
 2023-07-07 14:00:05 -04:00
p_monsalvete
db2687f75f changed name for a more clear understanding 2023-07-07 13:55:19 -04:00
p_monsalvete
2612d63414 Merge remote-tracking branch 'origin/main' into main 2023-07-07 12:59:38 -04:00
guille
722b41aa10 Remove deprecated waring in setup.py 2023-07-07 12:36:34 -04:00
p_monsalvete
93c867558a modified ground_temperature name due to an overwriting of year in month 2023-07-07 11:57:24 -04:00
Guille
0d05960102 no comments 2023-06-13 16:19:51 -04:00
Guille Gutierrez
1d3293a55f Update 'hub/version.py' 2023-06-13 12:50:56 -04:00
Guille
fbdd4e369e Bug fixing in associate energy systems 2023-06-13 12:48:46 -04:00
Guille Gutierrez
d11c67615c Update 'hub/version.py' 2023-06-09 13:42:23 -04:00
Guille Gutierrez
99ba0d430b Merge pull request 'solved_bugs_ep' (#27) from solved_bugs_ep into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/27
 2023-06-09 13:41:48 -04:00
p_monsalvete
5dcead4e5d bug in function reading, expecting str and getting int 2023-06-09 13:36:21 -04:00
p_monsalvete
e07156ac30 Merge remote-tracking branch 'origin/main' into main 2023-06-09 13:12:12 -04:00
p_monsalvete
db1d2362c8 bug in idf.py and added uuid to building_name in geojson importer 2023-06-09 13:12:00 -04:00
Guille Gutierrez
0989aadbf4 Update 'hub/version.py' 2023-06-09 12:31:33 -04:00
Guille
23cb327e1b Bug fixing in associate energy systems 2023-06-09 12:31:01 -04:00
Guille Gutierrez
7eafd33b33 Update 'hub/version.py' 2023-06-09 11:28:41 -04:00
Guille
0c7d428aa6 Merge remote-tracking branch 'origin/some_improvements_in_city_model' 2023-06-09 11:22:18 -04:00
Guille
08df06dc2e Bug fixing in remove_city_object method 2023-06-09 11:21:45 -04:00
p_monsalvete
65f9e3e43e added thermal_zones to the building 2023-06-08 14:18:29 -04:00
Guille Gutierrez
e14bc5c2bd Update 'hub/version.py' 2023-06-08 11:20:17 -04:00
Guille
4e22bfec4a Merge remote-tracking branch 'origin/main' 2023-06-08 11:16:10 -04:00
Guille
745c8f9080 add weather region_codes 2023-06-08 11:16:04 -04:00
Guille Gutierrez
650966c195 Merge pull request 'systems_caltalog_xml' (#26) from systems_caltalog_xml into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/26
 2023-06-08 10:30:53 -04:00
p_monsalvete
4e382f0633 updated systems catalog test 2023-06-08 09:58:57 -04:00
p_monsalvete
e0f11b7c02 Merge branch 'main' into retrofit_project 2023-06-08 09:30:25 -04:00
p_monsalvete
38bda1920d Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project 2023-06-08 09:30:04 -04:00
jgavalda
56fae48277 Changed systems xml file to include new systems without cooling 2023-06-07 16:17:46 -04:00
Guille
357e9f4a7e add weather region_codes 2023-06-07 15:27:38 -04:00
Guille Gutierrez
ea00266626 Merge pull request 'retrofit_project' (#25) from retrofit_project into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/25
 2023-06-07 14:50:00 -04:00
p_monsalvete
8e20e747a5 Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project 2023-06-07 14:40:54 -04:00
p_monsalvete
d67c5c438b solved bug in _calculate_working_hours 2023-06-07 14:40:44 -04:00
Guille Gutierrez
00a1313235 Update 'hub/version.py' 2023-06-07 13:19:48 -04:00
Guille
5cc62ccabd Complete the merge cities 2023-06-07 12:55:03 -04:00
p_monsalvete
c6852e5af6 Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project 2023-06-07 09:50:50 -04:00
p_monsalvete
502e1e8279 added system for refurbishment to catalog 2023-06-07 09:48:45 -04:00
guille
4d8e41b4a3 Add canadian weather file as default 2023-06-07 07:58:18 -04:00
guille
eae26f6388 Partial correction of merge function 2023-06-06 17:44:07 -04:00
p_monsalvete
35d5293956 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	scripts/ep_workflow.py
 2023-06-06 16:20:01 -04:00
p_monsalvete
bd82d0cd1f added weather factory needed for cold water temperature 2023-06-06 16:12:20 -04:00
p_monsalvete
bd23185ca3 Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project 2023-06-06 16:09:44 -04:00
p_monsalvete
4ccf16411c solved feature in idf generator 2023-06-06 16:09:33 -04:00
jgavalda
eadc5e4a01 Working version for Majid, course 2023-06-06 14:40:07 -04:00
guille
d6e6d06d39 Code quality check 2023-06-06 14:31:25 -04:00
guille
ff642a2c0c Correct the weather factory and remove useless files 2023-06-06 13:32:37 -04:00
guille
8d3d1ac427 Homogenize unit tests and remove useless files 2023-06-05 13:42:15 -04:00
guille
1819541a21 Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project 2023-06-05 11:53:54 -04:00