Commit Graph

1584 Commits

Author SHA1 Message Date
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
492795f1a2 added new functions to access chapter and item by name in costs catalog 2023-04-28 14:37:23 -04:00
8eb9bad87e erased two prints, fixed a bug in geometry helper and modified name in costs archetype 2023-04-28 14:37:23 -04:00
c91edc8a83 changed hardcoded path to relative path in costs catalog factory 2023-04-28 14:37:22 -04:00
cef35a7e02 changed hardcoded path to relative path in costs catalog 2023-04-28 14:37:22 -04:00
995bf52c1b added dictionary to access montreal custom costs catalog 2023-04-28 14:37:22 -04:00
bf2ee82465 added dictionary to access montreal custom costs catalog 2023-04-28 14:37:22 -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
2650dccf57 Merge branch 'main' into systems_catalog 2023-04-27 14:28:22 -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
e6d62485d9 Changes in capital costs 2023-04-25 09:11:35 -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
b60be9c39e Create Linux documentation and add INSEL to Windows documentation 2023-04-24 15:42:07 -04:00
ac96b0467b Update Windows documentation for new version of PyCharm and gitea 2023-04-24 14:14:14 -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
d8100cb5f9 Merge pull request 'included stream logger. switched from default file logger to stream' (#21) from logging into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/21
2023-04-18 14:18:14 -04:00
844835eabd Merge branch 'retrofit_project' into idf_lights 2023-04-18 12:23:25 -04:00
40e11261e2 Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project 2023-04-18 12:23:04 -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