Commit Graph

51 Commits

Author SHA1 Message Date
04ef636423 Merge branch 'main' into reviewing_units
# Conflicts:
#	hub/city_model_structure/building_demand/internal_zone.py
#	hub/city_model_structure/building_demand/thermal_zone.py
#	hub/exports/building_energy/insel/insel_monthly_energy_balance.py
2023-08-07 17:01:55 -04:00
d7e041b686 erased traffic folder: was not used at all
changed in data ACH to 1/s
2023-08-07 16:56:01 -04:00
90a196465a Merge pull request 'reviewing_hub' (#40) from reviewing_hub into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/40
2023-08-07 15:48:25 -04:00
67cd435fd5 all tests passed 2023-08-07 12:32:33 -04:00
a147afe76f modified thermal zones to be created in different ways depending on the user needs 2023-07-31 17:01:35 -04:00
8434bdef04 solved bug in idf 2023-07-12 16:28:14 -04:00
db1d2362c8 bug in idf.py and added uuid to building_name in geojson importer 2023-06-09 13:12:00 -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
eae26f6388 Partial correction of merge function 2023-06-06 17:44:07 -04:00
4ccf16411c solved feature in idf generator 2023-06-06 16:09:33 -04:00
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -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
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
7b245a69b3 Incorporation of ventilation. Working. 2023-05-19 11:20:44 -04:00
84ae32bcdb Code style and logging unification 2023-05-17 17:10:30 -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
75e56f4b99 Ventilation and usage changed, problem of units. Revise with Pilar the incorporation of ventilation 2023-05-02 17:51:08 -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
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
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
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
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
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
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
f48d5214f4 Changes idf to incorporate multifloor 2023-03-24 12:15:10 -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
5096fe3bab Usage fzk hous in exoport idf 2023-03-23 15:47:31 -04:00
50ec57f04f Correct IDF 2023-03-23 13:43:03 -04:00
35f5544a32 Appliances test 2023-03-23 13:24:41 -04:00
9d51d4f8ba idf 2023-03-22 16:23:43 -04:00
Pilar
63b17e74b5 erased parameters of nomass materials in energyplus exporter not needed 2023-03-07 15:56:26 -05:00
Pilar
ffc956b2d0 a bug in usage -> division by 0 2023-03-07 15:03:24 -05:00
Pilar
c61dca2fe6 from usage_zone to usage 2023-01-26 08:53:00 -05:00
2ebec93ab4 Merge disaster:
I do expect a lot of errors in this merge, this will be review later on, please don't rebase into this one
2023-01-26 05:21:34 -05:00