Commit Graph

20 Commits

Author SHA1 Message Date
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
dbcab5bcb9 energy systems factory test added and solved some bugs. Not working yet 2023-05-04 10:39:23 -04:00
d4029aee10 erased non used variables 2023-05-02 14:48:51 -04:00
76ab65ea0f changed name systems to energy systems 2023-05-02 12:35:42 -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
0a96b83c22 added generic energy system classes to cdm 2023-04-28 12:24:08 -04:00
e6486bc598 Partial correction for peakloads 2023-04-27 13:31:00 -04:00
7f41e7d017 adding peak loads partial 2023-04-18 12:23:03 -04:00
88e2cb6796 introduced dhw to the meb exporter 2023-03-20 14:15:57 -04:00
4caea94271 Starting line information dictionary 2023-02-24 15:15:27 -05:00
Pilar
7092f43f32 partially implemented shared walls 2023-02-23 07:25:04 -05:00
Pilar
b437cdf290 partially implemented shared walls 2023-02-23 06:57:14 -05:00
Pilar
8ca95ddde0 implementing shared_surfaces method. Not working 2023-02-20 07:30:38 -05:00
Pilar
b61722db2e cleaned some todos 2023-02-09 05:29:53 -05:00
b85a111a11 Repair energy ade export 2023-02-07 06:16:08 -05:00
5978757348 Partial correction of persistence 2023-01-31 13:11:39 -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
9700e5ce21 packaging version 2023-01-24 10:51:50 -05:00