Commit Graph

112 Commits

Author SHA1 Message Date
7c29405f21 Add missing values to reference city to climate zone and to montreal functions 2023-08-10 11:30:59 -04:00
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
ebb712ebaf Add missing values to reference city to climate zone and to montreal functions 2023-08-10 11:01:37 -04:00
30908eda6d Add retrieve result test and correct lock in sqlalchemy 2023-08-09 16:12:10 -04:00
deb04cbe2d Add retrieve result test and correct lock in sqlalchemy 2023-08-09 13:52:55 -04:00
527bf4448b overall quality improvement 2023-08-08 12:39:37 -04:00
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
d7e041b686 erased traffic folder: was not used at all
changed in data ACH to 1/s
2023-08-07 16:56:01 -04:00
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
f3208f1735 starting the process of changing thermal_zones generation, NOT working version 2023-07-25 11:40:47 -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
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
fbdd4e369e Bug fixing in associate energy systems 2023-06-13 12:48:46 -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
1e68e3d40a Partial completion cost needs. 2023-06-02 15:05:29 -04:00
0956f40e42 Bug correction and code quality improvements 2023-05-31 16:55:44 -04:00
11ba482e73 correct bug 2023-05-31 13:53:22 -04:00
6809a4fca3 update pylintrc and correct setup.py 2023-05-31 13:51:35 -04:00
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -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
ee58d21b47 solved some small errors in meb exporter 2023-05-23 17:19:50 -04:00
9f00208cbb Complete the persistence update
test_save_result will be failing till systems are completed.
2023-05-23 14:36:48 -04:00
182d01123c remove warnings for opened files and remove code duplication 2023-05-19 16:01:06 -04:00
3680e0356f Merge branch 'idf_lights' into systems_catalog 2023-05-19 11:21:12 -04:00
7b245a69b3 Incorporation of ventilation. Working. 2023-05-19 11:20:44 -04:00
5fb361e74c Partial correction in persistence and geometry_helper.py 2023-05-18 16:15:57 -04:00
84ae32bcdb Code style and logging unification 2023-05-17 17:10:30 -04:00
48dddae525 Merge remote-tracking branch 'origin/systems_catalog' into retrofit_project 2023-05-16 09:37:09 -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
7b369bae27 Partial correction persistence 2023-05-10 17:06:51 -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
dbcab5bcb9 energy systems factory test added and solved some bugs. Not working yet 2023-05-04 10:39:23 -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
949a6c268f complete peak loads calculation 2023-05-01 10:37:51 -04:00
e6486bc598 Partial correction for peakloads 2023-04-27 13:31:00 -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
a3f0478558 Merge remote-tracking branch 'origin/geojson' into geojson 2023-04-25 10:00:18 -04:00