Commit Graph

187 Commits

Author SHA1 Message Date
5e969986fb Refactor in building.
heating and cooling are now heating_demand and cooling_demand
2023-06-05 11:53:47 -04:00
1e68e3d40a Partial completion cost needs. 2023-06-02 15:05:29 -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
11b38eaa4c modified the place where the energy systems are created 2023-06-01 13:39:29 -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
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -04:00
82b72e78c7 solved a problem with the number of storages in the calculation of ACH 2023-05-29 14:13:57 -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
183807b8e0 adapted systems importer to new catalog 2023-05-29 11:56:56 -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
ee58d21b47 solved some small errors in meb exporter 2023-05-23 17:19:50 -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
182d01123c remove warnings for opened files and remove code duplication 2023-05-19 16:01:06 -04:00
bb279c39eb separated distribution consumption in fix and variable flows 2023-05-19 12:23:06 -04:00
1c4920d0b0 Partial follow Pylint recommendation 2023-05-18 12:29:28 -04:00
84ae32bcdb Code style and logging unification 2023-05-17 17:10:30 -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
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
e48dec81cf added lod to the city_objects 2023-05-12 09:27:29 -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
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
27549e784d Merge branch 'geojson' into idf_lights 2023-05-02 14:47:26 -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
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
150614441e erased two prints, fixed a bug in geometry helper and modified name in costs archetype 2023-04-25 10:45:56 -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
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
Peter Yefi
c68baf84dc Filtering out buildings with floor area less that 25 square meters 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
d37ce01304 Changes hub to incorporate change of units in infiltration 2023-03-31 08:28:50 -04:00
Peter Yefi
a1bc4bc33e Filtering out buildings with floor area less that 25 square meters 2023-03-29 18:22:23 -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
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
f5987cfbcc solved bug in ventilation + infiltration calculation 2023-03-24 13:34:37 -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
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
9d51d4f8ba idf 2023-03-22 16:23:43 -04:00
559e56dd71 fixed the tcold bug in weather importer 2023-03-22 15:13:44 -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
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
d4fc6aa27d re-introduced shared walls = 0 for no neighbours 2023-03-20 11:40:20 -04:00
78f3921447 Merge branch 'main' into dhw
# Conflicts:
#	hub/config/configuration.ini
#	hub/helpers/configuration_helper.py
#	hub/helpers/data/hft_function_to_hub_function.py
2023-03-20 11:30:06 -04:00
9f28c2f93d added domestic hot water parameters in catalog and importers 2023-03-20 11:07:43 -04:00
2781696f95 performance improvements in city import 2023-03-17 16:32:54 -04:00
b722125c3e performance debugs 2023-03-17 16:00:28 -04:00
d979c74b8d partial; optimization 2023-03-17 13:36:43 -04:00
81e7d580cf partial optimization 2023-03-17 12:54:52 -04:00
e03fc6e1b3 export to obj completed 2023-03-17 12:45:53 -04:00
Pilar
05dcc7a4fb Merge branch 'main' into debuging_meb 2023-03-16 15:56:46 -04:00
Pilar
508513f702 changed return to continue to process the rest of the buildings 2023-03-16 15:56:24 -04:00
Pilar
ae6655fe3d added logger to inform about not calculated buildings in MEB 2023-03-16 12:19:07 -04:00
fdef2152d9 export to obj partial implementation 2023-03-16 10:51:41 -04:00
20b88fbccb Custom extrusion and volume calculation for Geojson 2023-03-15 14:21:38 -04:00
Pilar
4cc9c2dcdb added dhw classes to catalogs and CDM including importers 2023-03-13 14:40:07 -04:00
Pilar
a0e52b3e8d added shared walls to geojson. geojson importer test raises an error because the surfaces are triangulated. It should be solved when extrusion is finished 2023-03-10 15:15:18 -05:00
Pilar
44aed37ef4 Merge branch 'main' into shared_surfaces_method 2023-03-10 14:01:04 -05:00
Pilar
91e688d910 working test of percentage shared by walls 2023-03-10 14:00:51 -05:00
42a0d3887c small test correction 2023-03-10 12:13:56 -05:00
8ce25e7956 Merge remote-tracking branch 'origin/shared_surfaces_method'
# Conflicts:
#	hub/unittests/test_geometry_factory.py
2023-03-09 11:10:47 -05:00
fdb9f4d834 Correct bug in geojson naming 2023-03-08 15:29:16 -05:00
Guillermo Gutierrez Morote
50b4db4d69 Merge branch 'solving_a_bug_from_ep_workflow' into 'master'
Solving a bug from ep workflow

See merge request Guille/hub!62
2023-03-07 21:16:25 +00: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
Peter Yefi
c0c3dc4694 Updated branch with master origin 2023-03-01 20:42:23 -05:00
34172055a6 Store the meb as float 2023-02-24 15:49:40 -05:00
274c8f0f8e Correct bug in insel meb import 2023-02-24 15:33:53 -05:00
43030626ce Correct bug in insel meb import 2023-02-24 15:24:08 -05:00
Pilar
ca5bcfc93c changed strings in dictionary to cte.NAMES 2023-02-24 14:31:44 -05:00
2af1bf2e40 Merge remote-tracking branch 'origin/master' into shared_surfaces_method
# Conflicts:
#	hub/helpers/geometry_helper.py
2023-02-24 07:21:14 -05:00
e070ee5779 Merge remote-tracking branch 'origin/mapping'
# Conflicts:
#	hub/imports/geometry/citygml.py
2023-02-24 07:11:33 -05:00