Commit Graph

446 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
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
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
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
ce995c375d Merge remote-tracking branch 'origin/main' into retrofit_db_changes 2023-07-31 12:40:29 -04:00
2cc938e416 Update hub/version.py 2023-07-31 12:22:44 -04:00
eb246a18e6 Additional changes, the db_control building info need to be changed 2023-07-28 14:55:06 -04:00
24324988b6 added dictionary from montreal fuel type to hub 2023-07-28 13:18:23 -04:00
ee419b0849 added dictionary from montreal fuel type to hub 2023-07-28 12:26:17 -04:00
f95c45660e persistence changes 2023-07-28 08:25:47 -04:00
4add8b2cff initial changes 2023-07-26 15:03:31 -04:00
0d63a6c4e9 Update hub/version.py 2023-07-25 12:04:41 -04:00
a3d4390a19 added surface type to construction names 2023-07-25 12:02:20 -04:00
f3208f1735 starting the process of changing thermal_zones generation, NOT working version 2023-07-25 11:40:47 -04:00
c5c298d708 Update hub/version.py 2023-07-25 09:31:24 -04:00
1ae07cc14f Merge remote-tracking branch 'origin/main' 2023-07-25 09:29:46 -04:00
37c09df932 IDF export will not longer blindly assign the Montreal as weather file 2023-07-25 09:29:39 -04:00
92f0c81109 Update hub/version.py 2023-07-24 12:33:55 -04:00
2c7fc66423 Update hub/version.py 2023-07-21 16:12:37 -04:00
1a8dbe7f87 Merge pull request 'erased not needed print' (#35) from erased_print_in_meb into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/35
2023-07-18 12:29:58 -04:00
89bfa33d1e erased not needed print 2023-07-18 11:56:18 -04:00
6dd9fc8328 Update 'hub/version.py' 2023-07-18 11:53:01 -04:00
f8ccdf7eeb bug None/1000 solved 2023-07-18 11:49:38 -04:00
883db8840c Update 'hub/version.py' 2023-07-17 18:55:24 -04:00
34d2f5e8ab Merge branch 'fixing_bugs_from_eilat_case' into errors_in_meb 2023-07-17 17:27:02 -04:00
285c819d31 rewritten thermal_openings creation to allow change in window ratio (doing it wrong previously) 2023-07-17 17:26:47 -04:00
2744f86c66 rewritten thermal_openings creation to allow change in window ratio (doing it wrong previously) 2023-07-17 17:26:28 -04:00
91f77ee477 updated RECOGNIZED_FUNTIONS_AND_USAGES.md 2023-07-17 12:36:16 -04:00
caaa51774c changed window uvalue in eilat archetypes 2023-07-17 10:56:48 -04:00
dede8d4929 Update 'hub/version.py' 2023-07-14 12:54:55 -04:00
048f79e1ae added two new values in dictionaries 2023-07-13 17:47:04 -04:00