Commit Graph

1839 Commits

Author SHA1 Message Date
941206e273 Merge pull request 'fix: infiltration_rate_area values for the new cerc archetypes are added' (#3) from infiltration_cerc_catalogues into main
Reviewed-on: #3
2024-11-03 05:29:08 -05:00
7952fe8a8e fix: infiltration_rate_area values for the new cerc archetypes are added 2024-11-03 11:27:40 +01:00
57cefc2f30 fix: latest Oriol changes and some updates in energy system catalog are implemented 2024-10-31 10:09:22 +00:00
73b779747e fix: redundant files are removed. 2024-10-31 09:46:33 +00:00
2e7723c65f Merge pull request 'OMHM_system_simulation' (#2) from OMHM_system_simulation into main
Reviewed-on: #2
2024-10-31 05:39:44 -04:00
77a1f08ae4 fix: current_status is fixed 2024-10-31 09:37:56 +00:00
e65496efa0 fix: system simulation done 2024-10-31 09:37:55 +00:00
0c5b64c0cf Merge pull request 'MOsman' (#1) from MOsman into main
Reviewed-on: #1
2024-10-31 05:32:25 -04:00
Mohamed_Osman
35204ed2a5 add_Single_familyhouse 2024-10-31 09:30:56 +00:00
Mohamed_Osman
e53c506e73 Select building based on height 2024-10-31 09:30:55 +00:00
Mohamed_Osman
ef9ff1d4d9 Retrofit Factory 2024-10-31 09:28:00 +00:00
Mohamed_Osman
8c46a629b9 nrcan catalog 2024-10-31 09:28:00 +00:00
Mohamed_Osman
cbba9f30f1 add_retrofit_input_file 2024-10-31 09:28:00 +00:00
Mohamed_Osman
f9d27627e9 Retrofit_window and infiltration 2024-10-31 09:28:00 +00:00
Mohamed_Osman
eba82b9cac Working_retrofit 2024-10-31 09:28:00 +00:00
Mohamed_Osman
9de0f48d9d basic and advanced retrofit 2024-10-31 09:28:00 +00:00
Mohamed_Osman
20b6167245 forced_u_value_change 2024-10-31 09:28:00 +00:00
Mohamed_Osman
47401f2e30 add_cerc catalogs 2024-10-31 09:28:00 +00:00
6f9c7397df Merge branch 'hub_branch'
# Conflicts:
#	hub/exports/building_energy/idf.py
2024-10-21 10:33:20 +02:00
bf4018a649 Update version number 2024-10-20 17:39:54 +02:00
6c7f652390 Merge pull request 'fix: the small bug in test units is resolved, the construction and usage factories can be loaded without any order' (#71) from small_bugs_in_user_tests into main
Reviewed-on: CERC/hub#71
2024-10-20 11:15:40 -04:00
4e46b6bc0d fix: the small bug in test units is resolved, the construction and usage factories can be loaded without any order 2024-10-18 12:28:38 +02:00
4ac9ccda81 Update hub/version.py 2024-10-17 08:05:13 -04:00
df2d7a3054 Geojson class modified for the geojson format Guille suggested 2024-10-17 07:40:13 -04:00
47810737fa geojson, construction and usage importers are all modified for mixed use buildings 2024-10-17 07:40:13 -04:00
99535a979c Update hub/version.py 2024-10-17 00:19:27 -04:00
9986552ec1 Merge remote-tracking branch 'origin/main' 2024-10-17 06:17:48 +02:00
d1719b50ed Merge branch 'infilt_availability_oriol' 2024-10-17 06:15:04 +02:00
5e01f4eb7f Merge pull request 'Remove build from setup.py and add it to requirements.txt' (#69) from fix/fix-build into main
Reviewed-on: CERC/hub#69
2024-10-03 14:08:37 -04:00
d38150ac2d Remove build from setup.py and add it to requirements.txt 2024-10-03 13:05:56 -05:00
5e5129ecd7 Merge pull request 'Add build package to setup.py and remove texttest' (#68) from fix/update-setup.py into main
Reviewed-on: CERC/hub#68
2024-10-02 12:07:55 -04:00
3905f228dc correct unittests 2024-10-02 06:30:43 +02:00
33049441f0 Add build package to setup.py and remove texttest 2024-10-01 14:35:08 -05:00
70dd9f7c6a Merge pull request 'fix: change building names in ep_multiple_buildings.py to upper case' (#66) from fix/ep-result-factory-naming-bug into main
Reviewed-on: CERC/hub#66
2024-10-01 10:15:40 -04:00
0ce392ea06 fix: change building names in ep_multiple_buildings.py to upper case 2024-10-01 09:43:57 -04:00
ogavalda
4b6a942324 Small change. test 2024-09-30 15:58:21 -04:00
2495046c44 correct typo 2024-09-30 19:46:07 +02:00
4738de0d8c Merge branch 'infilt_availability_oriol' 2024-09-30 15:17:05 +02:00
e220bf2c0d Merge remote-tracking branch 'origin/main' 2024-09-23 18:26:33 +02:00
a45cf02b28 Update hub/version.py 2024-09-23 11:57:33 -04:00
ef62e2531f add weather file to the EnergyBuildingsExportsFactory 2024-09-23 17:56:58 +02:00
ogavalda
cd34435a9f Including air temperature output 2024-09-16 15:49:18 -04:00
ogavalda
15b96fe154 Changing the full structure to incorporate a second way of entering infiltration (infiltration per outdoor area) 2024-09-16 15:41:27 -04:00
ogavalda
54a6e6b2db Adding infiltration per m2 2024-09-15 10:22:07 -04:00
ogavalda
a7375f0b53 Adding infiltration per m2 2024-09-15 10:15:41 -04:00
ogavalda
725746fbcb Changes in infiltration profiles and the source of values for infiltration 2024-09-15 09:44:07 -04:00
ec320a2e1c Merge pull request 'fix: small bugs in the irradiance units were fixed.' (#65) from irradiance_unit_fixing into main
Reviewed-on: CERC/hub#65
2024-09-09 13:27:05 -04:00
8a68118503 fix: small bugs in the irradiance units were fixed. 2024-09-09 11:11:33 -04:00
a3ec3c7e19 Merge pull request 'Add version number to numpy' (#64) from fix/downgrade-numpy into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/64

Hi Connor, I have accepted the change, but some additional review will be needed, it creates a hard dependency from a specific version of numpy with almost sure will create issues with other libraries, will be nice if you could keep an eye on the issue resolution from sqlalchemy
2024-09-02 12:35:30 -04:00
connor
ace666553a Add version number to numpy 2024-08-30 18:01:26 -04:00