|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
