Commit Graph

82 Commits

Author SHA1 Message Date
Andrea Gabaldon Moreno
0ce76bef13 20240722 changes 2024-07-22 18:14:54 -04:00
2d11bf6640 Reapply "fix: energy system catalogue and importers are modified"
This reverts commit 9adacadc2a.
2024-06-27 17:21:43 -04:00
9adacadc2a Revert "fix: energy system catalogue and importers are modified"
This reverts commit 15e43a0f35.
2024-06-27 15:33:04 -04:00
15e43a0f35 fix: energy system catalogue and importers are modified 2024-06-27 15:18:26 -04:00
b52e66c263 bugfix in heating peak load units 2024-04-15 07:13:53 +02: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
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
2afce4acce Corrected obj and glb exporters, building now exposes lower and upper corner 2023-10-19 07:39:35 +02:00
3f649fd020 finished central data model new structure for energy systems, importer and test 2023-10-13 13:31:46 -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
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
8bd75c790f Bug correction for building upper_corner it's no longer set to -inf 2023-09-29 05:55:36 +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
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
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
8a41c4f656 erased not needed prints 2023-08-07 14:54:48 -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
fe8c79d7c2 solving bugs from adding thermal_archetypes to the data model 2023-08-03 13:49:57 -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
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
f3208f1735 starting the process of changing thermal_zones generation, NOT working version 2023-07-25 11:40:47 -04:00
65f9e3e43e added thermal_zones to the building 2023-06-08 14:18:29 -04:00
8e20e747a5 Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project 2023-06-07 14:40:54 -04:00
d67c5c438b solved bug in _calculate_working_hours 2023-06-07 14:40:44 -04:00
5cc62ccabd Complete the merge cities 2023-06-07 12:55:03 -04:00
eae26f6388 Partial correction of merge function 2023-06-06 17:44:07 -04:00
d6e6d06d39 Code quality check 2023-06-06 14:31:25 -04:00
1819541a21 Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project 2023-06-05 11:53:54 -04:00
5e969986fb Refactor in building.
heating and cooling are now heating_demand and cooling_demand
2023-06-05 11:53:47 -04:00
c0a2a8a2f9 solved bug in onsite electrical production 2023-06-05 11:52:29 -04:00
1e68e3d40a Partial completion cost needs. 2023-06-02 15:05:29 -04:00
1d8a1dc275 solved bug in enumerate 2023-06-01 14:10:03 -04:00
665bf8159b Merge branch 'systems_catalog' into meb_bugs_fixing
# Conflicts:
#	hub/city_model_structure/building.py
#	hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
2023-06-01 13:55:27 -04:00
22c4f362fe solved a bug in income.py and added creation of energy systems in buildings in importer 2023-06-01 11:06:16 -04:00
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -04:00
3cdad733b3 solved problems when systems not exist 2023-05-29 15:26:21 -04:00