Commit Graph

412 Commits

Author SHA1 Message Date
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
f62df2e873 dhw schedule fix attempt 2023-04-12 10:16:14 -04:00
89faa92103 dhw schedule fix attempt 2023-04-12 09:35:27 -04:00
40fe325a18 Incorporated 1st version Domestic Hot Water, still not working. 2023-04-11 23:07:56 -04:00
29e700c212 add name field to geojson 2023-04-06 13:26:29 -04:00
6de00c0331 Change of minimal.idf to include monthly summary of data to be able to compare with MEP.
Commenting the EP-Workflow to solve the error given by the output reader. To be solved with Koa
2023-04-04 17:59:20 -04:00
bc0c1fc0f3 Revision of infiltration parameters 2023-03-31 12:25:13 -04:00
d37ce01304 Changes hub to incorporate change of units in infiltration 2023-03-31 08:28:50 -04:00
73c8839814 Merge pull request 'Filtering out buildings with floor area less that 25 square meters' (#20) from hp_results into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/20
2023-03-30 13:23:40 -04:00
Peter Yefi
a1bc4bc33e Filtering out buildings with floor area less that 25 square meters 2023-03-29 18:22:23 -04:00
1947b1ec37 version 0.1.7.11 2023-03-28 10:48:49 -04:00
86de5a33ca Correct cerc-hub installer to include dependencies 2023-03-28 10:41:29 -04:00
648548ea2c Merge branch 'main' into idf_lights
# Conflicts:
#	hub/exports/building_energy/idf.py
#	hub/unittests/test_exports.py
2023-03-27 16:39:30 -04:00
7a9032b0dc Small refactor.
Now energy plus don't raise and unexpected error when some exports aren't performed.
2023-03-27 16:28:17 -04:00
dde1c796f7 Merge pull request 'test_correction' (#18) from test_correction into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/18
2023-03-27 13:56:55 -04:00
47d9d9d775 Correct all the unit tests 2023-03-27 13:55:32 -04:00
0a8c1c3c42 Ensure year of construction field is always an int 2023-03-27 12:37:31 -04:00
26951d2458 Remove un used variable 2023-03-27 11:40:39 -04:00
27005e20c9 Correct missing information 2023-03-27 11:39:45 -04:00
9ed8fc61e2 Changes in idf. 2023-03-27 11:25:43 -04:00
f5987cfbcc solved bug in ventilation + infiltration calculation 2023-03-24 13:34:37 -04:00
f48d5214f4 Changes idf to incorporate multifloor 2023-03-24 12:15:10 -04:00
de80850367 Merge pull request 'debugging_peak_demands' (#14) from debugging_peak_demands into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/14
2023-03-24 10:57:07 -04:00
5cad95ea0c Merge pull request 'updated usages in dictionary to reduce not recognized archetypes' (#16) from fixing_errors_found_Koas_logs into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/16
2023-03-24 10:56:47 -04:00
5a5f9f0ef0 Merge pull request 'Usage fzk hous in exoport idf' (#15) from my_test into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/15
2023-03-24 10:55:27 -04:00
0a35acc62f erased print 2023-03-24 10:35:26 -04:00
2d840a6e49 added yearly value to ground temperature variable 2023-03-24 10:33:59 -04:00
f8b33fa5bf Small improvement in idf export for lighting 2023-03-24 09:33:09 -04:00
812d8d06d2 Schedule appliances added
First trial of adding factor to change from multizone to unizone. Commented.
2023-03-24 08:10:47 -04:00
4082a20638 updated usages in dictionary to reduce not recognized archetypes 2023-03-23 16:55:09 -04:00
b9c1e4f071 Remove run from test 2023-03-23 15:59:23 -04:00
5096fe3bab Usage fzk hous in exoport idf 2023-03-23 15:47:31 -04:00
ac7fca738a Usage fzk hous in exoport idf 2023-03-23 15:38:38 -04:00
1cc72119c9 added dhw and electrical demand to results importer and sanity check to importer 2023-03-23 13:49:05 -04:00
50ec57f04f Correct IDF 2023-03-23 13:43:03 -04:00
b918dfcabd added dhw and electrical demand to results importer and sanity check to importer 2023-03-23 13:33:25 -04:00
35f5544a32 Appliances test 2023-03-23 13:24:41 -04:00
9d51d4f8ba idf 2023-03-22 16:23:43 -04:00
32d23d6bdd fixed costs catalog factory 2023-03-22 16:17:08 -04:00
559e56dd71 fixed the tcold bug in weather importer 2023-03-22 15:13:44 -04:00
81a59d4246 Delete 'hub/unittests/tests_outputs/New_York_sra_SW.out' 2023-03-22 14:26:40 -04:00
0b06b67810 delete 2023-03-22 14:26:29 -04:00
a3bbe76147 Merge pull request 'meb_debugging' (#11) from meb_debugging into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/11
2023-03-22 10:37:44 -04:00
28dd0f8b0f fixed the tcold bug 2023-03-21 16:11:58 -04:00
f3db1e5fee reviewed units in nrcan catalog and modified catalog and importer accordingly 2023-03-21 15:29:11 -04:00
053a866443 Merge pull request 'optimization' (#10) from optimization into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/10
2023-03-21 14:31:55 -04:00
927771081d Performance improvements completed 2023-03-21 14:22:28 -04:00
ff55b502a6 Merge branch 'main' into hp_results 2023-03-20 16:55:45 -04:00
88e2cb6796 introduced dhw to the meb exporter 2023-03-20 14:15:57 -04:00
bb10d888c3 re-introduced shared walls = 0 for no neighbours 2023-03-20 11:41:43 -04:00