|
30908eda6d
|
Add retrieve result test and correct lock in sqlalchemy
|
2023-08-09 16:12:10 -04:00 |
|
|
deb04cbe2d
|
Add retrieve result test and correct lock in sqlalchemy
|
2023-08-09 13:52:55 -04:00 |
|
|
7f5cde8175
|
starting updates in system catalog
|
2023-08-09 11:25:56 -04:00 |
|
|
bb76d05f17
|
Update hub/version.py
|
2023-08-08 13:06:34 -04:00 |
|
|
527bf4448b
|
overall quality improvement
|
2023-08-08 12:39:37 -04:00 |
|
|
1b3053b37f
|
Merge remote-tracking branch 'origin/main'
|
2023-08-08 12:28:30 -04:00 |
|
|
cf3f85c7f4
|
overall quality improvement
|
2023-08-08 12:26:05 -04:00 |
|
|
db7caad218
|
Update hub/version.py
|
2023-08-08 12:04:32 -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 |
|
|
83fc351fc7
|
Merge branch 'main' into reviewing_hub
|
2023-08-07 15:12:17 -04:00 |
|
|
8a41c4f656
|
erased not needed prints
|
2023-08-07 14:54:48 -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 |
|
|
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 |
|
|
e138a24555
|
Update hub/version.py
|
2023-08-03 12:22:57 -04:00 |
|
|
86845dd05f
|
Merge remote-tracking branch 'origin/main'
|
2023-08-03 12:21:45 -04:00 |
|
|
1691ada01c
|
Add retrieve result test and correct lock in sqlalchemy
|
2023-08-03 12:21:40 -04:00 |
|
|
4bbd65bb41
|
Update hub/version.py
|
2023-08-03 12:07:37 -04:00 |
|
|
9365b47dc2
|
Add retrieve result test and correct lock in sqlalchemy
|
2023-08-03 12:06:45 -04:00 |
|
|
9f24ed8fae
|
Update hub/version.py
|
2023-08-02 15:49:54 -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 |
|
|
0f982df32e
|
Merge pull request 'retrofit_db_changes' (#38) from retrofit_db_changes into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/38
|
2023-08-02 14:26:14 -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 |
|
|
e44abc2f3a
|
Update hub/version.py
|
2023-07-31 16:12:03 -04:00 |
|
|
2292bff1b8
|
building info can now be retrieved via application, user and scenario
|
2023-07-31 16:08:10 -04:00 |
|
|
1abf76125f
|
building info can now be retrieved via application, user and scenario
|
2023-07-31 12:42:02 -04:00 |
|
|
ce995c375d
|
Merge remote-tracking branch 'origin/main' into retrofit_db_changes
|
2023-07-31 12:40:29 -04:00 |
|
|
2cc938e416
|
Update hub/version.py
|
2023-07-31 12:22:44 -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 |
|
|
f95c45660e
|
persistence changes
|
2023-07-28 08:25:47 -04:00 |
|
|
4add8b2cff
|
initial changes
|
2023-07-26 15:03:31 -04:00 |
|
|
0d63a6c4e9
|
Update hub/version.py
|
2023-07-25 12:04:41 -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 |
|
|
c5c298d708
|
Update hub/version.py
|
2023-07-25 09:31:24 -04:00 |
|
|
1ae07cc14f
|
Merge remote-tracking branch 'origin/main'
|
2023-07-25 09:29:46 -04:00 |
|
|
37c09df932
|
IDF export will not longer blindly assign the Montreal as weather file
|
2023-07-25 09:29:39 -04:00 |
|
|
92f0c81109
|
Update hub/version.py
|
2023-07-24 12:33:55 -04:00 |
|
|
2c7fc66423
|
Update hub/version.py
|
2023-07-21 16:12:37 -04:00 |
|
|
1a8dbe7f87
|
Merge pull request 'erased not needed print' (#35) from erased_print_in_meb into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/35
|
2023-07-18 12:29:58 -04:00 |
|
|
89bfa33d1e
|
erased not needed print
|
2023-07-18 11:56:18 -04:00 |
|
|
6dd9fc8328
|
Update 'hub/version.py'
|
2023-07-18 11:53:01 -04:00 |
|
|
f8ccdf7eeb
|
bug None/1000 solved
|
2023-07-18 11:49:38 -04:00 |
|
|
883db8840c
|
Update 'hub/version.py'
|
2023-07-17 18:55:24 -04:00 |
|
|
34d2f5e8ab
|
Merge branch 'fixing_bugs_from_eilat_case' into errors_in_meb
|
2023-07-17 17:27:02 -04:00 |
|
|
285c819d31
|
rewritten thermal_openings creation to allow change in window ratio (doing it wrong previously)
|
2023-07-17 17:26: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 |
|
|
91f77ee477
|
updated RECOGNIZED_FUNTIONS_AND_USAGES.md
|
2023-07-17 12:36:16 -04:00 |
|
|
caaa51774c
|
changed window uvalue in eilat archetypes
|
2023-07-17 10:56:48 -04:00 |
|
|
dede8d4929
|
Update 'hub/version.py'
|
2023-07-14 12:54:55 -04:00 |
|
|
048f79e1ae
|
added two new values in dictionaries
|
2023-07-13 17:47:04 -04:00 |
|
|
2af993630a
|
changed units to new item in dictionaries in to_dictionary methods
|
2023-07-13 17:06:42 -04:00 |
|
|
24620d485e
|
added also to_dictionary to greenery catalog (Greenery catalog must be reviewed!!)
|
2023-07-13 17:00:33 -04:00 |
|
|
6ab3ee3dc3
|
solved some issues on units in costs catalog
|
2023-07-13 15:53:20 -04:00 |
|
|
639e5a952d
|
upgraded catalogs with to_dictionary method and __str__
|
2023-07-13 13:05:23 -04:00 |
|
|
c69f071958
|
Merge pull request 'add_data_for_quebec_and_israel' (#30) from add_data_for_quebec_and_israel into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/30
|
2023-07-12 16:29:55 -04:00 |
|
|
8434bdef04
|
solved bug in idf
|
2023-07-12 16:28:14 -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 |
|
|
f2201c9575
|
remove useless class
|
2023-07-10 16:11:44 -04:00 |
|
|
7da26947d7
|
Merge remote-tracking branch 'origin/main' into main
|
2023-07-10 15:42:28 -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 |
|
|
46ed69ef6e
|
remove bag fix
|
2023-07-10 14:28:31 -04:00 |
|
|
e646f97890
|
correct exccluded file
|
2023-07-10 14:13:58 -04:00 |
|
|
778aa5e187
|
Consistence improvements and name fixing
|
2023-07-10 14:13:06 -04:00 |
|
|
06de614588
|
Merge remote-tracking branch 'origin/main'
|
2023-07-10 14:05:43 -04:00 |
|
|
408a32f781
|
Consistence improvements and name fixing
|
2023-07-10 14:05:38 -04:00 |
|
|
461d8d4ca0
|
Merge pull request 'Fix bug with opening pickle files from a pickle created in another operating system (for Windows and Linux only)' (#29) from fix_multi_os_pickle_load_bug into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/29
|
2023-07-10 14:00:14 -04:00 |
|
|
66739bc306
|
Fix bug with opening pickle files from a pickle created in another operating system (for Windows and Linux only)
|
2023-07-07 22:16:55 -04:00 |
|
|
bca68f33ff
|
solved a bug assigning the energy systems to the buildings
|
2023-07-07 15:31:32 -04:00 |
|
|
f39c1deff4
|
Update 'hub/version.py'
|
2023-07-07 14:36:02 -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 |
|
|
1d3293a55f
|
Update 'hub/version.py'
|
2023-06-13 12:50:56 -04:00 |
|
|
fbdd4e369e
|
Bug fixing in associate energy systems
|
2023-06-13 12:48:46 -04:00 |
|
|
d11c67615c
|
Update 'hub/version.py'
|
2023-06-09 13:42:23 -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 |
|
|
0989aadbf4
|
Update 'hub/version.py'
|
2023-06-09 12:31:33 -04:00 |
|
|
23cb327e1b
|
Bug fixing in associate energy systems
|
2023-06-09 12:31:01 -04:00 |
|
|
7eafd33b33
|
Update 'hub/version.py'
|
2023-06-09 11:28:41 -04:00 |
|
|
0c7d428aa6
|
Merge remote-tracking branch 'origin/some_improvements_in_city_model'
|
2023-06-09 11:22:18 -04:00 |
|
|
08df06dc2e
|
Bug fixing in remove_city_object method
|
2023-06-09 11:21:45 -04:00 |
|
|
65f9e3e43e
|
added thermal_zones to the building
|
2023-06-08 14:18:29 -04:00 |
|
|
e14bc5c2bd
|
Update 'hub/version.py'
|
2023-06-08 11:20:17 -04:00 |
|
|
e0f11b7c02
|
Merge branch 'main' into retrofit_project
|
2023-06-08 09:30:25 -04:00 |
|
|
38bda1920d
|
Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project
|
2023-06-08 09:30:04 -04:00 |
|
|
56fae48277
|
Changed systems xml file to include new systems without cooling
|
2023-06-07 16:17:46 -04:00 |
|
|
357e9f4a7e
|
add weather region_codes
|
2023-06-07 15:27:38 -04:00 |
|
|
ea00266626
|
Merge pull request 'retrofit_project' (#25) from retrofit_project into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/25
|
2023-06-07 14:50:00 -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 |
|
|
00a1313235
|
Update 'hub/version.py'
|
2023-06-07 13:19:48 -04:00 |
|
|
5cc62ccabd
|
Complete the merge cities
|
2023-06-07 12:55:03 -04:00 |
|
|
c6852e5af6
|
Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project
|
2023-06-07 09:50:50 -04:00 |
|
|
502e1e8279
|
added system for refurbishment to catalog
|
2023-06-07 09:48:45 -04:00 |
|
|
4d8e41b4a3
|
Add canadian weather file as default
|
2023-06-07 07:58:18 -04:00 |
|
|
eae26f6388
|
Partial correction of merge function
|
2023-06-06 17:44:07 -04:00 |
|
|
bd23185ca3
|
Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project
|
2023-06-06 16:09:44 -04:00 |
|
|
4ccf16411c
|
solved feature in idf generator
|
2023-06-06 16:09:33 -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 |
|
|
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 |
|
|
21b1eef3d3
|
Merge branch 'main' into retrofit_project
|
2023-06-02 13:18:41 -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 |
|
|
03a1744f87
|
Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog
|
2023-06-01 13:39:49 -04:00 |
|
|
11b38eaa4c
|
modified the place where the energy systems are created
|
2023-06-01 13:39:29 -04:00 |
|
|
d3f35038ec
|
Change xml to solve mistake in cooling system
|
2023-06-01 11:52:57 -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 |
|
|
0956f40e42
|
Bug correction and code quality improvements
|
2023-05-31 16:55:44 -04:00 |
|
|
3e9060c6a7
|
Update 'hub/version.py'
|
2023-05-31 13:56:22 -04:00 |
|
|
11ba482e73
|
correct bug
|
2023-05-31 13:53:22 -04:00 |
|
|
6809a4fca3
|
update pylintrc and correct setup.py
|
2023-05-31 13:51:35 -04:00 |
|
|
813f2f6738
|
Changes in subsidy structure
|
2023-05-31 12:26:02 -04:00 |
|
|
30ca0ade38
|
Bug in gas costs solved. xml file
|
2023-05-31 11:23:24 -04:00 |
|
|
eeb75c101f
|
update pylintrc and correct setup.py
|
2023-05-31 11:04:41 -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 |
|
|
8c3e9a2f95
|
solved a bug in parasitic_energy_consumption
|
2023-05-29 15:09:47 -04:00 |
|
|
82b72e78c7
|
solved a problem with the number of storages in the calculation of ACH
|
2023-05-29 14:13:57 -04:00 |
|
|
fd215d9ae9
|
erased merge methods and tests
|
2023-05-29 12:49:27 -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 |
|
|
aaa87d79c6
|
Partial completion cost needs.
|
2023-05-29 11:59:45 -04:00 |
|
|
183807b8e0
|
adapted systems importer to new catalog
|
2023-05-29 11:56:56 -04:00 |
|
|
061952eb17
|
Add roof area to the persistence
|
2023-05-29 11:13:49 -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 |
|
|
08f44fc935
|
SRA update and release changes
|
2023-05-26 11:20:10 -04:00 |
|
|
dcb5cb4134
|
Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog
# Conflicts:
# hub/data/energy_systems/montreal_custom_systems.xml
|
2023-05-23 17:20:30 -04:00 |
|
|
ee58d21b47
|
solved some small errors in meb exporter
|
2023-05-23 17:19:50 -04:00 |
|
|
fc61c5db5f
|
Changes in structure of xml to include systems and subsystems
|
2023-05-23 14:49:29 -04:00 |
|
|
9f00208cbb
|
Complete the persistence update
test_save_result will be failing till systems are completed.
|
2023-05-23 14:36:48 -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 |
|
|
d432373156
|
Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog
# Conflicts:
# hub/data/energy_systems/montreal_custom_systems.xml
|
2023-05-23 10:19:01 -04:00 |
|
|
48c408b110
|
solved bug in ventilation in idf exporter
|
2023-05-23 10:18:01 -04:00 |
|
|
861fbc6458
|
modified montreal energy systems catalog
|
2023-05-23 10:17:26 -04:00 |
|
|
c77c03b759
|
Incorporation of ventilation that previously was not writing idf. Working.
Incorporation of percentual losses in distribution
|
2023-05-19 18:05:36 -04:00 |
|
|
de066b25fb
|
Changes hub to incorporate change in distribution
|
2023-05-19 16:57:35 -04:00 |
|
|
182d01123c
|
remove warnings for opened files and remove code duplication
|
2023-05-19 16:01:06 -04:00 |
|
|
4700cd037a
|
Merge remote-tracking branch 'origin/systems_catalog' into systems_catalog
# Conflicts:
# hub/data/construction/nrcan_archetypes.json
|
2023-05-19 15:04:31 -04:00 |
|
|
635c0162dc
|
added distribution_systems_electrical_consumption
|
2023-05-19 15:04:02 -04:00 |
|
|
a0335795de
|
Code quality assurance completed
|
2023-05-19 13:15:40 -04:00 |
|
|
bb279c39eb
|
separated distribution consumption in fix and variable flows
|
2023-05-19 12:23:06 -04:00 |
|
|
3680e0356f
|
Merge branch 'idf_lights' into systems_catalog
|
2023-05-19 11:21:12 -04:00 |
|
|
7b245a69b3
|
Incorporation of ventilation. Working.
|
2023-05-19 11:20:44 -04:00 |
|
|
86d4d839b2
|
Partial correction in persistence
|
2023-05-18 16:46:50 -04:00 |
|
|
6e249073c5
|
Partial correction in persistence
|
2023-05-18 16:40:52 -04:00 |
|
|
5fb361e74c
|
Partial correction in persistence and geometry_helper.py
|
2023-05-18 16:15:57 -04:00 |
|
|
1c4920d0b0
|
Partial follow Pylint recommendation
|
2023-05-18 12:29:28 -04:00 |
|
|
c72f30a476
|
Code style and remove old test and un-used files
|
2023-05-18 10:35:05 -04:00 |
|
|
e4f22c29f2
|
erased saving in pickle
|
2023-05-18 10:26:21 -04:00 |
|
|
84ae32bcdb
|
Code style and logging unification
|
2023-05-17 17:10:30 -04:00 |
|
|
baa82c8ec8
|
Structure refactor
|
2023-05-17 12:30:55 -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 |
|
|
48dddae525
|
Merge remote-tracking branch 'origin/systems_catalog' into retrofit_project
|
2023-05-16 09:37:09 -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 |
|
|
ffae3f3a04
|
reformatting energy systems to a class
|
2023-05-12 10:20:39 -04:00 |
|
|
aa08306a99
|
added lod to the city_objects
|
2023-05-12 09:28:24 -04:00 |
|
|
e48dec81cf
|
added lod to the city_objects
|
2023-05-12 09:27:29 -04:00 |
|
|
7b369bae27
|
Partial correction persistence
|
2023-05-10 17:06:51 -04:00 |
|
|
82e5d4ea5e
|
Update 'hub/version.py'
|
2023-05-04 13:50:52 -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 |
|
|
4e3edffb65
|
Merge remote-tracking branch 'origin/geojson' into geojson
|
2023-05-04 11:28:21 -04:00 |
|
|
b6aa6fb86a
|
complete geojson correction
|
2023-05-04 11:28:16 -04:00 |
|
|
ef7addd5b5
|
Merge branch 'geojson' into systems_catalog
# Conflicts:
# hub/catalog_factories/energy_systems/nrcan_catalog.py
# hub/helpers/dictionaries.py
# hub/imports/construction/nrcan_physics_parameters.py
|
2023-05-04 10:48:19 -04:00 |
|
|
2621afb3cd
|
small bug in nrcan constriction factory
|
2023-05-04 10:41:04 -04:00 |
|
|
dbcab5bcb9
|
energy systems factory test added and solved some bugs. Not working yet
|
2023-05-04 10:39:23 -04:00 |
|
|
742b6eb1be
|
partial correction geojson
|
2023-05-03 17:02:28 -04:00 |
|
|
0747b61294
|
some formatting
|
2023-05-03 16:16:50 -04:00 |
|
|
f060197729
|
cleaned a bug in add_schedules and erased all related to adjacent_buildings
|
2023-05-03 14:14:13 -04:00 |
|
|
bdb8bf65b7
|
continue cleaning idf exporter. Changed all specific schedules to general _add_schedule by previously creating the schedules
|
2023-05-03 13:05:37 -04:00 |
|
|
91e2794a8b
|
Merge remote-tracking branch 'origin/idf_lights' into idf_lights
# Conflicts:
# hub/catalog_factories/usage/nrcan_catalog.py
# hub/exports/building_energy/idf.py
|
2023-05-03 11:50:59 -04:00 |
|
|
d82ada6240
|
solved bug in nrcan catalog and partially cleaned ep exporter
|
2023-05-03 11:39:32 -04:00 |
|
|
5a99f16bc9
|
solved 2 todos
|
2023-05-03 09:58:52 -04:00 |
|
|
75e56f4b99
|
Ventilation and usage changed, problem of units. Revise with Pilar the incorporation of ventilation
|
2023-05-02 17:51:08 -04:00 |
|
|
d4029aee10
|
erased non used variables
|
2023-05-02 14:48:51 -04:00 |
|
|
27549e784d
|
Merge branch 'geojson' into idf_lights
|
2023-05-02 14:47:26 -04:00 |
|
|
de718456a5
|
just changed a comment
|
2023-05-02 14:47:10 -04:00 |
|
|
7a6bf0ac52
|
rolled back some changes and hardcoded values
|
2023-05-02 14:44:45 -04:00 |
|
|
9ecf59c68f
|
rolled back some changes and hardcoded values
|
2023-05-02 14:39:37 -04:00 |
|
|
9317e46d5e
|
rolled back some changes and hardcoded values
|
2023-05-02 14:36:04 -04:00 |
|
|
76ab65ea0f
|
changed name systems to energy systems
|
2023-05-02 12:35:42 -04:00 |
|
|
1e68319e7e
|
partial re-implementation of geojson read.
|
2023-05-01 18:05:09 -04:00 |
|
|
949a6c268f
|
complete peak loads calculation
|
2023-05-01 10:37:51 -04:00 |
|
|
35b0e8c872
|
almost finished energy system importer, missing sizing
|
2023-04-28 16:31:53 -04:00 |
|
|
d5196fc54f
|
bug dividing by 0 in nrcan_usage_parameters.py solved
|
2023-04-28 14:14:18 -04:00 |
|
|
3bfb985c04
|
finished system catalog factory
|
2023-04-28 14:07:07 -04:00 |
|
|
0a96b83c22
|
added generic energy system classes to cdm
|
2023-04-28 12:24:08 -04:00 |
|
|
42c39e771c
|
modifications in the systems catalog file
|
2023-04-28 12:11:48 -04:00 |
|
|
688198a3fb
|
added first example of possible catalog.xml
|
2023-04-28 10:50:46 -04:00 |
|
|
53aa540b45
|
some modifications in parameters after technical discussion
|
2023-04-27 16:21:17 -04:00 |
|
|
7a29847132
|
first attempt to energy system catalog. Not working
|
2023-04-27 15:40:59 -04:00 |
|
|
e6486bc598
|
Partial correction for peakloads
|
2023-04-27 13:31:00 -04:00 |
|
|
7c0e03d0e0
|
Merge remote-tracking branch 'origin/geojson' into geojson
|
2023-04-27 10:59:08 -04:00 |
|
|
e4b6c54af6
|
Partial correction for peakloads
|
2023-04-27 10:59:03 -04:00 |
|
|
2dfe8254d1
|
added new functions to access chapter and item by name in costs catalog
|
2023-04-25 11:48:24 -04:00 |
|
|
150614441e
|
erased two prints, fixed a bug in geometry helper and modified name in costs archetype
|
2023-04-25 10:45:56 -04:00 |
|
|
3d6699f71f
|
changed hardcoded path to relative path in costs catalog factory
|
2023-04-25 10:27:27 -04:00 |
|
|
4ab741ee12
|
changed hardcoded path to relative path in costs catalog
|
2023-04-25 10:23:37 -04:00 |
|
|
a3f0478558
|
Merge remote-tracking branch 'origin/geojson' into geojson
|
2023-04-25 10:00:18 -04:00 |
|
|
745c1e6843
|
added dictionary to access montreal custom costs catalog
|
2023-04-25 10:00:07 -04:00 |
|
|
354923b378
|
added dictionary to access montreal custom costs catalog
|
2023-04-25 09:59:52 -04:00 |
|
|
78b21093bb
|
DHW bug solved. It had to do with the factor of the building surface. Now getting good results
|
2023-04-25 08:24:56 -04:00 |
|
|
b60be9c39e
|
Create Linux documentation and add INSEL to Windows documentation
|
2023-04-24 15:42:07 -04:00 |
|
|
ac96b0467b
|
Update Windows documentation for new version of PyCharm and gitea
|
2023-04-24 14:14:14 -04:00 |
|
|
3ccda97830
|
Add redundancy to improve wall detections
|
2023-04-22 09:33:06 -04:00 |
|
|
a25215adb8
|
correct shared walls
|
2023-04-21 12:57:13 -04:00 |
|
|
86892332e3
|
correct shared walls
|
2023-04-21 12:56:32 -04:00 |
|
|
0f8816a053
|
correct shared walls
|
2023-04-21 12:48:50 -04:00 |
|
|
e978d56320
|
correct idf generation for shared walls
|
2023-04-21 10:31:55 -04:00 |
|
|
bb121512c3
|
Add utf-8 encoding when reading cities15000 file
|
2023-04-18 17:55:27 -04:00 |
|
|
dc6bfb3403
|
correct idf generation for shared walls
|
2023-04-18 16:47:36 -04:00 |
|
|
90c40f5e55
|
add shared surfaces to idf
|
2023-04-18 15:45:09 -04:00 |
|
|
844835eabd
|
Merge branch 'retrofit_project' into idf_lights
|
2023-04-18 12:23:25 -04:00 |
|
|
7f41e7d017
|
adding peak loads partial
|
2023-04-18 12:23:03 -04:00 |
|
|
af0e2a7c69
|
add name field to geojson
|
2023-04-18 12:23:03 -04:00 |
|
|
4ca8975e18
|
remove openstreetmaps dependency
|
2023-04-18 12:23:03 -04:00 |
|
Peter Yefi
|
c68baf84dc
|
Filtering out buildings with floor area less that 25 square meters
|
2023-04-18 12:21:59 -04:00 |
|
|
251f5a8582
|
version 0.1.7.11
|
2023-04-18 12:21:59 -04:00 |
|
|
ed13f21470
|
Correct cerc-hub installer to include dependencies
|
2023-04-18 12:21:59 -04:00 |
|
Peter Yefi
|
99b6860694
|
included stream logger. switched from default file logger to stream
|
2023-04-17 17:59:34 -04:00 |
|
|
a59ef0937d
|
Outputs of DHW incorporated. Values still relatively high, but consistent. Still need to incorporate adequately Cold Water Temperature
|
2023-04-17 10:12:18 -04:00 |
|
|
fe7f44d51f
|
Fully functional Domestic Hot Water. Pending validation of results
|
2023-04-12 13:52:55 -04:00 |
|
|
f62df2e873
|
dhw schedule fix attempt
|
2023-04-12 10:16:14 -04:00 |
|
|
89faa92103
|
dhw schedule fix attempt
|
2023-04-12 09:35:27 -04:00 |
|
|
40fe325a18
|
Incorporated 1st version Domestic Hot Water, still not working.
|
2023-04-11 23:07:56 -04:00 |
|
|
29e700c212
|
add name field to geojson
|
2023-04-06 13:26:29 -04:00 |
|
|
6de00c0331
|
Change of minimal.idf to include monthly summary of data to be able to compare with MEP.
Commenting the EP-Workflow to solve the error given by the output reader. To be solved with Koa
|
2023-04-04 17:59:20 -04:00 |
|
|
bc0c1fc0f3
|
Revision of infiltration parameters
|
2023-03-31 12:25:13 -04:00 |
|
|
d37ce01304
|
Changes hub to incorporate change of units in infiltration
|
2023-03-31 08:28:50 -04:00 |
|
|
73c8839814
|
Merge pull request 'Filtering out buildings with floor area less that 25 square meters' (#20) from hp_results into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/20
|
2023-03-30 13:23:40 -04:00 |
|
Peter Yefi
|
a1bc4bc33e
|
Filtering out buildings with floor area less that 25 square meters
|
2023-03-29 18:22:23 -04:00 |
|
|
1947b1ec37
|
version 0.1.7.11
|
2023-03-28 10:48:49 -04:00 |
|
|
86de5a33ca
|
Correct cerc-hub installer to include dependencies
|
2023-03-28 10:41:29 -04:00 |
|
|
648548ea2c
|
Merge branch 'main' into idf_lights
# Conflicts:
# hub/exports/building_energy/idf.py
# hub/unittests/test_exports.py
|
2023-03-27 16:39:30 -04:00 |
|
|
7a9032b0dc
|
Small refactor.
Now energy plus don't raise and unexpected error when some exports aren't performed.
|
2023-03-27 16:28:17 -04:00 |
|
|
dde1c796f7
|
Merge pull request 'test_correction' (#18) from test_correction into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/18
|
2023-03-27 13:56:55 -04:00 |
|
|
47d9d9d775
|
Correct all the unit tests
|
2023-03-27 13:55:32 -04:00 |
|
|
0a8c1c3c42
|
Ensure year of construction field is always an int
|
2023-03-27 12:37:31 -04:00 |
|
|
26951d2458
|
Remove un used variable
|
2023-03-27 11:40:39 -04:00 |
|
|
27005e20c9
|
Correct missing information
|
2023-03-27 11:39:45 -04:00 |
|
|
9ed8fc61e2
|
Changes in idf.
|
2023-03-27 11:25:43 -04:00 |
|
|
f5987cfbcc
|
solved bug in ventilation + infiltration calculation
|
2023-03-24 13:34:37 -04:00 |
|
|
f48d5214f4
|
Changes idf to incorporate multifloor
|
2023-03-24 12:15:10 -04:00 |
|
|
de80850367
|
Merge pull request 'debugging_peak_demands' (#14) from debugging_peak_demands into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/14
|
2023-03-24 10:57:07 -04:00 |
|
|
5cad95ea0c
|
Merge pull request 'updated usages in dictionary to reduce not recognized archetypes' (#16) from fixing_errors_found_Koas_logs into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/16
|
2023-03-24 10:56:47 -04:00 |
|
|
5a5f9f0ef0
|
Merge pull request 'Usage fzk hous in exoport idf' (#15) from my_test into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/15
|
2023-03-24 10:55:27 -04:00 |
|
|
0a35acc62f
|
erased print
|
2023-03-24 10:35:26 -04:00 |
|
|
2d840a6e49
|
added yearly value to ground temperature variable
|
2023-03-24 10:33:59 -04:00 |
|
|
f8b33fa5bf
|
Small improvement in idf export for lighting
|
2023-03-24 09:33:09 -04:00 |
|
|
812d8d06d2
|
Schedule appliances added
First trial of adding factor to change from multizone to unizone. Commented.
|
2023-03-24 08:10:47 -04:00 |
|
|
4082a20638
|
updated usages in dictionary to reduce not recognized archetypes
|
2023-03-23 16:55:09 -04:00 |
|
|
b9c1e4f071
|
Remove run from test
|
2023-03-23 15:59:23 -04:00 |
|
|
5096fe3bab
|
Usage fzk hous in exoport idf
|
2023-03-23 15:47:31 -04:00 |
|
|
ac7fca738a
|
Usage fzk hous in exoport idf
|
2023-03-23 15:38:38 -04:00 |
|
|
1cc72119c9
|
added dhw and electrical demand to results importer and sanity check to importer
|
2023-03-23 13:49:05 -04:00 |
|
|
50ec57f04f
|
Correct IDF
|
2023-03-23 13:43:03 -04:00 |
|
|
b918dfcabd
|
added dhw and electrical demand to results importer and sanity check to importer
|
2023-03-23 13:33:25 -04:00 |
|
|
35f5544a32
|
Appliances test
|
2023-03-23 13:24:41 -04:00 |
|
|
9d51d4f8ba
|
idf
|
2023-03-22 16:23:43 -04:00 |
|
|
32d23d6bdd
|
fixed costs catalog factory
|
2023-03-22 16:17:08 -04:00 |
|
|
559e56dd71
|
fixed the tcold bug in weather importer
|
2023-03-22 15:13:44 -04:00 |
|
|
81a59d4246
|
Delete 'hub/unittests/tests_outputs/New_York_sra_SW.out'
|
2023-03-22 14:26:40 -04:00 |
|
|
0b06b67810
|
delete
|
2023-03-22 14:26:29 -04:00 |
|
|
a3bbe76147
|
Merge pull request 'meb_debugging' (#11) from meb_debugging into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/11
|
2023-03-22 10:37:44 -04:00 |
|
|
28dd0f8b0f
|
fixed the tcold bug
|
2023-03-21 16:11:58 -04:00 |
|
|
f3db1e5fee
|
reviewed units in nrcan catalog and modified catalog and importer accordingly
|
2023-03-21 15:29:11 -04:00 |
|
|
053a866443
|
Merge pull request 'optimization' (#10) from optimization into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/10
|
2023-03-21 14:31:55 -04:00 |
|
|
927771081d
|
Performance improvements completed
|
2023-03-21 14:22:28 -04:00 |
|
|
ff55b502a6
|
Merge branch 'main' into hp_results
|
2023-03-20 16:55:45 -04:00 |
|
|
88e2cb6796
|
introduced dhw to the meb exporter
|
2023-03-20 14:15:57 -04:00 |
|
|
bb10d888c3
|
re-introduced shared walls = 0 for no neighbours
|
2023-03-20 11:41:43 -04:00 |
|
|
d4fc6aa27d
|
re-introduced shared walls = 0 for no neighbours
|
2023-03-20 11:40:20 -04:00 |
|
|
6bbc300730
|
erased not needed max_location_distance_for_shared_walls in configuration
|
2023-03-20 11:39:41 -04:00 |
|
|
78f3921447
|
Merge branch 'main' into dhw
# Conflicts:
# hub/config/configuration.ini
# hub/helpers/configuration_helper.py
# hub/helpers/data/hft_function_to_hub_function.py
|
2023-03-20 11:30:06 -04:00 |
|
|
9f28c2f93d
|
added domestic hot water parameters in catalog and importers
|
2023-03-20 11:07:43 -04:00 |
|
|
aa0952969f
|
solved bug in typing
|
2023-03-20 10:07:31 -04:00 |
|
|
6a402485c5
|
test
|
2023-03-20 09:59:48 -04:00 |
|
|
b61d84763a
|
test
|
2023-03-20 09:52:40 -04:00 |
|
|
2781696f95
|
performance improvements in city import
|
2023-03-17 16:32:54 -04:00 |
|
|
b722125c3e
|
performance debugs
|
2023-03-17 16:00:28 -04:00 |
|
|
4b3ce016b2
|
remove jit
|
2023-03-17 13:40:14 -04:00 |
|
|
d979c74b8d
|
partial; optimization
|
2023-03-17 13:36:43 -04:00 |
|
|
1f6b3e2d8a
|
Correct unit tests
|
2023-03-17 12:56:47 -04:00 |
|
|
81e7d580cf
|
partial optimization
|
2023-03-17 12:54:52 -04:00 |
|
|
e03fc6e1b3
|
export to obj completed
|
2023-03-17 12:45:53 -04:00 |
|
Pilar
|
1b90974b77
|
some refactoring to keep our naming agreement
|
2023-03-17 10:10:30 -04:00 |
|
Pilar
|
05dcc7a4fb
|
Merge branch 'main' into debuging_meb
|
2023-03-16 15:56:46 -04:00 |
|
Pilar
|
508513f702
|
changed return to continue to process the rest of the buildings
|
2023-03-16 15:56:24 -04:00 |
|
Pilar
|
d672eee762
|
changed percentage to per one (-)
|
2023-03-16 12:24:09 -04:00 |
|
Pilar
|
ae6655fe3d
|
added logger to inform about not calculated buildings in MEB
|
2023-03-16 12:19:07 -04:00 |
|
|
89254891b8
|
Merge pull request 'shared_surfaces_method' (#5) from shared_surfaces_method into main
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/5
|
2023-03-16 12:04:19 -04:00 |
|
|
6ea41b1c85
|
export to obj completed
|
2023-03-16 12:03:23 -04:00 |
|
Pilar
|
df7038df80
|
usage = retail in nrcan bug solved
added default value to swr in sra exporter for those buildings without construction known
|
2023-03-16 11:43:13 -04:00 |
|
|
725e7a098f
|
Fix hub logger
|
2023-03-16 11:27:46 -04:00 |
|
|
fdef2152d9
|
export to obj partial implementation
|
2023-03-16 10:51:41 -04:00 |
|
Pilar
|
64384876a4
|
updating costs catalog -> not completed
|
2023-03-16 10:06:32 -04:00 |
|
|
20b88fbccb
|
Custom extrusion and volume calculation for Geojson
|
2023-03-15 14:21:38 -04:00 |
|
|
f0a07d9c0e
|
Reintroduce debug information in the geometry_helper
|
2023-03-15 11:30:25 -04:00 |
|
|
9a7bc6644c
|
Merge branch 'main' into shared_surfaces_method
|
2023-03-14 12:32:26 -04:00 |
|
|
cdfda7a475
|
version 0.1.7.10
|
2023-03-14 11:41:00 -04:00 |
|
|
5637f219f8
|
Correct small bug in merge city
|
2023-03-14 11:28:34 -04:00 |
|
Pilar
|
24a77d2c5b
|
Merge branch 'main' into costs_catalog
|
2023-03-13 18:24:03 -04:00 |
|
Pilar
|
34477c6d8f
|
updating costs catalog -> not completed
|
2023-03-13 18:23:35 -04:00 |
|
Peter Yefi
|
f7276d8c41
|
Added w2w output file
|
2023-03-13 17:30:30 -04:00 |
|
Peter Yefi
|
0d3d4a3ab9
|
Rounded global irradiance values. Removed tear down in water to water
|
2023-03-13 17:24:44 -04:00 |
|
|
658c44389e
|
Version 0.1.7.9
|
2023-03-13 15:02:28 -04:00 |
|
|
ecb09edcfb
|
Reintroduce function in business logic
|
2023-03-13 15:01:55 -04:00 |
|
|
a3a382dae9
|
Reintroduce function in business logic
|
2023-03-13 14:41:25 -04:00 |
|
Pilar
|
4cc9c2dcdb
|
added dhw classes to catalogs and CDM including importers
|
2023-03-13 14:40:07 -04:00 |
|
|
fc25c12149
|
Partial correction of persistence business logic
|
2023-03-13 14:18:04 -04:00 |
|
Pilar
|
a0e52b3e8d
|
added shared walls to geojson. geojson importer test raises an error because the surfaces are triangulated. It should be solved when extrusion is finished
|
2023-03-10 15:15:18 -05:00 |
|
Pilar
|
d198ac9141
|
Merge branch 'main' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
|
2023-03-10 14:15:29 -05:00 |
|
Pilar
|
10acb712f1
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
|
2023-03-10 14:14:09 -05:00 |
|
Pilar
|
77743fea1c
|
rolling back changes
|
2023-03-10 14:09:41 -05:00 |
|
Pilar
|
2ac1fd045b
|
Merge remote-tracking branch 'origin/main' into main
|
2023-03-10 14:07:24 -05:00 |
|
|
591107f8cf
|
Merge remote-tracking branch 'origin/shared_surfaces_method' into shared_surfaces_method
# Conflicts:
# hub/helpers/geometry_helper.py
# hub/unittests/test_geometry_factory.py
|
2023-03-10 14:05:53 -05:00 |
|
|
0ed6c2d935
|
Partial correction of persistence business logic
|
2023-03-10 14:04:00 -05:00 |
|
Pilar
|
44aed37ef4
|
Merge branch 'main' into shared_surfaces_method
|
2023-03-10 14:01:04 -05:00 |
|
Pilar
|
91e688d910
|
working test of percentage shared by walls
|
2023-03-10 14:00:51 -05:00 |
|