568317ebf1
Merge pull request 'fixing_working_hours_problem' ( #47 ) from fixing_working_hours_problem into main
...
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/47
2023-10-05 04:40:58 -04:00
af32decf96
Merge pull request 'added_new_functions_to_dictionaries' ( #48 ) from added_new_functions_to_dictionaries into main
...
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/48
2023-10-05 04:40:19 -04: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
2b696f9251
Merge branch 'main' into feature/load_compressed_city
2023-10-04 15:12:42 -04:00
a97c068513
Add removal of decompressed pickle file
2023-10-04 15:11:35 -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
b914c9e7bf
made final changes to north_america_custom_energy_system_parameters.py
2023-10-02 12:39:30 -04:00
cf783d8998
add max height to the city in geojson when the high field is given
2023-09-29 07:54:46 +02:00
8bd75c790f
Bug correction for building upper_corner it's no longer set to -inf
2023-09-29 05:55:36 +02:00
eaa3064a3f
continued working on energy system importer
2023-09-28 19:19:32 -04:00
207058a16f
obj export improvements
2023-09-28 15:20:28 +02: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
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
aa6b3c9e74
add two todos to change name into material_name in the layer class
2023-09-14 06:42:28 +02: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
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
2f62ce3fdb
Update hub/version.py
2023-08-25 13:24:34 -04:00
58e7ce7574
Bug correction in meb
...
Now it skip the building when the archetype it's not available
2023-08-25 13:21:09 -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
ade5ef94bb
Change INSEL setup for Linux to TBD
2023-08-22 15:59:03 -04:00
ff1bb80a6c
Merge remote-tracking branch 'origin/main'
2023-08-22 10:26:29 -04:00
76d3ba8495
Update hub/version.py
2023-08-22 10:26:22 -04:00
491b976fd9
Correct error in meb (temporary workaround)
2023-08-22 10:25:40 -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
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
fa518126a5
Merge pull request 'modifications_in_location' ( #42 ) from modifications_in_location into main
...
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/42
2023-08-11 12:01:36 -04:00
e0037e788f
moved gitignore from ./hub/hub to ./hub
2023-08-11 10:25:59 -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
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
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
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
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
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
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
86845dd05f
Merge remote-tracking branch 'origin/main'
2023-08-03 12:21:45 -04:00
1691ada01c
Add retrieve result test and correct lock in sqlalchemy
2023-08-03 12:21:40 -04:00
4bbd65bb41
Update hub/version.py
2023-08-03 12:07:37 -04:00
9365b47dc2
Add retrieve result test and correct lock in sqlalchemy
2023-08-03 12:06:45 -04:00
9f24ed8fae
Update hub/version.py
2023-08-02 15:49:54 -04:00
4b5c037ffa
small bug
2023-08-02 14:46:17 -04:00
6b89008698
Merge branch 'main' into reviewing_hub
...
# Conflicts:
# hub/imports/construction/eilat_physics_parameters.py
# hub/imports/construction/nrcan_physics_parameters.py
2023-08-02 14:35:31 -04:00
0f982df32e
Merge pull request 'retrofit_db_changes' ( #38 ) from retrofit_db_changes into main
...
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/38
2023-08-02 14:26:14 -04:00
c38b025c2e
Correct bd test, add dictionary for custom fuel to hub fuel
2023-08-02 12:43:51 -04:00
4d0f247a83
cost completed
2023-08-01 16:41:37 -04:00
a147afe76f
modified thermal zones to be created in different ways depending on the user needs
2023-07-31 17:01:35 -04:00
e44abc2f3a
Update hub/version.py
2023-07-31 16:12:03 -04:00
2292bff1b8
building info can now be retrieved via application, user and scenario
2023-07-31 16:08:10 -04:00
1abf76125f
building info can now be retrieved via application, user and scenario
2023-07-31 12:42:02 -04:00
ce995c375d
Merge remote-tracking branch 'origin/main' into retrofit_db_changes
2023-07-31 12:40:29 -04:00
2cc938e416
Update hub/version.py
2023-07-31 12:22:44 -04:00
eb246a18e6
Additional changes, the db_control building info need to be changed
2023-07-28 14:55:06 -04:00
24324988b6
added dictionary from montreal fuel type to hub
2023-07-28 13:18:23 -04:00
ee419b0849
added dictionary from montreal fuel type to hub
2023-07-28 12:26:17 -04:00
f95c45660e
persistence changes
2023-07-28 08:25:47 -04:00
4add8b2cff
initial changes
2023-07-26 15:03:31 -04:00
0d63a6c4e9
Update hub/version.py
2023-07-25 12:04:41 -04:00
a3d4390a19
added surface type to construction names
2023-07-25 12:02:20 -04:00
f3208f1735
starting the process of changing thermal_zones generation, NOT working version
2023-07-25 11:40:47 -04:00
c5c298d708
Update hub/version.py
2023-07-25 09:31:24 -04:00
1ae07cc14f
Merge remote-tracking branch 'origin/main'
2023-07-25 09:29:46 -04:00
37c09df932
IDF export will not longer blindly assign the Montreal as weather file
2023-07-25 09:29:39 -04:00
92f0c81109
Update hub/version.py
2023-07-24 12:33:55 -04:00
2c7fc66423
Update hub/version.py
2023-07-21 16:12:37 -04:00
1a8dbe7f87
Merge pull request 'erased not needed print' ( #35 ) from erased_print_in_meb into main
...
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/35
2023-07-18 12:29:58 -04:00
89bfa33d1e
erased not needed print
2023-07-18 11:56:18 -04:00
6dd9fc8328
Update 'hub/version.py'
2023-07-18 11:53:01 -04:00
f8ccdf7eeb
bug None/1000 solved
2023-07-18 11:49:38 -04:00
883db8840c
Update 'hub/version.py'
2023-07-17 18:55:24 -04:00
34d2f5e8ab
Merge branch 'fixing_bugs_from_eilat_case' into errors_in_meb
2023-07-17 17:27:02 -04:00
285c819d31
rewritten thermal_openings creation to allow change in window ratio (doing it wrong previously)
2023-07-17 17:26:47 -04:00
2744f86c66
rewritten thermal_openings creation to allow change in window ratio (doing it wrong previously)
2023-07-17 17:26:28 -04:00
91f77ee477
updated RECOGNIZED_FUNTIONS_AND_USAGES.md
2023-07-17 12:36:16 -04:00
caaa51774c
changed window uvalue in eilat archetypes
2023-07-17 10:56:48 -04:00
dede8d4929
Update 'hub/version.py'
2023-07-14 12:54:55 -04:00
048f79e1ae
added two new values in dictionaries
2023-07-13 17:47:04 -04:00
2af993630a
changed units to new item in dictionaries in to_dictionary methods
2023-07-13 17:06:42 -04:00
24620d485e
added also to_dictionary to greenery catalog (Greenery catalog must be reviewed!!)
2023-07-13 17:00:33 -04:00
6ab3ee3dc3
solved some issues on units in costs catalog
2023-07-13 15:53:20 -04:00
639e5a952d
upgraded catalogs with to_dictionary method and __str__
2023-07-13 13:05:23 -04:00
c69f071958
Merge pull request 'add_data_for_quebec_and_israel' ( #30 ) from add_data_for_quebec_and_israel into main
...
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/30
2023-07-12 16:29:55 -04:00
8434bdef04
solved bug in idf
2023-07-12 16:28:14 -04:00
8be6e3b3e8
small update to eilat_archetypes.json
2023-07-12 15:55:26 -04:00
ae157a9243
added eilat construction to catalog and imports and erased unused city_to_climate_reference_city in construction_helper.py
2023-07-12 11:36:35 -04:00
5247eda305
added eilat usage to catalog and imports
2023-07-11 16:34:11 -04:00
f146cf3281
added 2 more regions to the _epw_file dictionary
2023-07-10 16:32:22 -04:00
f2201c9575
remove useless class
2023-07-10 16:11:44 -04:00
7da26947d7
Merge remote-tracking branch 'origin/main' into main
2023-07-10 15:42:28 -04:00
8839cf07c2
improve unit tests and bug fix
2023-07-10 15:03:04 -04:00
af93dbb3a1
improve unit tests and bug fix
2023-07-10 14:55:36 -04:00
46ed69ef6e
remove bag fix
2023-07-10 14:28:31 -04:00
e646f97890
correct exccluded file
2023-07-10 14:13:58 -04:00
778aa5e187
Consistence improvements and name fixing
2023-07-10 14:13:06 -04:00
06de614588
Merge remote-tracking branch 'origin/main'
2023-07-10 14:05:43 -04:00
408a32f781
Consistence improvements and name fixing
2023-07-10 14:05:38 -04:00
461d8d4ca0
Merge pull request 'Fix bug with opening pickle files from a pickle created in another operating system (for Windows and Linux only)' ( #29 ) from fix_multi_os_pickle_load_bug into main
...
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/29
2023-07-10 14:00:14 -04:00
66739bc306
Fix bug with opening pickle files from a pickle created in another operating system (for Windows and Linux only)
2023-07-07 22:16:55 -04:00
bca68f33ff
solved a bug assigning the energy systems to the buildings
2023-07-07 15:31:32 -04:00
f39c1deff4
Update 'hub/version.py'
2023-07-07 14:36:02 -04:00
1acdebd6e7
Merge remote-tracking branch 'origin/main'
2023-07-07 14:33:41 -04:00
1ee5fd9dc5
Bug in geojson import
2023-07-07 14:33:34 -04:00
db2687f75f
changed name for a more clear understanding
2023-07-07 13:55:19 -04:00
93c867558a
modified ground_temperature name due to an overwriting of year in month
2023-07-07 11:57:24 -04:00
1d3293a55f
Update 'hub/version.py'
2023-06-13 12:50:56 -04:00
fbdd4e369e
Bug fixing in associate energy systems
2023-06-13 12:48:46 -04:00
d11c67615c
Update 'hub/version.py'
2023-06-09 13:42:23 -04:00
5dcead4e5d
bug in function reading, expecting str and getting int
2023-06-09 13:36:21 -04:00
e07156ac30
Merge remote-tracking branch 'origin/main' into main
2023-06-09 13:12:12 -04:00
