Commit Graph

222 Commits

Author SHA1 Message Date
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
589f3e7f11 tested with old versions and got same results 2023-08-07 14:46:19 -04:00
67cd435fd5 all tests passed 2023-08-07 12:32:33 -04:00
212b4b0621 solving bugs from adding thermal_archetypes to the data model 2023-08-03 14:51:54 -04:00
fe8c79d7c2 solving bugs from adding thermal_archetypes to the data model 2023-08-03 13:49:57 -04:00
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
c38b025c2e Correct bd test, add dictionary for custom fuel to hub fuel 2023-08-02 12:43:51 -04:00
a147afe76f modified thermal zones to be created in different ways depending on the user needs 2023-07-31 17:01:35 -04:00
2292bff1b8 building info can now be retrieved via application, user and scenario 2023-07-31 16:08:10 -04:00
ce995c375d Merge remote-tracking branch 'origin/main' into retrofit_db_changes 2023-07-31 12:40:29 -04:00
eb246a18e6 Additional changes, the db_control building info need to be changed 2023-07-28 14:55:06 -04:00
24324988b6 added dictionary from montreal fuel type to hub 2023-07-28 13:18:23 -04:00
ee419b0849 added dictionary from montreal fuel type to hub 2023-07-28 12:26:17 -04:00
a3d4390a19 added surface type to construction names 2023-07-25 12:02:20 -04:00
f3208f1735 starting the process of changing thermal_zones generation, NOT working version 2023-07-25 11:40:47 -04:00
2744f86c66 rewritten thermal_openings creation to allow change in window ratio (doing it wrong previously) 2023-07-17 17:26:28 -04:00
048f79e1ae added two new values in dictionaries 2023-07-13 17:47:04 -04:00
6ab3ee3dc3 solved some issues on units in costs catalog 2023-07-13 15:53:20 -04:00
8be6e3b3e8 small update to eilat_archetypes.json 2023-07-12 15:55:26 -04:00
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
5247eda305 added eilat usage to catalog and imports 2023-07-11 16:34:11 -04:00
f146cf3281 added 2 more regions to the _epw_file dictionary 2023-07-10 16:32:22 -04:00
bca68f33ff solved a bug assigning the energy systems to the buildings 2023-07-07 15:31:32 -04:00
1acdebd6e7 Merge remote-tracking branch 'origin/main' 2023-07-07 14:33:41 -04:00
1ee5fd9dc5 Bug in geojson import 2023-07-07 14:33:34 -04:00
db2687f75f changed name for a more clear understanding 2023-07-07 13:55:19 -04:00
93c867558a modified ground_temperature name due to an overwriting of year in month 2023-07-07 11:57:24 -04:00
5dcead4e5d bug in function reading, expecting str and getting int 2023-06-09 13:36:21 -04:00
e07156ac30 Merge remote-tracking branch 'origin/main' into main 2023-06-09 13:12:12 -04:00
db1d2362c8 bug in idf.py and added uuid to building_name in geojson importer 2023-06-09 13:12:00 -04:00
23cb327e1b Bug fixing in associate energy systems 2023-06-09 12:31:01 -04:00
08df06dc2e Bug fixing in remove_city_object method 2023-06-09 11:21:45 -04:00
357e9f4a7e add weather region_codes 2023-06-07 15:27:38 -04:00
d6e6d06d39 Code quality check 2023-06-06 14:31:25 -04:00
ff642a2c0c Correct the weather factory and remove useless files 2023-06-06 13:32:37 -04:00
5e969986fb Refactor in building.
heating and cooling are now heating_demand and cooling_demand
2023-06-05 11:53:47 -04:00
1e68e3d40a Partial completion cost needs. 2023-06-02 15:05:29 -04:00
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
11b38eaa4c modified the place where the energy systems are created 2023-06-01 13:39:29 -04:00
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
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -04:00
82b72e78c7 solved a problem with the number of storages in the calculation of ACH 2023-05-29 14:13:57 -04:00
a431ee9d1e Merge branch 'retrofit_project' into systems_catalog 2023-05-29 12:18:09 -04:00
e704143333 Merge branch 'retrofit_project' into systems_catalog
# Conflicts:
#	hub/city_model_structure/building_demand/surface.py
#	hub/exports/building_energy/idf.py
#	hub/imports/results/simplified_radiosity_algorithm.py
2023-05-29 12:16:29 -04:00
183807b8e0 adapted systems importer to new catalog 2023-05-29 11:56:56 -04:00
04bf3bbef3 Hub now create a list of aliases instead of one 2023-05-26 18:21:35 -04:00
d650a713c4 Correct unittests 2023-05-26 12:01:54 -04:00
ee58d21b47 solved some small errors in meb exporter 2023-05-23 17:19:50 -04:00
5a7427e457 add todo for heat pum corrections
Keep because most likely we are going to delete this one.
2023-05-23 11:07:10 -04:00
182d01123c remove warnings for opened files and remove code duplication 2023-05-19 16:01:06 -04:00
bb279c39eb separated distribution consumption in fix and variable flows 2023-05-19 12:23:06 -04:00
1c4920d0b0 Partial follow Pylint recommendation 2023-05-18 12:29:28 -04:00
84ae32bcdb Code style and logging unification 2023-05-17 17:10:30 -04:00
126b25a119 Structure refactor 2023-05-17 12:30:11 -04:00
a33bf0b366 Partial completion of new persistence.
Results are still missing and need to be added to the final commit. including the db table creation that seems to be missing
2023-05-16 18:06:22 -04:00
f08d332c5b Merge branch 'main' into systems_catalog 2023-05-15 11:04:23 -04:00
d8386d179d energy systems importer finished
energy systems workflow defined in the unittest
2023-05-15 11:03:54 -04:00
e48dec81cf added lod to the city_objects 2023-05-12 09:27:29 -04:00
604e6d5eb2 Merge remote-tracking branch 'origin/geojson' 2023-05-04 13:46:27 -04:00
a41896cfbe Delete unused files from test_data
Bug fixing in geojson
Verify unit tests
2023-05-04 13:45:34 -04:00
4e3edffb65 Merge remote-tracking branch 'origin/geojson' into geojson 2023-05-04 11:28:21 -04:00
b6aa6fb86a complete geojson correction 2023-05-04 11:28:16 -04:00
ef7addd5b5 Merge branch 'geojson' into systems_catalog
# Conflicts:
#	hub/catalog_factories/energy_systems/nrcan_catalog.py
#	hub/helpers/dictionaries.py
#	hub/imports/construction/nrcan_physics_parameters.py
2023-05-04 10:48:19 -04:00
2621afb3cd small bug in nrcan constriction factory 2023-05-04 10:41:04 -04:00
dbcab5bcb9 energy systems factory test added and solved some bugs. Not working yet 2023-05-04 10:39:23 -04:00
742b6eb1be partial correction geojson 2023-05-03 17:02:28 -04:00
d82ada6240 solved bug in nrcan catalog and partially cleaned ep exporter 2023-05-03 11:39:32 -04:00
5a99f16bc9 solved 2 todos 2023-05-03 09:58:52 -04:00
27549e784d Merge branch 'geojson' into idf_lights 2023-05-02 14:47:26 -04:00
9317e46d5e rolled back some changes and hardcoded values 2023-05-02 14:36:04 -04:00
76ab65ea0f changed name systems to energy systems 2023-05-02 12:35:42 -04:00
1e68319e7e partial re-implementation of geojson read. 2023-05-01 18:05:09 -04:00
949a6c268f complete peak loads calculation 2023-05-01 10:37:51 -04:00
35b0e8c872 almost finished energy system importer, missing sizing 2023-04-28 16:31:53 -04:00
d5196fc54f bug dividing by 0 in nrcan_usage_parameters.py solved 2023-04-28 14:14:18 -04:00
e6486bc598 Partial correction for peakloads 2023-04-27 13:31:00 -04:00
7c0e03d0e0 Merge remote-tracking branch 'origin/geojson' into geojson 2023-04-27 10:59:08 -04:00
e4b6c54af6 Partial correction for peakloads 2023-04-27 10:59:03 -04:00
150614441e erased two prints, fixed a bug in geometry helper and modified name in costs archetype 2023-04-25 10:45:56 -04:00
78b21093bb DHW bug solved. It had to do with the factor of the building surface. Now getting good results 2023-04-25 08:24:56 -04:00
7f41e7d017 adding peak loads partial 2023-04-18 12:23:03 -04:00
af0e2a7c69 add name field to geojson 2023-04-18 12:23:03 -04:00
Peter Yefi
c68baf84dc Filtering out buildings with floor area less that 25 square meters 2023-04-18 12:21:59 -04:00
Peter Yefi
99b6860694 included stream logger. switched from default file logger to stream 2023-04-17 17:59:34 -04:00
d37ce01304 Changes hub to incorporate change of units in infiltration 2023-03-31 08:28:50 -04:00
Peter Yefi
a1bc4bc33e Filtering out buildings with floor area less that 25 square meters 2023-03-29 18:22:23 -04:00
648548ea2c Merge branch 'main' into idf_lights
# Conflicts:
#	hub/exports/building_energy/idf.py
#	hub/unittests/test_exports.py
2023-03-27 16:39:30 -04:00
dde1c796f7 Merge pull request 'test_correction' (#18) from test_correction into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/18
2023-03-27 13:56:55 -04:00
47d9d9d775 Correct all the unit tests 2023-03-27 13:55:32 -04:00
0a8c1c3c42 Ensure year of construction field is always an int 2023-03-27 12:37:31 -04:00
f5987cfbcc solved bug in ventilation + infiltration calculation 2023-03-24 13:34:37 -04:00
0a35acc62f erased print 2023-03-24 10:35:26 -04:00
2d840a6e49 added yearly value to ground temperature variable 2023-03-24 10:33:59 -04:00
1cc72119c9 added dhw and electrical demand to results importer and sanity check to importer 2023-03-23 13:49:05 -04:00
50ec57f04f Correct IDF 2023-03-23 13:43:03 -04:00
b918dfcabd added dhw and electrical demand to results importer and sanity check to importer 2023-03-23 13:33:25 -04:00
9d51d4f8ba idf 2023-03-22 16:23:43 -04:00
559e56dd71 fixed the tcold bug in weather importer 2023-03-22 15:13:44 -04:00
a3bbe76147 Merge pull request 'meb_debugging' (#11) from meb_debugging into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/11
2023-03-22 10:37:44 -04:00
28dd0f8b0f fixed the tcold bug 2023-03-21 16:11:58 -04:00