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
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
eaa3064a3f
continued working on energy system importer
2023-09-28 19:19:32 -04: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
a43c971bbb
modified working hours to give hours a month, not only total
2023-09-25 05:19:02 -04:00
73dffdc367
Merge branch 'systems_catalog_improvement' into energy_plus_result_factory
...
# Conflicts:
# .gitignore
2023-09-14 12:34:50 -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
9624be2cf9
solved bugs introduced with changes in thermal_zone_from_internal_zones new structure
2023-09-01 12:53:01 -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
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
ff1bb80a6c
Merge remote-tracking branch 'origin/main'
2023-08-22 10:26:29 -04:00
491b976fd9
Correct error in meb (temporary workaround)
2023-08-22 10:25:40 -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
32a40f17a6
fixing pv problem
2023-08-16 16:28:20 -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
deb04cbe2d
Add retrieve result test and correct lock in sqlalchemy
2023-08-09 13:52:55 -04:00
cf3f85c7f4
overall quality improvement
2023-08-08 12:26:05 -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
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
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
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
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
ce995c375d
Merge remote-tracking branch 'origin/main' into retrofit_db_changes
2023-07-31 12:40:29 -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
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
2744f86c66
rewritten thermal_openings creation to allow change in window ratio (doing it wrong previously)
2023-07-17 17:26:28 -04:00
048f79e1ae
added two new values in dictionaries
2023-07-13 17:47:04 -04:00
6ab3ee3dc3
solved some issues on units in costs catalog
2023-07-13 15:53:20 -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
bca68f33ff
solved a bug assigning the energy systems to the buildings
2023-07-07 15:31:32 -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
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
db1d2362c8
bug in idf.py and added uuid to building_name in geojson importer
2023-06-09 13:12:00 -04:00
23cb327e1b
Bug fixing in associate energy systems
2023-06-09 12:31:01 -04:00
08df06dc2e
Bug fixing in remove_city_object method
2023-06-09 11:21:45 -04:00
357e9f4a7e
add weather region_codes
2023-06-07 15:27:38 -04:00
d6e6d06d39
Code quality check
2023-06-06 14:31:25 -04:00
ff642a2c0c
Correct the weather factory and remove useless files
2023-06-06 13:32:37 -04:00
5e969986fb
Refactor in building.
...
heating and cooling are now heating_demand and cooling_demand
2023-06-05 11:53:47 -04:00
1e68e3d40a
Partial completion cost needs.
2023-06-02 15:05:29 -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
11b38eaa4c
modified the place where the energy systems are created
2023-06-01 13:39:29 -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
82b72e78c7
solved a problem with the number of storages in the calculation of ACH
2023-05-29 14:13:57 -04:00
a431ee9d1e
Merge branch 'retrofit_project' into systems_catalog
2023-05-29 12:18:09 -04:00
e704143333
Merge branch 'retrofit_project' into systems_catalog
...
# Conflicts:
# hub/city_model_structure/building_demand/surface.py
# hub/exports/building_energy/idf.py
# hub/imports/results/simplified_radiosity_algorithm.py
2023-05-29 12:16:29 -04:00
183807b8e0
adapted systems importer to new catalog
2023-05-29 11:56:56 -04:00
04bf3bbef3
Hub now create a list of aliases instead of one
2023-05-26 18:21:35 -04:00
d650a713c4
Correct unittests
2023-05-26 12:01:54 -04:00
ee58d21b47
solved some small errors in meb exporter
2023-05-23 17:19:50 -04:00
5a7427e457
add todo for heat pum corrections
...
Keep because most likely we are going to delete this one.
2023-05-23 11:07:10 -04:00
182d01123c
remove warnings for opened files and remove code duplication
2023-05-19 16:01:06 -04:00
bb279c39eb
separated distribution consumption in fix and variable flows
2023-05-19 12:23:06 -04:00
1c4920d0b0
Partial follow Pylint recommendation
2023-05-18 12:29:28 -04:00
84ae32bcdb
Code style and logging unification
2023-05-17 17:10:30 -04:00
126b25a119
Structure refactor
2023-05-17 12:30:11 -04:00
a33bf0b366
Partial completion of new persistence.
...
Results are still missing and need to be added to the final commit. including the db table creation that seems to be missing
2023-05-16 18:06:22 -04:00
f08d332c5b
Merge branch 'main' into systems_catalog
2023-05-15 11:04:23 -04:00
d8386d179d
energy systems importer finished
...
energy systems workflow defined in the unittest
2023-05-15 11:03:54 -04:00
e48dec81cf
added lod to the city_objects
2023-05-12 09:27:29 -04:00
604e6d5eb2
Merge remote-tracking branch 'origin/geojson'
2023-05-04 13:46:27 -04:00
a41896cfbe
Delete unused files from test_data
...
Bug fixing in geojson
Verify unit tests
2023-05-04 13:45:34 -04:00
