Commit Graph

270 Commits

Author SHA1 Message Date
9c1e05939a The city energy system importer for the north america is modified and tested. 2023-10-17 17:25:13 -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
31a4893ed8 Corrections in persistence, distribution_systems_electrical_consumption property seems to be bugged 2023-10-13 08:57:42 +02:00
1a7ad20135 new catalog model and factory finished and test passed 2023-10-12 11:59:52 -04:00
84f5ebe4a0 checking a problem with lists assignation where a single value should be assigned 2023-10-10 16:22:45 -04:00
6b24a59178 Add exports for cesium tileset and glb format 2023-10-10 11:16:26 +02: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
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
dae117fb44 Merge remote-tracking branch 'origin/energy_plus_result_factory' into energy_plus_result_factory 2023-10-05 14:20:24 -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
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
f0ad1462d0 finished the first part of the test. 2023-10-03 17:50:17 -04:00
fac6844da1 started working on the test 2023-10-02 13:19:58 -04:00
207058a16f obj export improvements 2023-09-28 15:20:28 +02:00
8b66e20e9a some refactoring 2023-09-27 05:35:28 -04: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
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
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
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
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
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
16618fb54a started north america energy system catalog importer. NOT WORKING 2023-08-15 16:27:05 -04:00
2b95173dfc starting updates in system catalog 2023-08-09 12:02:16 -04:00
ca81ce3020 correct unit tests 2023-08-08 13:05:55 -04:00
7fb39171f4 correct unittest 2023-08-08 12:01:21 -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
19011d3fc1 all test passed 2023-08-08 11:25:06 -04:00
bdf0deb3b3 all test passed 2023-08-08 11:20:44 -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
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
9365b47dc2 Add retrieve result test and correct lock in sqlalchemy 2023-08-03 12:06:45 -04:00
75848ef250 Correct bd test, add dictionary for custom fuel to hub fuel 2023-08-02 15:55:11 -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
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
2292bff1b8 building info can now be retrieved via application, user and scenario 2023-07-31 16:08:10 -04:00
eb246a18e6 Additional changes, the db_control building info need to be changed 2023-07-28 14:55:06 -04:00
f95c45660e persistence changes 2023-07-28 08:25:47 -04:00
4add8b2cff initial changes 2023-07-26 15:03:31 -04:00
5afb60e7c4 Partially correct unit-test 2023-07-25 16:14:52 -04:00
35e50cf551 Partially correct unit-test 2023-07-25 16:00:14 -04:00
066a25bfee Partially correct unit-test 2023-07-25 15:36:49 -04:00
f3208f1735 starting the process of changing thermal_zones generation, NOT working version 2023-07-25 11:40:47 -04:00
a8c961f7bc Correct trimesh dependency 2023-07-24 12:33:24 -04:00
6ab3ee3dc3 solved some issues on units in costs catalog 2023-07-13 15:53:20 -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
3818bf5595 correct typo 2023-07-10 15:05:34 -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
408a32f781 Consistence improvements and name fixing 2023-07-10 14:05:38 -04:00
0d05960102 no comments 2023-06-13 16:19:51 -04:00
08df06dc2e Bug fixing in remove_city_object method 2023-06-09 11:21:45 -04:00
4e22bfec4a Merge remote-tracking branch 'origin/main' 2023-06-08 11:16:10 -04:00
745c8f9080 add weather region_codes 2023-06-08 11:16:04 -04:00
4e382f0633 updated systems catalog test 2023-06-08 09:58:57 -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
ff642a2c0c Correct the weather factory and remove useless files 2023-06-06 13:32:37 -04:00
8d3d1ac427 Homogenize unit tests and remove useless files 2023-06-05 13:42:15 -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
c6b986ad1b Add custom_insel_block parameter to insel MEB and add unit test 2023-06-02 18:48:55 -04:00
1e68e3d40a Partial completion cost needs. 2023-06-02 15:05:29 -04:00
dab931cadb Partial correction of hub 2023-06-02 10:25:34 -04:00
891b660824 Refactor and code quality improvements 2023-05-30 17:13:49 -04:00
d4056c4fb8 Review overall code quality and refactor tests folders 2021-08-30 11:38:28 -04:00
62bca29a82 Quality improvements 2021-08-27 12:51:30 -04:00
c8bdc0fb0f Partial implementation for idf schedule import (doe_idf) 2021-08-25 07:23:02 -04:00
11982a35bd Correct unit tests 2021-08-11 10:29:54 -04:00
Pilar
e5cc627ce4 just changed pilar_monsalvete@yahoo.es with pilar.monsalvete@concordia.ca 2021-06-10 08:29:24 -04:00
Pilar
0218ea470d added the option in obj and stl to get the geometry from gml or pickle 2021-06-09 10:47:46 -04:00
c1c0f598da Reorganize the citygml classes 2021-06-04 09:22:06 -04:00
Pilar
f8a65b6057 Changes in libs to new concept of keywords in libraries. Added new tests. 2021-05-27 17:20:06 -04:00