|
|
7eafd33b33
|
Update 'hub/version.py'
|
2023-06-09 11:28:41 -04:00 |
|
|
|
0c7d428aa6
|
Merge remote-tracking branch 'origin/some_improvements_in_city_model'
|
2023-06-09 11:22:18 -04:00 |
|
|
|
08df06dc2e
|
Bug fixing in remove_city_object method
|
2023-06-09 11:21:45 -04:00 |
|
|
|
65f9e3e43e
|
added thermal_zones to the building
|
2023-06-08 14:18:29 -04:00 |
|
|
|
e14bc5c2bd
|
Update 'hub/version.py'
|
2023-06-08 11:20:17 -04:00 |
|
|
|
e0f11b7c02
|
Merge branch 'main' into retrofit_project
|
2023-06-08 09:30:25 -04:00 |
|
|
|
38bda1920d
|
Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project
|
2023-06-08 09:30:04 -04:00 |
|
|
|
56fae48277
|
Changed systems xml file to include new systems without cooling
|
2023-06-07 16:17:46 -04:00 |
|
|
|
357e9f4a7e
|
add weather region_codes
|
2023-06-07 15:27:38 -04:00 |
|
|
|
ea00266626
|
Merge pull request 'retrofit_project' (#25) from retrofit_project into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/25
|
2023-06-07 14:50:00 -04:00 |
|
|
|
8e20e747a5
|
Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project
|
2023-06-07 14:40:54 -04:00 |
|
|
|
d67c5c438b
|
solved bug in _calculate_working_hours
|
2023-06-07 14:40:44 -04:00 |
|
|
|
00a1313235
|
Update 'hub/version.py'
|
2023-06-07 13:19:48 -04:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
86d4d839b2
|
Partial correction in persistence
|
2023-05-18 16:46:50 -04:00 |
|
|
|
6e249073c5
|
Partial correction in persistence
|
2023-05-18 16:40:52 -04:00 |
|
|
|
5fb361e74c
|
Partial correction in persistence and geometry_helper.py
|
2023-05-18 16:15:57 -04:00 |
|
|
|
1c4920d0b0
|
Partial follow Pylint recommendation
|
2023-05-18 12:29:28 -04:00 |
|
|
|
c72f30a476
|
Code style and remove old test and un-used files
|
2023-05-18 10:35:05 -04:00 |
|
|
|
e4f22c29f2
|
erased saving in pickle
|
2023-05-18 10:26:21 -04:00 |
|
|
|
84ae32bcdb
|
Code style and logging unification
|
2023-05-17 17:10:30 -04:00 |
|
|
|
baa82c8ec8
|
Structure refactor
|
2023-05-17 12:30:55 -04:00 |
|
|
|
126b25a119
|
Structure refactor
|
2023-05-17 12:30:11 -04:00 |
|
|
|
a33bf0b366
|
Partial completion of new persistence.
Results are still missing and need to be added to the final commit. including the db table creation that seems to be missing
|
2023-05-16 18:06:22 -04:00 |
|
|
|
48dddae525
|
Merge remote-tracking branch 'origin/systems_catalog' into retrofit_project
|
2023-05-16 09:37:09 -04:00 |
|
|
|
f08d332c5b
|
Merge branch 'main' into systems_catalog
|
2023-05-15 11:04:23 -04:00 |
|
|
|
d8386d179d
|
energy systems importer finished
energy systems workflow defined in the unittest
|
2023-05-15 11:03:54 -04:00 |
|
|
|
ffae3f3a04
|
reformatting energy systems to a class
|
2023-05-12 10:20:39 -04:00 |
|
|
|
aa08306a99
|
added lod to the city_objects
|
2023-05-12 09:28:24 -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 |
|
|
|
82e5d4ea5e
|
Update 'hub/version.py'
|
2023-05-04 13:50:52 -04:00 |
|
|
|
604e6d5eb2
|
Merge remote-tracking branch 'origin/geojson'
|
2023-05-04 13:46:27 -04:00 |
|
|
|
a41896cfbe
|
Delete unused files from test_data
Bug fixing in geojson
Verify unit tests
|
2023-05-04 13:45:34 -04:00 |
|
|
|
4e3edffb65
|
Merge remote-tracking branch 'origin/geojson' into geojson
|
2023-05-04 11:28:21 -04:00 |
|
|
|
b6aa6fb86a
|
complete geojson correction
|
2023-05-04 11:28:16 -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 |
|
|
|
2621afb3cd
|
small bug in nrcan constriction factory
|
2023-05-04 10:41:04 -04:00 |
|
|
|
dbcab5bcb9
|
energy systems factory test added and solved some bugs. Not working yet
|
2023-05-04 10:39:23 -04:00 |
|
|
|
742b6eb1be
|
partial correction geojson
|
2023-05-03 17:02:28 -04:00 |
|
|
|
0747b61294
|
some formatting
|
2023-05-03 16:16:50 -04:00 |
|
|
|
f060197729
|
cleaned a bug in add_schedules and erased all related to adjacent_buildings
|
2023-05-03 14:14:13 -04:00 |
|
|
|
bdb8bf65b7
|
continue cleaning idf exporter. Changed all specific schedules to general _add_schedule by previously creating the schedules
|
2023-05-03 13:05:37 -04:00 |
|
|
|
91e2794a8b
|
Merge remote-tracking branch 'origin/idf_lights' into idf_lights
# Conflicts:
# hub/catalog_factories/usage/nrcan_catalog.py
# hub/exports/building_energy/idf.py
|
2023-05-03 11:50:59 -04:00 |
|
|
|
d82ada6240
|
solved bug in nrcan catalog and partially cleaned ep exporter
|
2023-05-03 11:39:32 -04:00 |
|
|
|
5a99f16bc9
|
solved 2 todos
|
2023-05-03 09:58:52 -04:00 |
|
|
|
75e56f4b99
|
Ventilation and usage changed, problem of units. Revise with Pilar the incorporation of ventilation
|
2023-05-02 17:51:08 -04:00 |
|
|
|
d4029aee10
|
erased non used variables
|
2023-05-02 14:48:51 -04:00 |
|
|
|
27549e784d
|
Merge branch 'geojson' into idf_lights
|
2023-05-02 14:47:26 -04:00 |
|
|
|
de718456a5
|
just changed a comment
|
2023-05-02 14:47:10 -04:00 |
|
|
|
7a6bf0ac52
|
rolled back some changes and hardcoded values
|
2023-05-02 14:44:45 -04:00 |
|
|
|
9ecf59c68f
|
rolled back some changes and hardcoded values
|
2023-05-02 14:39:37 -04:00 |
|
|
|
9317e46d5e
|
rolled back some changes and hardcoded values
|
2023-05-02 14:36:04 -04:00 |
|
|
|
76ab65ea0f
|
changed name systems to energy systems
|
2023-05-02 12:35:42 -04:00 |
|
|
|
1e68319e7e
|
partial re-implementation of geojson read.
|
2023-05-01 18:05:09 -04:00 |
|
|
|
949a6c268f
|
complete peak loads calculation
|
2023-05-01 10:37:51 -04:00 |
|
|
|
35b0e8c872
|
almost finished energy system importer, missing sizing
|
2023-04-28 16:31:53 -04:00 |
|
|
|
d5196fc54f
|
bug dividing by 0 in nrcan_usage_parameters.py solved
|
2023-04-28 14:14:18 -04:00 |
|
|
|
3bfb985c04
|
finished system catalog factory
|
2023-04-28 14:07:07 -04:00 |
|
|
|
0a96b83c22
|
added generic energy system classes to cdm
|
2023-04-28 12:24:08 -04:00 |
|
|
|
42c39e771c
|
modifications in the systems catalog file
|
2023-04-28 12:11:48 -04:00 |
|
|
|
688198a3fb
|
added first example of possible catalog.xml
|
2023-04-28 10:50:46 -04:00 |
|
|
|
53aa540b45
|
some modifications in parameters after technical discussion
|
2023-04-27 16:21:17 -04:00 |
|
|
|
7a29847132
|
first attempt to energy system catalog. Not working
|
2023-04-27 15:40:59 -04:00 |
|
|
|
e6486bc598
|
Partial correction for peakloads
|
2023-04-27 13:31:00 -04:00 |
|
|
|
7c0e03d0e0
|
Merge remote-tracking branch 'origin/geojson' into geojson
|
2023-04-27 10:59:08 -04:00 |
|
|
|
e4b6c54af6
|
Partial correction for peakloads
|
2023-04-27 10:59:03 -04:00 |
|
|
|
2dfe8254d1
|
added new functions to access chapter and item by name in costs catalog
|
2023-04-25 11:48:24 -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 |
|
|
|
3d6699f71f
|
changed hardcoded path to relative path in costs catalog factory
|
2023-04-25 10:27:27 -04:00 |
|
|
|
4ab741ee12
|
changed hardcoded path to relative path in costs catalog
|
2023-04-25 10:23:37 -04:00 |
|
|
|
a3f0478558
|
Merge remote-tracking branch 'origin/geojson' into geojson
|
2023-04-25 10:00:18 -04:00 |
|
|
|
745c1e6843
|
added dictionary to access montreal custom costs catalog
|
2023-04-25 10:00:07 -04:00 |
|
|
|
354923b378
|
added dictionary to access montreal custom costs catalog
|
2023-04-25 09:59:52 -04:00 |
|
|
|
78b21093bb
|
DHW bug solved. It had to do with the factor of the building surface. Now getting good results
|
2023-04-25 08:24:56 -04:00 |
|
|
|
3ccda97830
|
Add redundancy to improve wall detections
|
2023-04-22 09:33:06 -04:00 |
|
|
|
a25215adb8
|
correct shared walls
|
2023-04-21 12:57:13 -04:00 |
|
|
|
86892332e3
|
correct shared walls
|
2023-04-21 12:56:32 -04:00 |
|
|
|
0f8816a053
|
correct shared walls
|
2023-04-21 12:48:50 -04:00 |
|
|
|
e978d56320
|
correct idf generation for shared walls
|
2023-04-21 10:31:55 -04:00 |
|
|
|
bb121512c3
|
Add utf-8 encoding when reading cities15000 file
|
2023-04-18 17:55:27 -04:00 |
|
|
|
dc6bfb3403
|
correct idf generation for shared walls
|
2023-04-18 16:47:36 -04:00 |
|
|
|
90c40f5e55
|
add shared surfaces to idf
|
2023-04-18 15:45:09 -04:00 |
|
|
|
844835eabd
|
Merge branch 'retrofit_project' into idf_lights
|
2023-04-18 12:23:25 -04:00 |
|
|
|
7f41e7d017
|
adding peak loads partial
|
2023-04-18 12:23:03 -04:00 |
|
|
|
af0e2a7c69
|
add name field to geojson
|
2023-04-18 12:23:03 -04:00 |
|
|
|
4ca8975e18
|
remove openstreetmaps dependency
|
2023-04-18 12:23:03 -04:00 |
|
Peter Yefi
|
c68baf84dc
|
Filtering out buildings with floor area less that 25 square meters
|
2023-04-18 12:21:59 -04:00 |
|
|
|
251f5a8582
|
version 0.1.7.11
|
2023-04-18 12:21:59 -04:00 |
|
|
|
ed13f21470
|
Correct cerc-hub installer to include dependencies
|
2023-04-18 12:21:59 -04:00 |
|
Peter Yefi
|
99b6860694
|
included stream logger. switched from default file logger to stream
|
2023-04-17 17:59:34 -04:00 |
|
|
|
a59ef0937d
|
Outputs of DHW incorporated. Values still relatively high, but consistent. Still need to incorporate adequately Cold Water Temperature
|
2023-04-17 10:12:18 -04:00 |
|
|
|
fe7f44d51f
|
Fully functional Domestic Hot Water. Pending validation of results
|
2023-04-12 13:52:55 -04:00 |
|
