Commit Graph

320 Commits

Author SHA1 Message Date
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