|
|
8c3e9a2f95
|
solved a bug in parasitic_energy_consumption
|
2023-05-29 15:09:47 -04:00 |
|
|
|
82b72e78c7
|
solved a problem with the number of storages in the calculation of ACH
|
2023-05-29 14:13:57 -04:00 |
|
|
|
fd215d9ae9
|
erased merge methods and tests
|
2023-05-29 12:49:27 -04:00 |
|
|
|
a431ee9d1e
|
Merge branch 'retrofit_project' into systems_catalog
|
2023-05-29 12:18:09 -04:00 |
|
|
|
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 |
|
|
|
aaa87d79c6
|
Partial completion cost needs.
|
2023-05-29 11:59:45 -04:00 |
|
|
|
183807b8e0
|
adapted systems importer to new catalog
|
2023-05-29 11:56:56 -04:00 |
|
|
|
061952eb17
|
Add roof area to the persistence
|
2023-05-29 11:13:49 -04:00 |
|
|
|
04bf3bbef3
|
Hub now create a list of aliases instead of one
|
2023-05-26 18:21:35 -04:00 |
|
|
|
d650a713c4
|
Correct unittests
|
2023-05-26 12:01:54 -04:00 |
|
|
|
08f44fc935
|
SRA update and release changes
|
2023-05-26 11:20:10 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e6486bc598
|
Partial correction for peakloads
|
2023-04-27 13:31:00 -04:00 |
|
|
|
7c0e03d0e0
|
Merge remote-tracking branch 'origin/geojson' into geojson
|
2023-04-27 10:59:08 -04:00 |
|
|
|
e4b6c54af6
|
Partial correction for peakloads
|
2023-04-27 10:59:03 -04:00 |
|
|
|
2dfe8254d1
|
added new functions to access chapter and item by name in costs catalog
|
2023-04-25 11:48:24 -04:00 |
|
|
|
150614441e
|
erased two prints, fixed a bug in geometry helper and modified name in costs archetype
|
2023-04-25 10:45:56 -04:00 |
|
|
|
3d6699f71f
|
changed hardcoded path to relative path in costs catalog factory
|
2023-04-25 10:27:27 -04:00 |
|
|
|
4ab741ee12
|
changed hardcoded path to relative path in costs catalog
|
2023-04-25 10:23:37 -04:00 |
|
|
|
a3f0478558
|
Merge remote-tracking branch 'origin/geojson' into geojson
|
2023-04-25 10:00:18 -04:00 |
|
|
|
745c1e6843
|
added dictionary to access montreal custom costs catalog
|
2023-04-25 10:00:07 -04:00 |
|
|
|
354923b378
|
added dictionary to access montreal custom costs catalog
|
2023-04-25 09:59:52 -04:00 |
|
|
|
78b21093bb
|
DHW bug solved. It had to do with the factor of the building surface. Now getting good results
|
2023-04-25 08:24:56 -04:00 |
|
|
|
b60be9c39e
|
Create Linux documentation and add INSEL to Windows documentation
|
2023-04-24 15:42:07 -04:00 |
|
|
|
ac96b0467b
|
Update Windows documentation for new version of PyCharm and gitea
|
2023-04-24 14:14:14 -04:00 |
|
|
|
3ccda97830
|
Add redundancy to improve wall detections
|
2023-04-22 09:33:06 -04:00 |
|
|
|
a25215adb8
|
correct shared walls
|
2023-04-21 12:57:13 -04:00 |
|
|
|
86892332e3
|
correct shared walls
|
2023-04-21 12:56:32 -04:00 |
|
|
|
0f8816a053
|
correct shared walls
|
2023-04-21 12:48:50 -04:00 |
|
|
|
e978d56320
|
correct idf generation for shared walls
|
2023-04-21 10:31:55 -04:00 |
|
|
|
bb121512c3
|
Add utf-8 encoding when reading cities15000 file
|
2023-04-18 17:55:27 -04:00 |
|
|
|
dc6bfb3403
|
correct idf generation for shared walls
|
2023-04-18 16:47:36 -04:00 |
|
|
|
90c40f5e55
|
add shared surfaces to idf
|
2023-04-18 15:45:09 -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 |
|
|
|
af0e2a7c69
|
add name field to geojson
|
2023-04-18 12:23:03 -04:00 |
|
|
|
4ca8975e18
|
remove openstreetmaps dependency
|
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 |
|
|
|
251f5a8582
|
version 0.1.7.11
|
2023-04-18 12:21:59 -04:00 |
|
|
|
ed13f21470
|
Correct cerc-hub installer to include dependencies
|
2023-04-18 12:21:59 -04:00 |
|
Peter Yefi
|
99b6860694
|
included stream logger. switched from default file logger to stream
|
2023-04-17 17:59:34 -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 |
|
|
|
fe7f44d51f
|
Fully functional Domestic Hot Water. Pending validation of results
|
2023-04-12 13:52:55 -04:00 |
|
|
|
f62df2e873
|
dhw schedule fix attempt
|
2023-04-12 10:16:14 -04:00 |
|
|
|
89faa92103
|
dhw schedule fix attempt
|
2023-04-12 09:35:27 -04:00 |
|
|
|
40fe325a18
|
Incorporated 1st version Domestic Hot Water, still not working.
|
2023-04-11 23:07:56 -04:00 |
|
|
|
29e700c212
|
add name field to geojson
|
2023-04-06 13:26:29 -04:00 |
|
|
|
6de00c0331
|
Change of minimal.idf to include monthly summary of data to be able to compare with MEP.
Commenting the EP-Workflow to solve the error given by the output reader. To be solved with Koa
|
2023-04-04 17:59:20 -04:00 |
|
|
|
bc0c1fc0f3
|
Revision of infiltration parameters
|
2023-03-31 12:25:13 -04:00 |
|
|
|
d37ce01304
|
Changes hub to incorporate change of units in infiltration
|
2023-03-31 08:28:50 -04:00 |
|
|
|
73c8839814
|
Merge pull request 'Filtering out buildings with floor area less that 25 square meters' (#20) from hp_results into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/20
|
2023-03-30 13:23:40 -04:00 |
|
Peter Yefi
|
a1bc4bc33e
|
Filtering out buildings with floor area less that 25 square meters
|
2023-03-29 18:22:23 -04:00 |
|
|
|
1947b1ec37
|
version 0.1.7.11
|
2023-03-28 10:48:49 -04:00 |
|
|
|
86de5a33ca
|
Correct cerc-hub installer to include dependencies
|
2023-03-28 10:41:29 -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 |
|
|
|
7a9032b0dc
|
Small refactor.
Now energy plus don't raise and unexpected error when some exports aren't performed.
|
2023-03-27 16:28:17 -04:00 |
|
|
|
dde1c796f7
|
Merge pull request 'test_correction' (#18) from test_correction into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/18
|
2023-03-27 13:56:55 -04:00 |
|
|
|
47d9d9d775
|
Correct all the unit tests
|
2023-03-27 13:55:32 -04:00 |
|
|
|
0a8c1c3c42
|
Ensure year of construction field is always an int
|
2023-03-27 12:37:31 -04:00 |
|
|
|
26951d2458
|
Remove un used variable
|
2023-03-27 11:40:39 -04:00 |
|
|
|
27005e20c9
|
Correct missing information
|
2023-03-27 11:39:45 -04:00 |
|
|
|
9ed8fc61e2
|
Changes in idf.
|
2023-03-27 11:25:43 -04:00 |
|
|
|
f5987cfbcc
|
solved bug in ventilation + infiltration calculation
|
2023-03-24 13:34:37 -04:00 |
|
|
|
f48d5214f4
|
Changes idf to incorporate multifloor
|
2023-03-24 12:15:10 -04:00 |
|
|
|
de80850367
|
Merge pull request 'debugging_peak_demands' (#14) from debugging_peak_demands into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/14
|
2023-03-24 10:57:07 -04:00 |
|
|
|
5cad95ea0c
|
Merge pull request 'updated usages in dictionary to reduce not recognized archetypes' (#16) from fixing_errors_found_Koas_logs into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/16
|
2023-03-24 10:56:47 -04:00 |
|
|
|
5a5f9f0ef0
|
Merge pull request 'Usage fzk hous in exoport idf' (#15) from my_test into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/15
|
2023-03-24 10:55:27 -04:00 |
|
|
|
0a35acc62f
|
erased print
|
2023-03-24 10:35:26 -04:00 |
|
|
|
2d840a6e49
|
added yearly value to ground temperature variable
|
2023-03-24 10:33:59 -04:00 |
|
|
|
f8b33fa5bf
|
Small improvement in idf export for lighting
|
2023-03-24 09:33:09 -04:00 |
|
|
|
812d8d06d2
|
Schedule appliances added
First trial of adding factor to change from multizone to unizone. Commented.
|
2023-03-24 08:10:47 -04:00 |
|
|
|
4082a20638
|
updated usages in dictionary to reduce not recognized archetypes
|
2023-03-23 16:55:09 -04:00 |
|
|
|
b9c1e4f071
|
Remove run from test
|
2023-03-23 15:59:23 -04:00 |
|
|
|
5096fe3bab
|
Usage fzk hous in exoport idf
|
2023-03-23 15:47:31 -04:00 |
|
|
|
ac7fca738a
|
Usage fzk hous in exoport idf
|
2023-03-23 15:38:38 -04:00 |
|
|
|
1cc72119c9
|
added dhw and electrical demand to results importer and sanity check to importer
|
2023-03-23 13:49:05 -04:00 |
|
|
|
50ec57f04f
|
Correct IDF
|
2023-03-23 13:43:03 -04:00 |
|
|
|
b918dfcabd
|
added dhw and electrical demand to results importer and sanity check to importer
|
2023-03-23 13:33:25 -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 |
|
|
|
559e56dd71
|
fixed the tcold bug in weather importer
|
2023-03-22 15:13:44 -04:00 |
|
|
|
81a59d4246
|
Delete 'hub/unittests/tests_outputs/New_York_sra_SW.out'
|
2023-03-22 14:26:40 -04:00 |
|
|
|
0b06b67810
|
delete
|
2023-03-22 14:26:29 -04:00 |
|
|
|
a3bbe76147
|
Merge pull request 'meb_debugging' (#11) from meb_debugging into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/11
|
2023-03-22 10:37:44 -04:00 |
|
|
|
28dd0f8b0f
|
fixed the tcold bug
|
2023-03-21 16:11:58 -04:00 |
|
|
|
f3db1e5fee
|
reviewed units in nrcan catalog and modified catalog and importer accordingly
|
2023-03-21 15:29:11 -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 |
|
|
|
ff55b502a6
|
Merge branch 'main' into hp_results
|
2023-03-20 16:55:45 -04:00 |
|
|
|
88e2cb6796
|
introduced dhw to the meb exporter
|
2023-03-20 14:15:57 -04:00 |
|
|
|
bb10d888c3
|
re-introduced shared walls = 0 for no neighbours
|
2023-03-20 11:41:43 -04:00 |
|
|
|
d4fc6aa27d
|
re-introduced shared walls = 0 for no neighbours
|
2023-03-20 11:40:20 -04:00 |
|
|
|
6bbc300730
|
erased not needed max_location_distance_for_shared_walls in configuration
|
2023-03-20 11:39:41 -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 |
|
|
|
aa0952969f
|
solved bug in typing
|
2023-03-20 10:07:31 -04:00 |
|
|
|
6a402485c5
|
test
|
2023-03-20 09:59:48 -04:00 |
|
|
|
b61d84763a
|
test
|
2023-03-20 09:52:40 -04:00 |
|
|
|
2781696f95
|
performance improvements in city import
|
2023-03-17 16:32:54 -04:00 |
|
|
|
b722125c3e
|
performance debugs
|
2023-03-17 16:00:28 -04:00 |
|
|
|
4b3ce016b2
|
remove jit
|
2023-03-17 13:40:14 -04:00 |
|
|
|
d979c74b8d
|
partial; optimization
|
2023-03-17 13:36:43 -04:00 |
|
|
|
1f6b3e2d8a
|
Correct unit tests
|
2023-03-17 12:56:47 -04:00 |
|
|
|
81e7d580cf
|
partial optimization
|
2023-03-17 12:54:52 -04:00 |
|
|
|
e03fc6e1b3
|
export to obj completed
|
2023-03-17 12:45:53 -04:00 |
|
Pilar
|
1b90974b77
|
some refactoring to keep our naming agreement
|
2023-03-17 10:10:30 -04:00 |
|
Pilar
|
05dcc7a4fb
|
Merge branch 'main' into debuging_meb
|
2023-03-16 15:56:46 -04:00 |
|
Pilar
|
508513f702
|
changed return to continue to process the rest of the buildings
|
2023-03-16 15:56:24 -04:00 |
|
Pilar
|
d672eee762
|
changed percentage to per one (-)
|
2023-03-16 12:24:09 -04:00 |
|
Pilar
|
ae6655fe3d
|
added logger to inform about not calculated buildings in MEB
|
2023-03-16 12:19:07 -04:00 |
|
|
|
89254891b8
|
Merge pull request 'shared_surfaces_method' (#5) from shared_surfaces_method into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/5
|
2023-03-16 12:04:19 -04:00 |
|
|
|
6ea41b1c85
|
export to obj completed
|
2023-03-16 12:03:23 -04:00 |
|
Pilar
|
df7038df80
|
usage = retail in nrcan bug solved
added default value to swr in sra exporter for those buildings without construction known
|
2023-03-16 11:43:13 -04:00 |
|
|
|
725e7a098f
|
Fix hub logger
|
2023-03-16 11:27:46 -04:00 |
|
|
|
fdef2152d9
|
export to obj partial implementation
|
2023-03-16 10:51:41 -04:00 |
|
Pilar
|
64384876a4
|
updating costs catalog -> not completed
|
2023-03-16 10:06:32 -04:00 |
|
|
|
20b88fbccb
|
Custom extrusion and volume calculation for Geojson
|
2023-03-15 14:21:38 -04:00 |
|
|
|
f0a07d9c0e
|
Reintroduce debug information in the geometry_helper
|
2023-03-15 11:30:25 -04:00 |
|
|
|
9a7bc6644c
|
Merge branch 'main' into shared_surfaces_method
|
2023-03-14 12:32:26 -04:00 |
|
|
|
cdfda7a475
|
version 0.1.7.10
|
2023-03-14 11:41:00 -04:00 |
|
|
|
5637f219f8
|
Correct small bug in merge city
|
2023-03-14 11:28:34 -04:00 |
|
Pilar
|
24a77d2c5b
|
Merge branch 'main' into costs_catalog
|
2023-03-13 18:24:03 -04:00 |
|
Pilar
|
34477c6d8f
|
updating costs catalog -> not completed
|
2023-03-13 18:23:35 -04:00 |
|
Peter Yefi
|
f7276d8c41
|
Added w2w output file
|
2023-03-13 17:30:30 -04:00 |
|
Peter Yefi
|
0d3d4a3ab9
|
Rounded global irradiance values. Removed tear down in water to water
|
2023-03-13 17:24:44 -04:00 |
|
|
|
658c44389e
|
Version 0.1.7.9
|
2023-03-13 15:02:28 -04:00 |
|
|
|
ecb09edcfb
|
Reintroduce function in business logic
|
2023-03-13 15:01:55 -04:00 |
|
|
|
a3a382dae9
|
Reintroduce function in business logic
|
2023-03-13 14:41:25 -04:00 |
|
Pilar
|
4cc9c2dcdb
|
added dhw classes to catalogs and CDM including importers
|
2023-03-13 14:40:07 -04:00 |
|
|
|
fc25c12149
|
Partial correction of persistence business logic
|
2023-03-13 14:18:04 -04:00 |
|
Pilar
|
a0e52b3e8d
|
added shared walls to geojson. geojson importer test raises an error because the surfaces are triangulated. It should be solved when extrusion is finished
|
2023-03-10 15:15:18 -05:00 |
|
Pilar
|
d198ac9141
|
Merge branch 'main' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
|
2023-03-10 14:15:29 -05:00 |
|
Pilar
|
10acb712f1
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
|
2023-03-10 14:14:09 -05:00 |
|
Pilar
|
77743fea1c
|
rolling back changes
|
2023-03-10 14:09:41 -05:00 |
|
Pilar
|
2ac1fd045b
|
Merge remote-tracking branch 'origin/main' into main
|
2023-03-10 14:07:24 -05:00 |
|
|
|
591107f8cf
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
# hub/unittests/test_geometry_factory.py
|
2023-03-10 14:05:53 -05:00 |
|
|
|
0ed6c2d935
|
Partial correction of persistence business logic
|
2023-03-10 14:04:00 -05:00 |
|
Pilar
|
44aed37ef4
|
Merge branch 'main' into shared_surfaces_method
|
2023-03-10 14:01:04 -05:00 |
|
Pilar
|
91e688d910
|
working test of percentage shared by walls
|
2023-03-10 14:00:51 -05:00 |
|
Pilar
|
ac0c4ea186
|
Merge remote-tracking branch 'origin/main' into main
|
2023-03-10 13:59:39 -05:00 |
|
|
|
7092e75a52
|
small test correction remove deprecated db_export calls
|
2023-03-10 12:22:28 -05:00 |
|
|
|
42a0d3887c
|
small test correction
|
2023-03-10 12:13:56 -05:00 |
|
Pilar
|
28914a7402
|
working test of percentage shared by walls
|
2023-03-09 12:40:45 -05:00 |
|
Pilar
|
a72e0d11fd
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into main
# Conflicts:
# hub/helpers/geometry_helper.py
|
2023-03-09 12:38:52 -05:00 |
|
Pilar
|
ae423c51df
|
working test of percentage shared by walls
|
2023-03-09 12:18:15 -05:00 |
|
|
|
53ae043d63
|
optimize imports
|
2023-03-09 11:11:34 -05:00 |
|
|
|
8ce25e7956
|
Merge remote-tracking branch 'origin/shared_surfaces_method'
# Conflicts:
# hub/unittests/test_geometry_factory.py
|
2023-03-09 11:10:47 -05:00 |
|
|
|
fdb9f4d834
|
Correct bug in geojson naming
|
2023-03-08 15:29:16 -05:00 |
|
|
|
bfc3f84c09
|
Complete neighbours detection (with shared lines)
|
2023-03-08 14:25:11 -05:00 |
|
|
|
fc2add511a
|
Complete neighbours detection (with shared lines)
|
2023-03-08 14:24:48 -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
|
63b17e74b5
|
erased parameters of nomass materials in energyplus exporter not needed
|
2023-03-07 15:56:26 -05: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 |
|
|
|
35ed9050e6
|
Merge remote-tracking branch 'origin/master'
|
2023-03-06 17:03:55 -05:00 |
|
|
|
3b23e9ffd4
|
Skip if unknown
|
2023-03-06 17:03:47 -05:00 |
|
Peter Yefi
|
9b12e3589b
|
Added exporters for simulation results
|
2023-03-03 17:19:36 -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 |
|
|
|
3a7dccff8c
|
Set usage to unknown if it cannot be determined.
|
2023-02-24 16:33:42 -05:00 |
|
|
|
3d883fc068
|
Skip buildings that doesn't have internal zone in the MEB export
|
2023-02-24 16:02:34 -05:00 |
|
|
|
34172055a6
|
Store the meb as float
|
2023-02-24 15:49:40 -05:00 |
|
|
|
cc26a8004b
|
Change FUNTION_UT to CODE_UTILI
|
2023-02-24 15:36:20 -05:00 |
|
|
|
274c8f0f8e
|
Correct bug in insel meb import
|
2023-02-24 15:33:53 -05:00 |
|
|
|
43030626ce
|
Correct bug in insel meb import
|
2023-02-24 15:24:08 -05:00 |
|
|
|
4caea94271
|
Starting line information dictionary
|
2023-02-24 15:15:27 -05:00 |
|
Pilar
|
ca5bcfc93c
|
changed strings in dictionary to cte.NAMES
|
2023-02-24 14:31:44 -05:00 |
|
|
|
70c0dba6bd
|
Starting line information dictionary
|
2023-02-24 07:39:08 -05:00 |
|
|
|
2af1bf2e40
|
Merge remote-tracking branch 'origin/master' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
|
2023-02-24 07:21:14 -05:00 |
|
|
|
def1bd221f
|
Clean mapping test
|
2023-02-24 07:19:01 -05:00 |
|
|
|
e070ee5779
|
Merge remote-tracking branch 'origin/mapping'
# Conflicts:
# hub/imports/geometry/citygml.py
|
2023-02-24 07:11:33 -05:00 |
|
|
|
48fbeb488f
|
Neighbours mapping completed.
|
2023-02-24 07:10:13 -05:00 |
|
|
|
a8d0d0e6ba
|
Change string values for codes in montreal dictionary
|
2023-02-24 06:31:28 -05:00 |
|
Pilar
|
49d178faa3
|
Merge branch 'master' into bug_in_nrcan_construction_importer
|
2023-02-23 15:46:02 -05:00 |
|
Pilar
|
6f58f22638
|
a bug in citygml importer. 'yearOfConstruction' not recognized
|
2023-02-23 15:45:50 -05:00 |
|
|
|
511361b70b
|
Correct bug in citygml year_of_construction field default value
|
2023-02-23 15:40:09 -05:00 |
|
|
|
c5110585c7
|
untested neighbours detection implemented.
|
2023-02-23 15:35:13 -05:00 |
|
Pilar
|
66f0e4e32b
|
a bug in nrcan importer
|
2023-02-23 15:26:34 -05:00 |
|
Pilar
|
7092f43f32
|
partially implemented shared walls
|
2023-02-23 07:25:04 -05:00 |
|
|
|
143e48bb7b
|
Partial implementation neighbours detection.
|
2023-02-23 07:24:36 -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
|
0ab96ec226
|
Completed changes for new models
|
2023-02-22 22:45:33 -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
|
ee495bf41a
|
added nrcan catalog
|
2023-02-22 08:35:45 -05: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 |
|
|
|
7dbfdf188a
|
Version 0.1.7.8
|
2023-02-21 10:04:02 -05:00 |
|
|
|
018c3d24a5
|
Bug fix in user info
|
2023-02-21 10:03:37 -05:00 |
|
|
|
30dbea0edc
|
varsion 0.1.7.7
|
2023-02-21 09:42:26 -05:00 |
|
|
|
f10830dce2
|
Merge remote-tracking branch 'origin/master'
|
2023-02-21 09:41:37 -05:00 |
|
|
|
580ff5c63c
|
user_login method and bug fix
- Now the geojson missing functions will not crah
- Now a user can login directly with application_uuid, user and password
|
2023-02-21 09:41:26 -05:00 |
|
Guillermo Gutierrez Morote
|
c348fb0134
|
Merge branch 'hp_results' into 'master'
Hp results
See merge request Guille/hub!56
|
2023-02-21 04:38:47 +00:00 |
|
KoaCWells
|
9209cf624a
|
Fix import/export user factories, update repository/user.py for proper StartSession API call, fix setup.py
|
2023-02-20 22:12:01 -05:00 |
|
Peter Yefi
|
c3f4c27811
|
Added heat pump energy demand and fossil fuel consumption results
|
2023-02-20 18:36:34 -05:00 |
|
Pilar
|
bdc8598bc6
|
Merge remote-tracking branch 'origin/master'
|
2023-02-20 07:30:54 -05:00 |
|
Pilar
|
8ca95ddde0
|
implementing shared_surfaces method. Not working
|
2023-02-20 07:30:38 -05:00 |
|
|
|
b280949451
|
Add nrcan archetypes
|
2023-02-20 07:24:27 -05:00 |
|
Peter Yefi
|
f4ce207284
|
Saved local changes
|
2023-02-19 14:04:11 -05:00 |
|
Peter Yefi
|
bf10ba82a6
|
Saved local changes
|
2023-02-19 13:57:24 -05:00 |
|
Pilar
|
491cee92da
|
implementing shared_surfaces method
|
2023-02-13 07:55:25 -05:00 |
|
|
|
9f579bf93a
|
version 0.1.7.6
|
2023-02-13 07:02:26 -05:00 |
|
Pilar
|
ef659b3798
|
modified meb exporter to accept mire than 200 surfaces
|
2023-02-13 06:49:55 -05:00 |
|
|
|
4621ed7b1a
|
correct the path name
|
2023-02-13 06:12:07 -05:00 |
|
|
|
ce29d35af9
|
Merge remote-tracking branch 'origin/master'
|
2023-02-13 06:11:42 -05:00 |
|
Pilar
|
85e445ae96
|
modified meb exporter to accept mire than 200 surfaces
|
2023-02-13 06:08:55 -05:00 |
|
|
|
486a861477
|
small corrections
|
2023-02-13 05:17:25 -05:00 |
|
Pilar
|
8876d1eafa
|
Merge branch 'master' into changing_triangulate
|
2023-02-10 06:20:39 -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 |
|
Pilar
|
e66bac33ae
|
Merge branch 'master' into more_errors_from_merge
|
2023-02-09 04:31:13 -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 |
|
|
|
5ae78e7c00
|
version 0.1.7.5
|
2023-02-08 13:46:11 -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 |
|
|
|
d91b6edfff
|
Add lod1
|
2023-02-07 07:40:28 -05:00 |
|
|
|
aa4b7829e4
|
Repair energy ade export
|
2023-02-07 07:20:36 -05:00 |
|
|
|
b85a111a11
|
Repair energy ade export
|
2023-02-07 06:16:08 -05:00 |
|
|
|
19fc822147
|
Small bug correction in the new dictionary structure
|
2023-02-06 06:50:58 -05:00 |
|
|
|
09bfe71d4d
|
Refactor in the dictionaries helper.
Now the dictionaries are wrapped into classes to easier maintenance
Added alkis dictionary skeleton
Added montreal dictionary
|
2023-02-06 06:29:21 -05:00 |
|
|
|
fb534c6b8f
|
Release 0.1.7.4
|
2023-02-03 04:57:49 -05:00 |
|
|
|
7bafbba240
|
remove unwanted print
|
2023-02-02 13:01:56 -05:00 |
|
|
|
16adfaa1a8
|
Full implementation of basic persistence tasks for the one_shot admin tool.
|
2023-02-02 13:00:58 -05:00 |
|
|
|
a34206e6ff
|
Persistence up and running with small fix
|
2023-02-02 07:14:41 -05:00 |
|
|
|
f99b8497ff
|
Persistence up and running with basic app applicartion
|
2023-02-02 06:12:24 -05:00 |
|
|
|
d6c3f3ef67
|
Merge remote-tracking branch 'origin/master'
|
2023-02-01 10:56:33 -05:00 |
|
Pilar
|
37d345c185
|
costs catalog reformatted
|
2023-02-01 10:38:38 -05:00 |
|
|
|
30bd7678fc
|
Preliminary version of persistence ready for testing
|
2023-02-01 07:29:06 -05:00 |
|
|
|
672b9874f2
|
Persistence refactory
|
2023-02-01 06:05:12 -05:00 |
|
|
|
5978757348
|
Partial correction of persistence
|
2023-01-31 13:11:39 -05:00 |
|
|
|
2c2fc025eb
|
Correct error in db table creation (user_applications)
|
2023-01-30 07:01:05 -05:00 |
|
|
|
17f8223023
|
Add basic application handling to the persistence
|
2023-01-30 06:49:08 -05:00 |
|
|
|
ba011d9517
|
Delete construction_helpers.py
|
2023-01-30 11:42:31 +00:00 |
|
Pilar
|
d9be11eb92
|
Merge remote-tracking branch 'origin/master'
|
2023-01-27 10:35:25 -05:00 |
|
Pilar
|
4980fa8c95
|
erased not used classes
|
2023-01-27 10:34:28 -05:00 |
|
|
|
2823e6a1fc
|
update deployment documentation
|
2023-01-27 05:26:44 -05:00 |
|
Pilar
|
3e46da13d4
|
erased not used classes
|
2023-01-26 09:02:22 -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 |
|
|
|
4e0b17d7ee
|
Correct the mistakes during the merge.
Now everithing should work as expected.
One minor improvement in the error function for the factories.
|
2023-01-26 06:35:55 -05:00 |
|
|
|
ff4fef17fb
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hub/catalog_factories/construction_catalog_factory.py
# hub/imports/construction_factory.py
# hub/imports/usage_factory.py
|
2023-01-26 05:23:22 -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 |
|
Peter Yefi
|
d04906306e
|
Included checks for import handlers and types
|
2023-01-25 19:13:00 -05:00 |
|
|
|
ec9878eaf8
|
Remove unwanted print
|
2023-01-25 06:39:03 -05:00 |
|
|
|
b4b75b5e12
|
Small correction in unittests
|
2023-01-25 06:38:08 -05:00 |
|
|
|
9700e5ce21
|
packaging version
|
2023-01-24 10:51:50 -05:00 |
|
