bf23730281
correct the unit tests
2024-03-12 16:21:43 +01:00
11d493ba0e
remove north_america catalog for energy systems
2024-03-12 14:56:22 +01:00
1266f50e29
Correct small error in unittest
2024-02-16 06:01:54 +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
3e193f04a6
The dual_supply_capability is added to the city model structure
2024-02-01 15:41:05 -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
57c7a76529
The ep results importer for multiple buildings is completed
2023-12-06 13:53:31 -05:00
020190829f
The energy plus result importer for multiple buildings is created and tested. Currently, buildings are enriched with hourly values but monthly and yearly values are not working.
2023-12-05 19:38:11 -05:00
c3f2cfb02a
updated the idf.py
2023-12-05 13:13:19 -05:00
e3f1d52a21
Add .gitignore to exclude Python bytecode files
2023-12-05 12:47:44 -05: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
3f649fd020
finished central data model new structure for energy systems, importer and test
2023-10-13 13:31:46 -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
d29161b05e
rolled back and error introduced in a previous commit
2023-10-06 04:54:20 -04:00
a331dce966
fixed error in logic in _create_generic_systems
2023-10-06 04:14:52 -04:00
3f91da9f45
Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model
...
# Conflicts:
# hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
2023-10-06 04:13:32 -04:00
f13d7fd860
fixed error in logic in _associate_energy_systems
2023-10-06 04:11:56 -04:00
ef89da8552
created a loop for generation systems in _associate_energy_systems
2023-10-05 16:18:08 -04:00
9654bee978
modified the names and changed all singulars to plurals
2023-10-05 14:45:33 -04:00
dae117fb44
Merge remote-tracking branch 'origin/energy_plus_result_factory' into energy_plus_result_factory
2023-10-05 14:20:24 -04:00
91fa9d5ca1
modified the names and changed all singulars to plurals
2023-10-05 14:20:02 -04:00
8e145eefa1
Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model
2023-10-05 13:22:42 -04:00
6f40a15609
Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model
2023-10-05 13:22:32 -04:00
4a14deece1
Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model
2023-10-05 13:22:19 -04:00
ca48d6448b
changed all the singular names to plural and turned distribution and emission systems into lists
2023-10-05 13:18:57 -04:00
f2bfc297b3
Basic style correction and missing docstrings
2023-10-05 11:30:20 +02:00
d5c443a57b
Merge remote-tracking branch 'origin/main' into energy_system_central_data_model
2023-10-05 11:02:13 +02:00
cbda6ce13d
Tried to modify the test_systems_factory.py but received an error saying GenerationSystem object is not iterable
2023-10-04 17:07:19 -04:00
f0ad1462d0
finished the first part of the test.
2023-10-03 17:50:17 -04:00
23a8fbe86d
continued working on the importer
2023-10-03 13:07:20 -04:00
087384475f
changing from generation system to generation systemS in system importer north america
2023-10-03 09:40:32 -04:00
fac6844da1
started working on the test
2023-10-02 13:19:58 -04:00
b914c9e7bf
made final changes to north_america_custom_energy_system_parameters.py
2023-10-02 12:39:30 -04:00
eaa3064a3f
continued working on energy system importer
2023-09-28 19:19:32 -04:00
8dbbfb9460
finished creating generic generation system in the _create_generic_systems method in north_america_custom_energy_system_parameters.py
2023-09-27 17:48:23 -04:00
3809cf2885
continued the work on importer
2023-09-27 13:00:04 -04:00
8b66e20e9a
some refactoring
2023-09-27 05:35:28 -04:00
6d34e41e90
Started working on north america energy system importer.
2023-09-26 18:54:58 -04:00
4ce9f99e4d
cleaning mix-branches
2023-09-25 03:41:52 -04:00
e3c9c64e9f
Merge remote-tracking branch 'origin/Stochastic_occupancy_model' into energy_plus_result_factory
...
# Conflicts:
# .gitignore
2023-09-25 03:35:51 -04:00
sanam
12d20f2d7a
Stochastic schedule folder created
2023-09-22 09:42:10 -04:00
sanam
bf004f9e18
Stochastic schedule folder created
2023-09-21 14:33:13 -04:00
sanam
482c06e4c2
new class created
2023-09-20 11:30:41 -04:00
cb3e100fd4
I completed the generation_system.py
...
Created generic_storage_system.py, thermal_storage_system.py, and electrical_storage_system.py and added them to energy_system.py and generic_energy_system.py
2023-09-19 20:35:08 -04:00
41cf280aab
work started on generation_system.py and generic_generation_system.py
2023-09-18 15:55:50 -04:00
ee875859e8
work started on generation_system.py and generic_generation_system.py
2023-09-18 15:44:52 -04:00
73dffdc367
Merge branch 'systems_catalog_improvement' into energy_plus_result_factory
...
# Conflicts:
# .gitignore
2023-09-14 12:34:50 -04:00
b24a616d00
modified energy plus results importer test
2023-09-14 12:03:50 -04:00
707b42f2a9
modified the test checking if it only returns the hourly, monthly and yearly demands for building 12
2023-09-13 16:36:27 -04:00
cd7104206a
changed name of test file
2023-09-13 04:40:11 -04:00
f0ffc26348
tried to create a test
2023-09-12 13:16:00 -04:00
cde3bfb4ae
tried to get monthly values from the method in helpers/monthly values.
2023-09-08 11:50:20 -04:00
8f8a6dbf71
small changes in importer
2023-09-08 05:05:58 -04:00
1392c05489
results_factory.py is modified
...
The enrich method is added to energy_plus_workflow.py
The Levis_out.csv is added to test_data
2023-09-07 18:16:07 -04:00
a0d2f7e5bc
chnages were made to energy_plus_workflow.py
2023-09-06 14:55:14 -04: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
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
a3028221e3
added .gitignore to always ignore .idea
2023-08-11 10:17:02 -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
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
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
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
