|
|
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 |
|
|
|
08f44fc935
|
SRA update and release changes
|
2023-05-26 11:20:10 -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 |
|
|
|
635c0162dc
|
added distribution_systems_electrical_consumption
|
2023-05-19 15:04:02 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
5a99f16bc9
|
solved 2 todos
|
2023-05-03 09:58:52 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e4b6c54af6
|
Partial correction for peakloads
|
2023-04-27 10:59:03 -04:00 |
|
|
|
844835eabd
|
Merge branch 'retrofit_project' into idf_lights
|
2023-04-18 12:23:25 -04:00 |
|
|
|
7f41e7d017
|
adding peak loads partial
|
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 |
|
|
|
a59ef0937d
|
Outputs of DHW incorporated. Values still relatively high, but consistent. Still need to incorporate adequately Cold Water Temperature
|
2023-04-17 10:12:18 -04:00 |
|
|
|
40fe325a18
|
Incorporated 1st version Domestic Hot Water, still not working.
|
2023-04-11 23:07:56 -04:00 |
|
Peter Yefi
|
a1bc4bc33e
|
Filtering out buildings with floor area less that 25 square meters
|
2023-03-29 18:22:23 -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 |
|
|
|
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 |
|
|
|
81e7d580cf
|
partial optimization
|
2023-03-17 12:54:52 -04:00 |
|
|
|
20b88fbccb
|
Custom extrusion and volume calculation for Geojson
|
2023-03-15 14:21:38 -04:00 |
|
|
|
5637f219f8
|
Correct small bug in merge city
|
2023-03-14 11:28:34 -04:00 |
|
Pilar
|
4cc9c2dcdb
|
added dhw classes to catalogs and CDM including importers
|
2023-03-13 14:40:07 -04:00 |
|
Pilar
|
ae423c51df
|
working test of percentage shared by walls
|
2023-03-09 12:18:15 -05:00 |
|
Pilar
|
d0cfa90dfe
|
Merge branch 'master' into shared_surfaces_method
|
2023-03-08 09:16:56 -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
|
0378d60100
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
|
2023-03-07 15:04:27 -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 |
|
Peter Yefi
|
c71821fd78
|
added test for global irradiance calculation
|
2023-03-01 20:36:01 -05: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
|
e04b713416
|
Merge branch 'mapping' into shared_surfaces_method
|
2023-02-23 07:04:06 -05:00 |
|
Pilar
|
776a54d7b5
|
Merge remote-tracking branch 'origin/mapping' into shared_surfaces_method
|
2023-02-23 06:57:28 -05:00 |
|
Pilar
|
b437cdf290
|
partially implemented shared walls
|
2023-02-23 06:57:14 -05:00 |
|
|
|
8a4fdc0397
|
Partial implementation neighbours detection.
|
2023-02-23 06:56:13 -05:00 |
|
Peter Yefi
|
a06eced6f4
|
Modified city merge function in city
|
2023-02-22 20:17:04 -05:00 |
|
Pilar
|
09f0c43ced
|
Merge branch 'master' into nrcan_catalog_importer
|
2023-02-22 08:36:16 -05:00 |
|
Pilar
|
f741e03d88
|
Merge remote-tracking branch 'origin/master'
|
2023-02-22 08:36:04 -05:00 |
|
Pilar
|
536a3fe414
|
added nrcan catalog
|
2023-02-22 08:31:14 -05:00 |
|
Peter Yefi
|
c3f4c27811
|
Added heat pump energy demand and fossil fuel consumption results
|
2023-02-20 18:36:34 -05:00 |
|
Pilar
|
8ca95ddde0
|
implementing shared_surfaces method. Not working
|
2023-02-20 07:30:38 -05:00 |
|
Peter Yefi
|
f4ce207284
|
Saved local changes
|
2023-02-19 14:04:11 -05:00 |
|
Pilar
|
491cee92da
|
implementing shared_surfaces method
|
2023-02-13 07:55:25 -05:00 |
|
|
|
4621ed7b1a
|
correct the path name
|
2023-02-13 06:12:07 -05:00 |
|
|
|
486a861477
|
small corrections
|
2023-02-13 05:17:25 -05:00 |
|
Pilar
|
62d0fc23fd
|
modified triangulation method
|
2023-02-10 06:09:48 -05:00 |
|
Pilar
|
074156f464
|
modified triangulation method
|
2023-02-10 05:43:04 -05:00 |
|
Pilar
|
a258d33dc9
|
modified triangulation method
|
2023-02-10 05:42:57 -05:00 |
|
Pilar
|
b61722db2e
|
cleaned some todos
|
2023-02-09 05:29:53 -05:00 |
|
|
|
22cbede8d5
|
Added the full functionality to create meb
|
2023-02-08 13:40:06 -05:00 |
|
|
|
11e8949b30
|
Added the importer for sra results
|
2023-02-07 13:01:49 -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 |
|
|
|
1b47ea64b5
|
Clean up:
Some old not implemented classes have been removed
Some pep8 improvements done too
|
2023-01-26 07:41:56 -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 |
|
