Commit Graph

124 Commits

Author SHA1 Message Date
ebaec9bb7c Title: Finalizing the energy system data model and system factory
A new XML file named montreal_future_systems.xml is created where the elements of the file are the same as attributes of various classes. Therefore, the catalogue importer and energy system importer should have been updated accordingly. The catalog importer is organized in a general method so whenever someone wants to create a new catalogue they can use the created code as the blueprint.
2024-02-07 18:54:09 -05:00
d94bce4174 half made changes in central data model for systems 2023-10-13 08:23:40 -04:00
d5c443a57b Merge remote-tracking branch 'origin/main' into energy_system_central_data_model 2023-10-05 11:02:13 +02:00
568317ebf1 Merge pull request 'fixing_working_hours_problem' (#47) from fixing_working_hours_problem into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/47
2023-10-05 04:40:58 -04:00
23a8fbe86d continued working on the importer 2023-10-03 13:07:20 -04:00
eaa3064a3f continued working on energy system importer 2023-09-28 19:19:32 -04:00
8dbbfb9460 finished creating generic generation system in the _create_generic_systems method in north_america_custom_energy_system_parameters.py 2023-09-27 17:48:23 -04:00
6d34e41e90 Started working on north america energy system importer. 2023-09-26 18:54:58 -04:00
a43c971bbb modified working hours to give hours a month, not only total 2023-09-25 05:19:02 -04:00
2a5c552f17 added new functions to dictionaries 2023-09-06 04:40:56 -04:00
fa518126a5 Merge pull request 'modifications_in_location' (#42) from modifications_in_location into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/42
2023-08-11 12:01:36 -04:00
19d05940fa added reference-city latitude and longitude 2023-08-11 10:10:41 -04:00
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