|
|
5cc62ccabd
|
Complete the merge cities
|
2023-06-07 12:55:03 -04:00 |
|
|
|
c6852e5af6
|
Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project
|
2023-06-07 09:50:50 -04:00 |
|
|
|
502e1e8279
|
added system for refurbishment to catalog
|
2023-06-07 09:48:45 -04:00 |
|
|
|
4d8e41b4a3
|
Add canadian weather file as default
|
2023-06-07 07:58:18 -04:00 |
|
|
|
eae26f6388
|
Partial correction of merge function
|
2023-06-06 17:44:07 -04:00 |
|
|
|
35d5293956
|
Merge remote-tracking branch 'origin/main' into main
# Conflicts:
# scripts/ep_workflow.py
|
2023-06-06 16:20:01 -04:00 |
|
|
|
bd82d0cd1f
|
added weather factory needed for cold water temperature
|
2023-06-06 16:12:20 -04:00 |
|
|
|
bd23185ca3
|
Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project
|
2023-06-06 16:09:44 -04:00 |
|
|
|
4ccf16411c
|
solved feature in idf generator
|
2023-06-06 16:09:33 -04:00 |
|
|
|
eadc5e4a01
|
Working version for Majid, course
|
2023-06-06 14:40:07 -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 |
|
|
|
8d3d1ac427
|
Homogenize unit tests and remove useless files
|
2023-06-05 13:42:15 -04:00 |
|
|
|
1819541a21
|
Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project
|
2023-06-05 11:53:54 -04:00 |
|
|
|
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 |
|
