072d2a6d9d
modifications done to the xml file and north_america_energy_system_catalog.py
2023-08-21 17:41:12 -04:00
72b5ff1040
north_america_components.xml is modified
...
The montreal_custom_catalog.py is modified
2023-08-18 18:22:10 -04:00
e20a700deb
emission_system.py is rolled back to original
...
performance_curves.py is imported in generation_system.py
The order of arguments in pv_generation_system.py is fixed
Modulation range is replaced with maximum and minimum heat output in generation_system.py
maximum,minimum, and nominal cooling output are also added to generation_system.py
2023-08-17 18:48:48 -04:00
0528aa0718
started to work on systems
2023-08-16 20:07:24 -04:00
923b1fe267
generation components are all added to north_america_energy_system_catalog.py
...
pv_generation_system.py is modified
Tools4CitiesESMF.xml is modified
2023-08-16 19:33:18 -04:00
32a40f17a6
fixing pv problem
2023-08-16 16:28:20 -04:00
e91e61741e
add generation and config
2023-08-16 15:58:49 -04:00
16618fb54a
started north america energy system catalog importer. NOT WORKING
2023-08-15 16:27:05 -04:00
21ca1e1e28
modified energy_storage_system.py and energy_system_catalog.py generation_system.py
...
The xml data is modified
2023-08-15 14:49:17 -04:00
ccdc7a454d
small changes to performance_curves.py and distribution_system.py
...
created the montreal_custom_catalog_new.py
uploaded my xml file
2023-08-14 20:26:37 -04:00
3feecac15d
cogeneration ratio was removed from generation_system.py
...
pv_generation_system.py is completed by adding an inheritance from the GenerationSystem class
parameter_function.py is renamed to performance_curves.py and an attribute to get the list of target parameters is added to it
system.py is modified by adding energy storage, performance curves, pv to it
2023-08-14 20:00:17 -04:00
acd7ad2266
distribution_system.py is modified
2023-08-13 22:53:43 -04:00
6ce82c52de
Class parameter_function.py is created
2023-08-13 21:17:03 -04:00
d6ee3d6e6b
All the attributes related to the material and insulation of the tank are substituted with one attribute called "layers"
2023-08-13 20:44:14 -04:00
231e4a17f2
All the attributes related to the material and insulation of the tank are substituted with one attribute called "layers"
2023-08-13 20:43:05 -04:00
012076492f
Merge remote-tracking branch 'origin/systems_catalog_improvement' into systems_catalog_improvement
2023-08-13 10:27:00 -04:00
61d4c012dc
Renamed the electricity_generation_system.py to pv_generation_system.py and modified the heating_generation_system to generation_system.py to account for all the generation systems.
2023-08-13 10:26:36 -04:00
1b3a128f33
added .gitignore to always ignore .idea
2023-08-11 10:18:33 -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
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
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
