Commit Graph

1870 Commits

Author SHA1 Message Date
5e969986fb Refactor in building.
heating and cooling are now heating_demand and cooling_demand
2023-06-05 11:53:47 -04:00
c0a2a8a2f9 solved bug in onsite electrical production 2023-06-05 11:52:29 -04:00
c6b986ad1b Add custom_insel_block parameter to insel MEB and add unit test 2023-06-02 18:48:55 -04:00
1e68e3d40a Partial completion cost needs. 2023-06-02 15:05:29 -04:00
21b1eef3d3 Merge branch 'main' into retrofit_project 2023-06-02 13:18:41 -04:00
dab931cadb Partial correction of hub 2023-06-02 10:25:34 -04:00
1d8a1dc275 solved bug in enumerate 2023-06-01 14:10:03 -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
03a1744f87 Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog 2023-06-01 13:39:49 -04:00
11b38eaa4c modified the place where the energy systems are created 2023-06-01 13:39:29 -04:00
d3f35038ec Change xml to solve mistake in cooling system 2023-06-01 11:52:57 -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
0956f40e42 Bug correction and code quality improvements 2023-05-31 16:55:44 -04:00
3e9060c6a7 Update 'hub/version.py' 2023-05-31 13:56:22 -04:00
909b453036 Merge pull request 'retrofit_project' (#24) from retrofit_project into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/24
2023-05-31 13:55:49 -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
813f2f6738 Changes in subsidy structure 2023-05-31 12:26:02 -04:00
30ca0ade38 Bug in gas costs solved. xml file 2023-05-31 11:23:24 -04:00
eeb75c101f update pylintrc and correct setup.py 2023-05-31 11:04:41 -04:00
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -04:00
3cdad733b3 solved problems when systems not exist 2023-05-29 15:26:21 -04:00
8c3e9a2f95 solved a bug in parasitic_energy_consumption 2023-05-29 15:09:47 -04:00
82b72e78c7 solved a problem with the number of storages in the calculation of ACH 2023-05-29 14:13:57 -04:00
fd215d9ae9 erased merge methods and tests 2023-05-29 12:49:27 -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
aaa87d79c6 Partial completion cost needs. 2023-05-29 11:59:45 -04:00
183807b8e0 adapted systems importer to new catalog 2023-05-29 11:56:56 -04:00
061952eb17 Add roof area to the persistence 2023-05-29 11:13:49 -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
08f44fc935 SRA update and release changes 2023-05-26 11:20:10 -04:00
dcb5cb4134 Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog
# Conflicts:
#	hub/data/energy_systems/montreal_custom_systems.xml
2023-05-23 17:20:30 -04:00
ee58d21b47 solved some small errors in meb exporter 2023-05-23 17:19:50 -04:00
fc61c5db5f Changes in structure of xml to include systems and subsystems 2023-05-23 14:49:29 -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
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
d432373156 Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog
# Conflicts:
#	hub/data/energy_systems/montreal_custom_systems.xml
2023-05-23 10:19:01 -04:00
48c408b110 solved bug in ventilation in idf exporter 2023-05-23 10:18:01 -04:00
861fbc6458 modified montreal energy systems catalog 2023-05-23 10:17:26 -04:00
c77c03b759 Incorporation of ventilation that previously was not writing idf. Working.
Incorporation of percentual losses in distribution
2023-05-19 18:05:36 -04:00
de066b25fb Changes hub to incorporate change in distribution 2023-05-19 16:57:35 -04:00
182d01123c remove warnings for opened files and remove code duplication 2023-05-19 16:01:06 -04:00
4700cd037a Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog
# Conflicts:
#	hub/data/construction/nrcan_archetypes.json
2023-05-19 15:04:31 -04:00
635c0162dc added distribution_systems_electrical_consumption 2023-05-19 15:04:02 -04:00
a0335795de Code quality assurance completed 2023-05-19 13:15:40 -04:00
bb279c39eb separated distribution consumption in fix and variable flows 2023-05-19 12:23: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