Commit Graph

171 Commits

Author SHA1 Message Date
90a196465a Merge pull request 'reviewing_hub' (#40) from reviewing_hub into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/40
2023-08-07 15:48:25 -04:00
83fc351fc7 Merge branch 'main' into reviewing_hub 2023-08-07 15:12:17 -04:00
67cd435fd5 all tests passed 2023-08-07 12:32:33 -04:00
1e9afa28a8 all tests passed 2023-08-03 17:00:59 -04:00
212b4b0621 solving bugs from adding thermal_archetypes to the data model 2023-08-03 14:51:54 -04:00
fe8c79d7c2 solving bugs from adding thermal_archetypes to the data model 2023-08-03 13:49:57 -04:00
9365b47dc2 Add retrieve result test and correct lock in sqlalchemy 2023-08-03 12:06:45 -04:00
75848ef250 Correct bd test, add dictionary for custom fuel to hub fuel 2023-08-02 15:55:11 -04:00
6b89008698 Merge branch 'main' into reviewing_hub
# Conflicts:
#	hub/imports/construction/eilat_physics_parameters.py
#	hub/imports/construction/nrcan_physics_parameters.py
2023-08-02 14:35:31 -04:00
c38b025c2e Correct bd test, add dictionary for custom fuel to hub fuel 2023-08-02 12:43:51 -04:00
4d0f247a83 cost completed 2023-08-01 16:41:37 -04:00
a147afe76f modified thermal zones to be created in different ways depending on the user needs 2023-07-31 17:01:35 -04:00
2292bff1b8 building info can now be retrieved via application, user and scenario 2023-07-31 16:08:10 -04:00
eb246a18e6 Additional changes, the db_control building info need to be changed 2023-07-28 14:55:06 -04:00
f95c45660e persistence changes 2023-07-28 08:25:47 -04:00
4add8b2cff initial changes 2023-07-26 15:03:31 -04:00
5afb60e7c4 Partially correct unit-test 2023-07-25 16:14:52 -04:00
35e50cf551 Partially correct unit-test 2023-07-25 16:00:14 -04:00
066a25bfee Partially correct unit-test 2023-07-25 15:36:49 -04:00
f3208f1735 starting the process of changing thermal_zones generation, NOT working version 2023-07-25 11:40:47 -04:00
a8c961f7bc Correct trimesh dependency 2023-07-24 12:33:24 -04:00
6ab3ee3dc3 solved some issues on units in costs catalog 2023-07-13 15:53:20 -04:00
ae157a9243 added eilat construction to catalog and imports and erased unused city_to_climate_reference_city in construction_helper.py 2023-07-12 11:36:35 -04:00
3818bf5595 correct typo 2023-07-10 15:05:34 -04:00
8839cf07c2 improve unit tests and bug fix 2023-07-10 15:03:04 -04:00
af93dbb3a1 improve unit tests and bug fix 2023-07-10 14:55:36 -04:00
408a32f781 Consistence improvements and name fixing 2023-07-10 14:05:38 -04:00
0d05960102 no comments 2023-06-13 16:19:51 -04:00
08df06dc2e Bug fixing in remove_city_object method 2023-06-09 11:21:45 -04:00
4e22bfec4a Merge remote-tracking branch 'origin/main' 2023-06-08 11:16:10 -04:00
745c8f9080 add weather region_codes 2023-06-08 11:16:04 -04:00
4e382f0633 updated systems catalog test 2023-06-08 09:58:57 -04:00
5cc62ccabd Complete the merge cities 2023-06-07 12:55:03 -04:00
eae26f6388 Partial correction of merge function 2023-06-06 17:44:07 -04:00
ff642a2c0c Correct the weather factory and remove useless files 2023-06-06 13:32:37 -04:00
8d3d1ac427 Homogenize unit tests and remove useless files 2023-06-05 13:42:15 -04:00
1819541a21 Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project 2023-06-05 11:53:54 -04:00
5e969986fb Refactor in building.
heating and cooling are now heating_demand and cooling_demand
2023-06-05 11:53:47 -04:00
c0a2a8a2f9 solved bug in onsite electrical production 2023-06-05 11:52:29 -04:00
c6b986ad1b Add custom_insel_block parameter to insel MEB and add unit test 2023-06-02 18:48:55 -04:00
1e68e3d40a Partial completion cost needs. 2023-06-02 15:05:29 -04:00
dab931cadb Partial correction of hub 2023-06-02 10:25:34 -04:00
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -04:00
d4056c4fb8 Review overall code quality and refactor tests folders 2021-08-30 11:38:28 -04:00
62bca29a82 Quality improvements 2021-08-27 12:51:30 -04:00
c8bdc0fb0f Partial implementation for idf schedule import (doe_idf) 2021-08-25 07:23:02 -04:00
11982a35bd Correct unit tests 2021-08-11 10:29:54 -04:00
Pilar
e5cc627ce4 just changed pilar_monsalvete@yahoo.es with pilar.monsalvete@concordia.ca 2021-06-10 08:29:24 -04:00
Pilar
0218ea470d added the option in obj and stl to get the geometry from gml or pickle 2021-06-09 10:47:46 -04:00
c1c0f598da Reorganize the citygml classes 2021-06-04 09:22:06 -04:00