m_osman/city_retrofit
1
0
Fork 0
forked from s_ranjbar/city_retrofit
Code Pull Requests Activity
1,545 Commits 3 Branches 83 Tags 229 MiB
ee875859e8
Commit Graph

1545 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
guille
5e969986fb Refactor in building. 
heating and cooling are now heating_demand and cooling_demand
 2023-06-05 11:53:47 -04:00
p_monsalvete
c0a2a8a2f9 solved bug in onsite electrical production 2023-06-05 11:52:29 -04:00
Koa Wells
c6b986ad1b Add custom_insel_block parameter to insel MEB and add unit test 2023-06-02 18:48:55 -04:00
Guille
1e68e3d40a Partial completion cost needs. 2023-06-02 15:05:29 -04:00
Guille
21b1eef3d3 Merge branch 'main' into retrofit_project 2023-06-02 13:18:41 -04:00
guille
dab931cadb Partial correction of hub 2023-06-02 10:25:34 -04:00
p_monsalvete
1d8a1dc275 solved bug in enumerate 2023-06-01 14:10:03 -04:00
p_monsalvete
665bf8159b Merge branch 'systems_catalog' into meb_bugs_fixing 
# Conflicts:
#	hub/city_model_structure/building.py
#	hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
 2023-06-01 13:55:27 -04:00
p_monsalvete
03a1744f87 Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog 2023-06-01 13:39:49 -04:00
p_monsalvete
11b38eaa4c modified the place where the energy systems are created 2023-06-01 13:39:29 -04:00
jgavalda
d3f35038ec Change xml to solve mistake in cooling system 2023-06-01 11:52:57 -04:00
p_monsalvete
22c4f362fe solved a bug in income.py and added creation of energy systems in buildings in importer 2023-06-01 11:06:16 -04:00
guille
0956f40e42 Bug correction and code quality improvements 2023-05-31 16:55:44 -04:00
Guille Gutierrez
3e9060c6a7 Update 'hub/version.py' 2023-05-31 13:56:22 -04:00
Guille Gutierrez
909b453036 Merge pull request 'retrofit_project' (#24) from retrofit_project into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/24
 2023-05-31 13:55:49 -04:00
guille
11ba482e73 correct bug 2023-05-31 13:53:22 -04:00
guille
6809a4fca3 update pylintrc and correct setup.py 2023-05-31 13:51:35 -04:00
jgavalda
813f2f6738 Changes in subsidy structure 2023-05-31 12:26:02 -04:00
jgavalda
30ca0ade38 Bug in gas costs solved. xml file 2023-05-31 11:23:24 -04:00
guille
eeb75c101f update pylintrc and correct setup.py 2023-05-31 11:04:41 -04:00
guille
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -04:00
p_monsalvete
3cdad733b3 solved problems when systems not exist 2023-05-29 15:26:21 -04:00
p_monsalvete
8c3e9a2f95 solved a bug in parasitic_energy_consumption 2023-05-29 15:09:47 -04:00