Commit Graph

1824 Commits

Author SHA1 Message Date
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
f495c1d27a Merge remote-tracking branch 'origin/solved_bugs_found_in_idf' 2023-09-26 10:33:41 +02:00
a43c971bbb modified working hours to give hours a month, not only total 2023-09-25 05:19:02 -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
8099037225 prints to check error 2023-09-25 03:34:57 -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
989d89df80 Merge remote-tracking branch 'origin/main' into main 2023-09-18 12:57:34 -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
aa6b3c9e74 add two todos to change name into material_name in the layer class 2023-09-14 06:42:28 +02: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
29ba43f1d9 Update function comment and remove empty function 2023-09-12 14:59:44 -04:00
70cc659c14 Add load_compressed function to city.py 2023-09-12 14:57:13 -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
2a5c552f17 added new functions to dictionaries 2023-09-06 04:40:56 -04:00
86b7378a54 Merge remote-tracking branch 'origin/main' into main 2023-09-06 04:33:49 -04:00
cf6542cb0c Update hub/version.py 2023-09-04 10:49:09 -04:00
4004ff3c84 Merge remote-tracking branch 'origin/update_documentation'
# Conflicts:
#	setup.py
2023-09-04 16:46:38 +02:00
4ae09915b1 erased not needed prints 2023-09-01 13:02:01 -04:00
9624be2cf9 solved bugs introduced with changes in thermal_zone_from_internal_zones new structure 2023-09-01 12:53:01 -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
8f1f344769 Update hub/version.py 2023-08-29 01:41:57 -04:00
6551eb6402 partial correction for persistence
IMPORTANT: This version neec top be checked for meb import as seems that the cooling and heating demand aren't imported properly.
2023-08-29 05:55:40 +02: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
cfb76a9ebd partial correction for persistence
IMPORTANT: This version neec top be checked for meb import as seems that the cooling and heating demand aren't imported properly.
2023-08-28 18:34:10 +02:00
5d4813f2f6 some changes in code to be reviewed by Saeed 2023-08-28 10:18:18 -04:00