Commit Graph

1745 Commits

Author SHA1 Message Date
e0037e788f moved gitignore from ./hub/hub to ./hub 2023-08-11 10:25:59 -04:00
e08080c601 added .gitignore to always ignore .idea 2023-08-11 10:21:08 -04:00
1b3a128f33 added .gitignore to always ignore .idea 2023-08-11 10:18:33 -04:00
a3028221e3 added .gitignore to always ignore .idea 2023-08-11 10:17:02 -04:00
19d05940fa added reference-city latitude and longitude 2023-08-11 10:10:41 -04:00
fde6f0f751 Few modifications were mafe to heat_generation_system.py and electricity_generation_system.py classes.
A new class named energy_storage_system.py is created to represent different possible energy storage systems in energy systems.
2023-08-10 20:55:35 -04:00
fdead81f26 Update hub/version.py 2023-08-10 12:26:29 -04:00
db0e400343 Merge remote-tracking branch 'origin/main' 2023-08-10 12:25:30 -04:00
ec288f8db1 rollback unwanted changes for unit test 2023-08-10 12:25:23 -04:00
b746387133 Update hub/version.py 2023-08-10 11:32:17 -04:00
480acc6552 rollback unwanted changes for unit test 2023-08-10 11:31:48 -04:00
7c29405f21 Add missing values to reference city to climate zone and to montreal functions 2023-08-10 11:30:59 -04:00
sanam
e1ca39950f new directory created 2023-08-10 11:25:40 -04:00
sanam
02a03b8239 new directory created 2023-08-10 11:23:23 -04:00
d564218531 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	hub/helpers/data/montreal_function_to_hub_function.py
#	hub/imports/construction/helpers/construction_helper.py
2023-08-10 11:03:09 -04:00
ebb712ebaf Add missing values to reference city to climate zone and to montreal functions 2023-08-10 11:01:37 -04:00
sanam
9094c286c4 new branch created 2023-08-10 10:07:14 -04:00
9034c3375e The generation_system.py is renamed to heat_generation_system.py and the attributes and decorators are modified to encapsulate all the needed attributes for boilers and heat pumps.
Another class named electricity_generation_system.py is created to add the attributes and decorators of PV, inverter, and maybe wind turbines in future. The system.py is also modified accordingly
2023-08-09 19:32:01 -04:00
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