Commit Graph

75 Commits

Author SHA1 Message Date
861fbc6458 modified montreal energy systems catalog 2023-05-23 10:17:26 -04:00
bb279c39eb separated distribution consumption in fix and variable flows 2023-05-19 12:23:06 -04:00
84ae32bcdb Code style and logging unification 2023-05-17 17:10:30 -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
76ab65ea0f changed name systems to energy systems 2023-05-02 12:35:42 -04:00
3bfb985c04 finished system catalog factory 2023-04-28 14:07:07 -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
7a29847132 first attempt to energy system catalog. Not working 2023-04-27 15:40:59 -04:00
4ca8975e18 remove openstreetmaps dependency 2023-04-18 12:23:03 -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
35f5544a32 Appliances test 2023-03-23 13:24:41 -04:00
9d51d4f8ba idf 2023-03-22 16:23:43 -04:00
32d23d6bdd fixed costs catalog factory 2023-03-22 16:17:08 -04:00
f3db1e5fee reviewed units in nrcan catalog and modified catalog and importer accordingly 2023-03-21 15:29:11 -04:00
Pilar
64384876a4 updating costs catalog -> not completed 2023-03-16 10:06:32 -04:00
Pilar
34477c6d8f updating costs catalog -> not completed 2023-03-13 18:23:35 -04:00
Pilar
4cc9c2dcdb added dhw classes to catalogs and CDM including importers 2023-03-13 14:40:07 -04:00
Pilar
536a3fe414 added nrcan catalog 2023-02-22 08:31:14 -05:00
Pilar
8469674b18 added nrcan catalog 2023-02-21 10:14:55 -05:00
b280949451 Add nrcan archetypes 2023-02-20 07:24:27 -05:00
Pilar
abc893ede0 erased two files that reappeared after a merge between branches with many changes 2023-02-09 04:30:38 -05:00
Pilar
37d345c185 costs catalog reformatted 2023-02-01 10:38:38 -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