Commit Graph

43 Commits

Author SHA1 Message Date
6e79541816 Delete all __pycache__ files 2024-06-17 19:08:52 -04:00
674393970c Merge remote-tracking branch 'origin/main' into final_energy_system_model
# Conflicts:
#	.gitignore
#	hub/city_model_structure/building.py
#	hub/exports/building_energy/idf.py
#	hub/imports/geometry_factory.py
2024-02-16 05:50:45 +01:00
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
5230da861c correct units according to oriol's instruction 2024-01-09 14:00:33 +01:00
57c7a76529 The ep results importer for multiple buildings is completed 2023-12-06 13:53:31 -05:00
020190829f The energy plus result importer for multiple buildings is created and tested. Currently, buildings are enriched with hourly values but monthly and yearly values are not working. 2023-12-05 19:38:11 -05:00
e3f1d52a21 Add .gitignore to exclude Python bytecode files 2023-12-05 12:47:44 -05:00
f2bfc297b3 Basic style correction and missing docstrings 2023-10-05 11:30:20 +02:00
d5c443a57b Merge remote-tracking branch 'origin/main' into energy_system_central_data_model 2023-10-05 11:02:13 +02:00
8b66e20e9a some refactoring 2023-09-27 05:35:28 -04:00
a43c971bbb modified working hours to give hours a month, not only total 2023-09-25 05:19:02 -04:00
cde3bfb4ae tried to get monthly values from the method in helpers/monthly values. 2023-09-08 11:50:20 -04:00
8f8a6dbf71 small changes in importer 2023-09-08 05:05:58 -04:00
1392c05489 results_factory.py is modified
The enrich method is added to energy_plus_workflow.py
The Levis_out.csv is added to test_data
2023-09-07 18:16:07 -04:00
a0d2f7e5bc chnages were made to energy_plus_workflow.py 2023-09-06 14:55:14 -04:00
491b976fd9 Correct error in meb (temporary workaround) 2023-08-22 10:25:40 -04:00
bdf0deb3b3 all test passed 2023-08-08 11:20:44 -04:00
ab81edc33d changed in data ACH to 1/s all Wh in J 2023-08-08 10:19:35 -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
a147afe76f modified thermal zones to be created in different ways depending on the user needs 2023-07-31 17:01:35 -04:00
5e969986fb Refactor in building.
heating and cooling are now heating_demand and cooling_demand
2023-06-05 11:53:47 -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
84ae32bcdb Code style and logging unification 2023-05-17 17:10:30 -04:00
e48dec81cf added lod to the city_objects 2023-05-12 09:27:29 -04:00
e6486bc598 Partial correction for peakloads 2023-04-27 13:31:00 -04:00
e4b6c54af6 Partial correction for peakloads 2023-04-27 10:59:03 -04:00
7f41e7d017 adding peak loads partial 2023-04-18 12:23:03 -04:00
f5987cfbcc solved bug in ventilation + infiltration calculation 2023-03-24 13:34:37 -04:00
1cc72119c9 added dhw and electrical demand to results importer and sanity check to importer 2023-03-23 13:49:05 -04:00
b918dfcabd added dhw and electrical demand to results importer and sanity check to importer 2023-03-23 13:33:25 -04:00
88e2cb6796 introduced dhw to the meb exporter 2023-03-20 14:15:57 -04:00
34172055a6 Store the meb as float 2023-02-24 15:49:40 -05:00
274c8f0f8e Correct bug in insel meb import 2023-02-24 15:33:53 -05:00
43030626ce Correct bug in insel meb import 2023-02-24 15:24:08 -05:00
Peter Yefi
c3f4c27811 Added heat pump energy demand and fossil fuel consumption results 2023-02-20 18:36:34 -05:00
22cbede8d5 Added the full functionality to create meb 2023-02-08 13:40:06 -05:00
11e8949b30 Added the importer for sra results 2023-02-07 13:01:49 -05:00