s_ranjbar/summer_course_2024
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,590 Commits 2 Branches 83 Tags 182 MiB
e025510c93
Commit Graph

568 Commits

Author SHA1 Message Date
Guille Gutierrez
b746387133 Update hub/version.py 2023-08-10 11:32:17 -04:00
guille
7c29405f21 Add missing values to reference city to climate zone and to montreal functions 2023-08-10 11:30:59 -04:00
guille
d564218531 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	hub/helpers/data/montreal_function_to_hub_function.py
#	hub/imports/construction/helpers/construction_helper.py
 2023-08-10 11:03:09 -04:00
guille
ebb712ebaf Add missing values to reference city to climate zone and to montreal functions 2023-08-10 11:01:37 -04:00
Guille Gutierrez
e2c8ef0c56 Update hub/version.py 2023-08-09 16:12:41 -04:00
Guille
30908eda6d Add retrieve result test and correct lock in sqlalchemy 2023-08-09 16:12:10 -04:00
Guille
deb04cbe2d Add retrieve result test and correct lock in sqlalchemy 2023-08-09 13:52:55 -04:00
Guille Gutierrez
bb76d05f17 Update hub/version.py 2023-08-08 13:06:34 -04:00
guille
527bf4448b overall quality improvement 2023-08-08 12:39:37 -04:00
guille
1b3053b37f Merge remote-tracking branch 'origin/main' 2023-08-08 12:28:30 -04:00
guille
cf3f85c7f4 overall quality improvement 2023-08-08 12:26:05 -04:00
Guille Gutierrez
db7caad218 Update hub/version.py 2023-08-08 12:04:32 -04:00
guille
b7d7c9aadb Merge remote-tracking branch 'origin/main' 2023-08-08 12:01:06 -04:00
guille
4012408e2f correct unittest 2023-08-08 12:01:00 -04:00
Guille Gutierrez
8502efc710 Merge pull request 'reviewing_units' (#41) from reviewing_units into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/41
 2023-08-08 11:35:26 -04:00
p_monsalvete
bdf0deb3b3 all test passed 2023-08-08 11:20:44 -04:00
p_monsalvete
ab81edc33d changed in data ACH to 1/s all Wh in J 2023-08-08 10:19:35 -04:00
guille
a3bf594071 correct unittest 2023-08-08 10:10:04 -04:00
p_monsalvete
04ef636423 Merge branch 'main' into reviewing_units 
# Conflicts:
#	hub/city_model_structure/building_demand/internal_zone.py
#	hub/city_model_structure/building_demand/thermal_zone.py
#	hub/exports/building_energy/insel/insel_monthly_energy_balance.py
 2023-08-07 17:01:55 -04:00
p_monsalvete
d7e041b686 erased traffic folder: was not used at all 
changed in data ACH to 1/s
 2023-08-07 16:56:01 -04:00
Guille Gutierrez
90a196465a Merge pull request 'reviewing_hub' (#40) from reviewing_hub into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/40
 2023-08-07 15:48:25 -04:00
p_monsalvete
83fc351fc7 Merge branch 'main' into reviewing_hub 2023-08-07 15:12:17 -04:00
p_monsalvete
8a41c4f656 erased not needed prints 2023-08-07 14:54:48 -04:00
p_monsalvete
589f3e7f11 tested with old versions and got same results 2023-08-07 14:46:19 -04:00
p_monsalvete
67cd435fd5 all tests passed 2023-08-07 12:32:33 -04:00
p_monsalvete
1e9afa28a8 all tests passed 2023-08-03 17:00:59 -04:00
p_monsalvete
212b4b0621 solving bugs from adding thermal_archetypes to the data model 2023-08-03 14:51:54 -04:00
p_monsalvete
fe8c79d7c2 solving bugs from adding thermal_archetypes to the data model 2023-08-03 13:49:57 -04:00
Guille Gutierrez
e138a24555 Update hub/version.py 2023-08-03 12:22:57 -04:00
Guille
86845dd05f Merge remote-tracking branch 'origin/main' 2023-08-03 12:21:45 -04:00
Guille
1691ada01c Add retrieve result test and correct lock in sqlalchemy 2023-08-03 12:21:40 -04:00
Guille Gutierrez
4bbd65bb41 Update hub/version.py 2023-08-03 12:07:37 -04:00
Guille
9365b47dc2 Add retrieve result test and correct lock in sqlalchemy 2023-08-03 12:06:45 -04:00
Guille Gutierrez
9f24ed8fae Update hub/version.py 2023-08-02 15:49:54 -04:00
p_monsalvete
4b5c037ffa small bug 2023-08-02 14:46:17 -04:00
p_monsalvete
6b89008698 Merge branch 'main' into reviewing_hub 
# Conflicts:
#	hub/imports/construction/eilat_physics_parameters.py
#	hub/imports/construction/nrcan_physics_parameters.py
 2023-08-02 14:35:31 -04:00
Guille Gutierrez
0f982df32e Merge pull request 'retrofit_db_changes' (#38) from retrofit_db_changes into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/38
 2023-08-02 14:26:14 -04:00
Guille
c38b025c2e Correct bd test, add dictionary for custom fuel to hub fuel 2023-08-02 12:43:51 -04:00
guille
4d0f247a83 cost completed 2023-08-01 16:41:37 -04:00
p_monsalvete
a147afe76f modified thermal zones to be created in different ways depending on the user needs 2023-07-31 17:01:35 -04:00
Guille Gutierrez
e44abc2f3a Update hub/version.py 2023-07-31 16:12:03 -04:00
Guille
2292bff1b8 building info can now be retrieved via application, user and scenario 2023-07-31 16:08:10 -04:00
Guille
1abf76125f building info can now be retrieved via application, user and scenario 2023-07-31 12:42:02 -04:00
Guille
ce995c375d Merge remote-tracking branch 'origin/main' into retrofit_db_changes 2023-07-31 12:40:29 -04:00
Guille Gutierrez
2cc938e416 Update hub/version.py 2023-07-31 12:22:44 -04:00
Guille
eb246a18e6 Additional changes, the db_control building info need to be changed 2023-07-28 14:55:06 -04:00
p_monsalvete
24324988b6 added dictionary from montreal fuel type to hub 2023-07-28 13:18:23 -04:00
p_monsalvete
ee419b0849 added dictionary from montreal fuel type to hub 2023-07-28 12:26:17 -04:00
guille
f95c45660e persistence changes 2023-07-28 08:25:47 -04:00
Guille
4add8b2cff initial changes 2023-07-26 15:03:31 -04:00
Guille Gutierrez
0d63a6c4e9 Update hub/version.py 2023-07-25 12:04:41 -04:00
p_monsalvete
a3d4390a19 added surface type to construction names 2023-07-25 12:02:20 -04:00
p_monsalvete
f3208f1735 starting the process of changing thermal_zones generation, NOT working version 2023-07-25 11:40:47 -04:00
Guille Gutierrez
c5c298d708 Update hub/version.py 2023-07-25 09:31:24 -04:00
Guille
1ae07cc14f Merge remote-tracking branch 'origin/main' 2023-07-25 09:29:46 -04:00
Guille
37c09df932 IDF export will not longer blindly assign the Montreal as weather file 2023-07-25 09:29:39 -04:00
Guille Gutierrez
92f0c81109 Update hub/version.py 2023-07-24 12:33:55 -04:00
Guille Gutierrez
2c7fc66423 Update hub/version.py 2023-07-21 16:12:37 -04:00
Guille Gutierrez
1a8dbe7f87 Merge pull request 'erased not needed print' (#35) from erased_print_in_meb into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/35
 2023-07-18 12:29:58 -04:00
p_monsalvete
89bfa33d1e erased not needed print 2023-07-18 11:56:18 -04:00
Guille Gutierrez
6dd9fc8328 Update 'hub/version.py' 2023-07-18 11:53:01 -04:00
p_monsalvete
f8ccdf7eeb bug None/1000 solved 2023-07-18 11:49:38 -04:00
Guille Gutierrez
883db8840c Update 'hub/version.py' 2023-07-17 18:55:24 -04:00
p_monsalvete
34d2f5e8ab Merge branch 'fixing_bugs_from_eilat_case' into errors_in_meb 2023-07-17 17:27:02 -04:00
p_monsalvete
285c819d31 rewritten thermal_openings creation to allow change in window ratio (doing it wrong previously) 2023-07-17 17:26:47 -04:00
p_monsalvete
2744f86c66 rewritten thermal_openings creation to allow change in window ratio (doing it wrong previously) 2023-07-17 17:26:28 -04:00
p_monsalvete
91f77ee477 updated RECOGNIZED_FUNTIONS_AND_USAGES.md 2023-07-17 12:36:16 -04:00
p_monsalvete
caaa51774c changed window uvalue in eilat archetypes 2023-07-17 10:56:48 -04:00
Guille Gutierrez
dede8d4929 Update 'hub/version.py' 2023-07-14 12:54:55 -04:00
p_monsalvete
048f79e1ae added two new values in dictionaries 2023-07-13 17:47:04 -04:00
p_monsalvete
2af993630a changed units to new item in dictionaries in to_dictionary methods 2023-07-13 17:06:42 -04:00
p_monsalvete
24620d485e added also to_dictionary to greenery catalog (Greenery catalog must be reviewed!!) 2023-07-13 17:00:33 -04:00
p_monsalvete
6ab3ee3dc3 solved some issues on units in costs catalog 2023-07-13 15:53:20 -04:00
p_monsalvete
639e5a952d upgraded catalogs with to_dictionary method and __str__ 2023-07-13 13:05:23 -04:00
Guille Gutierrez
c69f071958 Merge pull request 'add_data_for_quebec_and_israel' (#30) from add_data_for_quebec_and_israel into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/30
 2023-07-12 16:29:55 -04:00
p_monsalvete
8434bdef04 solved bug in idf 2023-07-12 16:28:14 -04:00
p_monsalvete
8be6e3b3e8 small update to eilat_archetypes.json 2023-07-12 15:55:26 -04:00
p_monsalvete
ae157a9243 added eilat construction to catalog and imports and erased unused city_to_climate_reference_city in construction_helper.py 2023-07-12 11:36:35 -04:00
p_monsalvete
5247eda305 added eilat usage to catalog and imports 2023-07-11 16:34:11 -04:00
p_monsalvete
f146cf3281 added 2 more regions to the _epw_file dictionary 2023-07-10 16:32:22 -04:00
Guille
f2201c9575 remove useless class 2023-07-10 16:11:44 -04:00
p_monsalvete
7da26947d7 Merge remote-tracking branch 'origin/main' into main 2023-07-10 15:42:28 -04:00
Guille
8839cf07c2 improve unit tests and bug fix 2023-07-10 15:03:04 -04:00
Guille
af93dbb3a1 improve unit tests and bug fix 2023-07-10 14:55:36 -04:00
Guille
46ed69ef6e remove bag fix 2023-07-10 14:28:31 -04:00
Guille
e646f97890 correct exccluded file 2023-07-10 14:13:58 -04:00
Guille
778aa5e187 Consistence improvements and name fixing 2023-07-10 14:13:06 -04:00
Guille
06de614588 Merge remote-tracking branch 'origin/main' 2023-07-10 14:05:43 -04:00
Guille
408a32f781 Consistence improvements and name fixing 2023-07-10 14:05:38 -04:00
Guille Gutierrez
461d8d4ca0 Merge pull request 'Fix bug with opening pickle files from a pickle created in another operating system (for Windows and Linux only)' (#29) from fix_multi_os_pickle_load_bug into main 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/29
 2023-07-10 14:00:14 -04:00
Koa Wells
66739bc306 Fix bug with opening pickle files from a pickle created in another operating system (for Windows and Linux only) 2023-07-07 22:16:55 -04:00
p_monsalvete
bca68f33ff solved a bug assigning the energy systems to the buildings 2023-07-07 15:31:32 -04:00
Guille Gutierrez
f39c1deff4 Update 'hub/version.py' 2023-07-07 14:36:02 -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
p_monsalvete
db2687f75f changed name for a more clear understanding 2023-07-07 13:55:19 -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 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
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
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
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
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
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
p_monsalvete
82b72e78c7 solved a problem with the number of storages in the calculation of ACH 2023-05-29 14:13:57 -04:00