83d308e03b
Merge branch 'main' of https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub
2024-06-27 16:25:02 +02:00
915170e60f
Bugfix: now surfaces has associated thermal boundaries after construction factory
2024-06-27 16:22:57 +02:00
6e79541816
Delete all __pycache__ files
2024-06-17 19:08:52 -04:00
b52e66c263
bugfix in heating peak load units
2024-04-15 07:13:53 +02:00
919ab60bd5
bugfix in emission systems
2024-03-25 17:27:02 +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
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
26c0ef7864
rollback change
2023-11-02 09:46:45 +01:00
3dd928574a
bug correction
2023-11-02 07:20:55 +01:00
255f9f861a
Bug correction in persistence
2023-10-31 11:37:23 +01:00
2afce4acce
Corrected obj and glb exporters, building now exposes lower and upper corner
2023-10-19 07:39:35 +02:00
9c1e05939a
The city energy system importer for the north america is modified and tested.
2023-10-17 17:25:13 -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
f865490ff9
Corrected bug in distribution_systems_electrical_consumption, but need to be confirmed with pilar
2023-10-13 09:11:03 +02:00
31a4893ed8
Corrections in persistence, distribution_systems_electrical_consumption property seems to be bugged
2023-10-13 08:57:42 +02:00
57ee3e734b
finished generic system and system parts
2023-10-11 09:14:38 -04:00
d29161b05e
rolled back and error introduced in a previous commit
2023-10-06 04:54:20 -04:00
91fa9d5ca1
modified the names and changed all singulars to plurals
2023-10-05 14:20:02 -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
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
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
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
8bd75c790f
Bug correction for building upper_corner it's no longer set to -inf
2023-09-29 05:55:36 +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
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
8099037225
prints to check error
2023-09-25 03:34:57 -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
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
9624be2cf9
solved bugs introduced with changes in thermal_zone_from_internal_zones new structure
2023-09-01 12:53:01 -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
19d05940fa
added reference-city latitude and longitude
2023-08-11 10:10:41 -04:00
ec288f8db1
rollback unwanted changes for unit test
2023-08-10 12:25:23 -04:00
30908eda6d
Add retrieve result test and correct lock in sqlalchemy
2023-08-09 16:12:10 -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
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
