Commit Graph

125 Commits

Author SHA1 Message Date
6e79541816 Delete all __pycache__ files 2024-06-17 19:08:52 -04:00
c36ce1b83a Correct future warning 2024-05-27 18:09:40 +02:00
fe99059e5a Bugfix in montreal custom catalog 2024-04-18 07:42:19 +02:00
199d7dc4f9 bugfix in emission systems 2024-03-25 15:35:00 +01:00
27291ad1b8 bugfix in emission systems 2024-03-25 15:10:03 +01:00
11d493ba0e remove north_america catalog for energy systems 2024-03-12 14:56:22 +01:00
674393970c Merge remote-tracking branch 'origin/main' into final_energy_system_model
# Conflicts:
#	.gitignore
#	hub/city_model_structure/building.py
#	hub/exports/building_energy/idf.py
#	hub/imports/geometry_factory.py
2024-02-16 05:50:45 +01:00
8d75fe1f3a remove pychache 2024-02-16 05:38:07 +01:00
57a9d24f4c Title: Improvement of Energy System Parameters Importer
>> To make life easier for people who want to work on energy systems in future, I tried to make my code as generic as possible.
2024-02-13 20:05:03 -05:00
087fead489 Title: Finalizing the energy system data model and system factory
A new XML file named montreal_future_systems.xml is created where the elements of the file are the same as attributes of various classes. Therefore, the catalogue importer and energy system importer should have been updated accordingly. The catalog importer is organized in a general method so whenever someone wants to create a new catalogue they can use the created code as the blueprint.
2024-02-07 20:51:10 -05:00
ebaec9bb7c Title: Finalizing the energy system data model and system factory
A new XML file named montreal_future_systems.xml is created where the elements of the file are the same as attributes of various classes. Therefore, the catalogue importer and energy system importer should have been updated accordingly. The catalog importer is organized in a general method so whenever someone wants to create a new catalogue they can use the created code as the blueprint.
2024-02-07 18:54:09 -05:00
ac4742d2c4 A new attribute "dual_supply_capability" is added to NonPVGeneration class in non_pv_generation_system.py and the catalogue importer is adjusted 2024-02-01 12:24:15 -05:00
f976040f45 A new attribute "dual_supply_capability" is added to NonPVGeneration class in non_pv_generation_system.py and the catalogue importer is adjusted 2024-02-01 12:23:58 -05:00
673cbac77a added storage_medium attribute to thermal_storage_system.py to enable us use water thermodynamic characteristics in the modelling 2024-01-17 13:05:10 -05:00
11f78ccb89 added storage_medium attribute to thermal_storage_system.py to enable us use water thermodynamic characteristics in the modelling 2024-01-10 16:10:42 -05:00
1916d21c4e restore unittests after debug is completed 2024-01-09 10:32:47 +01:00
57388a9dc4 replace github nrel with cerc offline nrcan_data 2024-01-09 10:31:59 +01:00
08e701a972 Remove deprecated warning 2023-11-03 06:38:06 +01:00
9c1e05939a The city energy system importer for the north america is modified and tested. 2023-10-17 17:25:13 -04:00
978cc9d1ea added system schematics to the data folder and to the catalog importer 2023-10-16 17:48:42 -04:00
0240e89170 modified a small bug in north_america_energy_system_catalog.py 2023-10-16 17:24:39 -04:00
c6d4feec89 Modified the classes and the north amercia catalog importer based on the changes Pilar made in the data model structure 2023-10-16 16:44:53 -04:00
d94bce4174 half made changes in central data model for systems 2023-10-13 08:23:40 -04:00
1a7ad20135 new catalog model and factory finished and test passed 2023-10-12 11:59:52 -04:00
57ee3e734b finished generic system and system parts 2023-10-11 09:14:38 -04:00
84f5ebe4a0 checking a problem with lists assignation where a single value should be assigned 2023-10-10 16:22:45 -04:00
11dc02d0e8 starting point, not working 2023-10-10 05:03:31 -04:00
f2bfc297b3 Basic style correction and missing docstrings 2023-10-05 11:30:20 +02:00
c072527dc6 small changes to pv_generation_system.py 2023-08-29 14:03:30 -04:00
56c84ad399 solved bugs in adapting montreal_custom_catalog.py to new catalog data 2023-08-29 13:29:51 -04:00
a5f70f4720 erased forgotten not needed print 2023-08-29 13:12:56 -04:00
b7c2bbae96 removed last two values in generationSystems as they are not used anymore 2023-08-29 13:02:28 -04:00
8763523d3b added S to some lists, updated montreal_custom_catalog.py to new catalog classes and removed __future__ from those classes that didn't need it 2023-08-29 12:50:49 -04:00
7810f8f91d extracted storage type from abstract class 2023-08-29 12:34:04 -04:00
d4b424357d added to_dictionary to abstract class 2023-08-29 12:31:06 -04:00
8dbeeaafa1 changed some units in electrical storage 2023-08-29 12:29:11 -04:00
c77b2254f1 separated storage class in three, one abstract 2023-08-29 12:26:19 -04:00
b1d42ee00b Merge remote-tracking branch 'origin/systems_catalog_improvement' into systems_catalog_improvement
# Conflicts:
#	hub/catalog_factories/data_models/energy_systems/electrical_storage_system.py
#	hub/catalog_factories/data_models/energy_systems/energy_storage_system.py
#	hub/catalog_factories/data_models/energy_systems/thermal_storage_system.py
2023-08-29 12:25:04 -04:00
6ac63adaaf separated storage class in three, one abstract 2023-08-29 12:22:06 -04:00
644b1c9346 energy_storage_system.py is modified and inherited by thermal_storage_system.py and electrical_storage_system.py 2023-08-29 11:45:02 -04:00
24a670755a performance_curves.py is fixed
material_name is replaced with material_id in north_america_energy_system_catalog.py
The unused variables are fixed.
The code is modified to accommodate the reorganization Pilar did in generation_systems
The system.py is modified to be able to accommodate more than one distribution or emission system
2023-08-28 18:37:55 -04:00
5d4813f2f6 some changes in code to be reviewed by Saeed 2023-08-28 10:18:18 -04:00
43e5bb7310 nothing is changed 2023-08-25 10:22:46 -04:00
fe0a2d3003 north_america_energy_system_catalog.py is completed and all the bugs have been resolved. 2023-08-24 15:09:17 -04:00
3deb63b14a north_america_energy_system_catalog.py is completed
montreal_custom_catalog.py is fixed
2023-08-23 17:09:55 -04:00
9b0bdf2b7e load_generation and load_storage in north_america_energy_system_catalog.py is completed 2023-08-22 19:09:35 -04:00
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