Commit Graph

309 Commits

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