Commit Graph

1854 Commits

Author SHA1 Message Date
e2c8ef0c56 Update hub/version.py 2023-08-09 16:12:41 -04:00
30908eda6d Add retrieve result test and correct lock in sqlalchemy 2023-08-09 16:12:10 -04:00
deb04cbe2d Add retrieve result test and correct lock in sqlalchemy 2023-08-09 13:52:55 -04:00
2b95173dfc starting updates in system catalog 2023-08-09 12:02:16 -04:00
7f5cde8175 starting updates in system catalog 2023-08-09 11:25:56 -04:00
bb76d05f17 Update hub/version.py 2023-08-08 13:06:34 -04:00
ca81ce3020 correct unit tests 2023-08-08 13:05:55 -04:00
3f4038286e correct setup.py 2023-08-08 12:45:19 -04:00
c4930b940f correct setup.py 2023-08-08 12:42:48 -04:00
527bf4448b overall quality improvement 2023-08-08 12:39:37 -04:00
1b3053b37f Merge remote-tracking branch 'origin/main' 2023-08-08 12:28:30 -04:00
cf3f85c7f4 overall quality improvement 2023-08-08 12:26:05 -04:00
db7caad218 Update hub/version.py 2023-08-08 12:04:32 -04:00
7fb39171f4 correct unittest 2023-08-08 12:01:21 -04:00
b7d7c9aadb Merge remote-tracking branch 'origin/main' 2023-08-08 12:01:06 -04:00
4012408e2f correct unittest 2023-08-08 12:01:00 -04:00
8502efc710 Merge pull request 'reviewing_units' (#41) from reviewing_units into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/41
2023-08-08 11:35:26 -04:00
19011d3fc1 all test passed 2023-08-08 11:25:06 -04:00
bdf0deb3b3 all test passed 2023-08-08 11:20:44 -04:00
ab81edc33d changed in data ACH to 1/s all Wh in J 2023-08-08 10:19:35 -04:00
a3bf594071 correct unittest 2023-08-08 10:10:04 -04:00
04ef636423 Merge branch 'main' into reviewing_units
# Conflicts:
#	hub/city_model_structure/building_demand/internal_zone.py
#	hub/city_model_structure/building_demand/thermal_zone.py
#	hub/exports/building_energy/insel/insel_monthly_energy_balance.py
2023-08-07 17:01:55 -04:00
d7e041b686 erased traffic folder: was not used at all
changed in data ACH to 1/s
2023-08-07 16:56:01 -04:00
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
7cf926bc5b Merge pull request 'dataframes_to_lists' (#39) from dataframes_to_lists into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/39
2023-08-07 15:39:58 -04:00
83fc351fc7 Merge branch 'main' into reviewing_hub 2023-08-07 15:12:17 -04:00
8a41c4f656 erased not needed prints 2023-08-07 14:54:48 -04:00
589f3e7f11 tested with old versions and got same results 2023-08-07 14:46:19 -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
e138a24555 Update hub/version.py 2023-08-03 12:22:57 -04:00
86845dd05f Merge remote-tracking branch 'origin/main' 2023-08-03 12:21:45 -04:00
1691ada01c Add retrieve result test and correct lock in sqlalchemy 2023-08-03 12:21:40 -04:00
4bbd65bb41 Update hub/version.py 2023-08-03 12:07:37 -04:00
9365b47dc2 Add retrieve result test and correct lock in sqlalchemy 2023-08-03 12:06:45 -04:00
7143913144 Merge remote-tracking branch 'origin/main' 2023-08-02 15:55:17 -04:00
75848ef250 Correct bd test, add dictionary for custom fuel to hub fuel 2023-08-02 15:55:11 -04:00
9f24ed8fae Update hub/version.py 2023-08-02 15:49:54 -04:00
4b5c037ffa small bug 2023-08-02 14:46:17 -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
0f982df32e Merge pull request 'retrofit_db_changes' (#38) from retrofit_db_changes into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/38
2023-08-02 14:26:14 -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
e44abc2f3a Update hub/version.py 2023-07-31 16:12:03 -04:00
421c69e97e add missing file to the setup 2023-07-31 16:11:19 -04:00
2292bff1b8 building info can now be retrieved via application, user and scenario 2023-07-31 16:08:10 -04:00
1abf76125f building info can now be retrieved via application, user and scenario 2023-07-31 12:42:02 -04:00