|
|
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 |
|
|
|
37554a7318
|
erasing idea
|
2023-05-03 11:52:25 -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 |
|
|
|
5a99f16bc9
|
solved 2 todos
|
2023-05-03 09:58:52 -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 |
|
|
|
bcc2f2fd3a
|
Merge remote-tracking branch 'origin/idf_lights' into idf_lights
|
2023-05-02 17:08:20 -04:00 |
|
|
|
d4029aee10
|
erased non used variables
|
2023-05-02 14:48:51 -04:00 |
|
|
|
27549e784d
|
Merge branch 'geojson' into idf_lights
|
2023-05-02 14:47:26 -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 |
|
|
|
9ecf59c68f
|
rolled back some changes and hardcoded values
|
2023-05-02 14:39:37 -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 |
|
|
|
492795f1a2
|
added new functions to access chapter and item by name in costs catalog
|
2023-04-28 14:37:23 -04:00 |
|
|
|
8eb9bad87e
|
erased two prints, fixed a bug in geometry helper and modified name in costs archetype
|
2023-04-28 14:37:23 -04:00 |
|
|
|
c91edc8a83
|
changed hardcoded path to relative path in costs catalog factory
|
2023-04-28 14:37:22 -04:00 |
|
|
|
cef35a7e02
|
changed hardcoded path to relative path in costs catalog
|
2023-04-28 14:37:22 -04:00 |
|
|
|
995bf52c1b
|
added dictionary to access montreal custom costs catalog
|
2023-04-28 14:37:22 -04:00 |
|
|
|
bf2ee82465
|
added dictionary to access montreal custom costs catalog
|
2023-04-28 14:37:22 -04:00 |
|
|
|
d5196fc54f
|
bug dividing by 0 in nrcan_usage_parameters.py solved
|
2023-04-28 14:14:18 -04:00 |
|
|
|
3bfb985c04
|
finished system catalog factory
|
2023-04-28 14:07:07 -04:00 |
|
|
|
0a96b83c22
|
added generic energy system classes to cdm
|
2023-04-28 12:24:08 -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 |
|
|
|
53aa540b45
|
some modifications in parameters after technical discussion
|
2023-04-27 16:21:17 -04:00 |
|
|
|
7a29847132
|
first attempt to energy system catalog. Not working
|
2023-04-27 15:40:59 -04:00 |
|
|
|
2650dccf57
|
Merge branch 'main' into systems_catalog
|
2023-04-27 14:28:22 -04:00 |
|
|
|
e6486bc598
|
Partial correction for peakloads
|
2023-04-27 13:31:00 -04:00 |
|
