|
|
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 |
|
Pilar
|
9dcc12fd68
|
Changes in libs to new concept of keywords in libraries. Missing new tests.
|
2021-05-26 18:17:23 -04:00 |
|
Pilar
|
33ac71d5a6
|
added 'year' to 'minute' as constants in constants.py and adapted the code to that
|
2021-05-25 13:34:57 -04:00 |
|
|
|
35667ab083
|
Correct errors in simplified radiosity algorithm export
|
2021-04-14 10:22:29 -04:00 |
|
Pilar
|
146162165f
|
created epw_weather_parameters.py
|
2021-04-13 19:00:28 -04:00 |
|
Pilar
|
a0613201e3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# city_model_structure/attributes/surface.py
# city_model_structure/city.py
|
2021-04-13 15:11:39 -04:00 |
|
Pilar
|
ac902c6c97
|
created epw_weather_parameters.py
|
2021-04-13 15:09:13 -04:00 |
|
|
|
bfd4868005
|
Rollback behnam changes and add sra export to the export factory
|
2021-04-13 14:12:45 -04:00 |
|
Pilar
|
8fc66b7060
|
fixed unittests to adapt to last changes
|
2021-04-08 11:47:58 -04:00 |
|
Pilar
|
d6e09585ac
|
changed _city_debug with city
|
2021-04-07 14:39:50 -04:00 |
|
Pilar
|
ff701e7f77
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# city_model_structure/building.py
# imports/geometry_feeders/citygml.py
|
2021-04-07 14:23:41 -04:00 |
|
Pilar
|
e19a22920b
|
created import obj and tested
|
2021-04-07 14:20:13 -04:00 |
|
|
|
86fe064a25
|
Partial correction for unit tests
|
2021-04-07 12:57:56 -04:00 |
|
|
|
c480a6c4cb
|
Partial correction for unit tests
|
2021-04-07 12:06:21 -04:00 |
|
|
|
634bbc286f
|
Change export method from property to function to improve the semantic
|
2021-04-07 11:52:39 -04:00 |
|
|
|
7a77c47d04
|
Merge remote-tracking branch 'origin/master'
|
2021-04-07 11:48:00 -04:00 |
|
|
|
5084a4457c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# tests/test_exports.py
|
2021-04-07 11:47:41 -04:00 |
|
Pilar
|
5290cb6ba9
|
adding import obj (not yet working). Also erased accent from Alvarez
|
2021-04-07 11:47:39 -04:00 |
|
|
|
09ee39c314
|
Review changes for CityGml import factory change to use the new format for surfaces based in polygons
|
2021-04-07 11:46:44 -04:00 |
|
Pilar
|
39c6a3afd2
|
fixing tests after changes in Surface and building
|
2021-04-07 10:33:05 -04:00 |
|
|
|
88e43a0770
|
CityGml import factory change to use the new format for surfaces based in polygons
|
2021-04-06 18:06:19 -04:00 |
|
Pilar
|
bf0cda131e
|
max_x, max_y, max_z (and min) changed to envelope_upper_corner (and lower)
|
2021-04-01 15:51:09 -04:00 |
|
Pilar
|
1498731275
|
code for storeys division cleaned
|
2021-03-31 14:17:53 -04:00 |
|
Pilar
|
e353a7c800
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# city_model_structure/building.py
|
2021-03-25 09:15:05 -04:00 |
|
Pilar
|
9a40cfa54b
|
testing building separation in storeys with the new configuration of geometry using polygons and polyhedrons (NOT working yet).
|
2021-03-25 09:11:42 -04:00 |
|
|
|
636047b99c
|
Partial implementation energy ADE, till geometry export (LOD2) this commit is broken, due some missing attribute (max_(coord)) at surface class
|
2021-03-25 09:11:30 -04:00 |
|
Pilar
|
dbbe3d56fc
|
before behnam changes in libs
|
2021-03-23 10:13:01 -04:00 |
|
|
|
413c302ed3
|
Export energy ade as a file
|
2021-03-17 09:23:48 -04:00 |
|
|
|
f0e7f55535
|
Export energy ade
|
2021-03-16 20:14:40 -04:00 |
|
Pilar
|
7f902553cf
|
solved demand units
|
2021-03-16 19:40:41 -04:00 |
|
Pilar
|
b6c49b950d
|
with year
|
2021-03-16 19:28:21 -04:00 |
|
Pilar
|
67fe44e303
|
added two files to tests_data
|
2021-03-16 18:25:29 -04:00 |
|
Pilar
|
8f36b88571
|
obj export to ground reference
|
2021-03-16 16:58:52 -04:00 |
|
|
|
490fcb9563
|
Implement exports factories clases and export stl and obj city version.
|
2021-03-16 12:33:22 -04:00 |
|
Pilar
|
4e4875392f
|
modifications in classes for energyADE
|
2021-03-16 12:19:35 -04:00 |
|
Pilar
|
69d7f9d7af
|
actualized requirements.txt
|
2021-03-15 11:47:30 -04:00 |
|
Pilar
|
74732355d4
|
working version after creating polygon.py
|
2021-03-08 18:27:14 -05:00 |
|
Pilar
|
a9abb59835
|
removed remove_last parameter
|
2021-03-08 12:56:19 -05:00 |
|
Pilar
|
dbd32e4d20
|
Surface and Polygon classes finished. Added test_surfaces to test_geometry_factory.py. Still not working version.
|
2021-03-03 16:33:33 -05:00 |
|
Pilar
|
fa83e195c4
|
Partial implementation of new concept surfaces vs. polygons, not a working version
|
2021-03-02 18:57:09 -05:00 |
|
Pilar
|
090e70a3d0
|
In building.py: added property storeys and corrected two bugs. In city_object.py, added property polyhedron. In polyhedron.py added documentation. In test_geometry_factory.py added new unittest test_divide_mesh_by_plane.
|
2021-03-01 16:42:03 -05:00 |
|
Pilar
|
6f58fde55b
|
added region to city.py
|
2021-01-27 16:08:11 -05:00 |
|
Pilar
|
9a55935add
|
working and cleaner triangulate function v1.1
|
2021-01-20 16:05:47 -05:00 |
|
Pilar
|
7a5b93466f
|
new triangulate function in polyhedron.py working. v1.0
|
2021-01-19 17:33:03 -05:00 |
|
Pilar
|
1fccac8f4c
|
first attempt to new triangulate function in polyhedron.py
|
2021-01-13 16:41:45 -05:00 |
|
Pilar
|
869cc8fd81
|
added tests to be erased, but temporally needed
|
2021-01-13 12:24:02 -05:00 |
|
Pilar
|
e9dd9c2221
|
eliminated many parameters from configuration.ini that will now depend on the workflow
added example iso 52016-1:2017
added new weather format defined in iso 52016-1:2017 (xls)
|
2021-01-11 17:11:50 -05:00 |
|
Guille
|
5c93b64cd3
|
Code review and small corrections over the new interfaces dor physics and usage factories
|
2021-01-08 09:37:38 -05:00 |
|
Guille
|
f2292a53e3
|
Merge remote-tracking branch 'origin/master'
|
2021-01-08 09:33:25 -05:00 |
|
Guille
|
feab805be2
|
Code review and small corrections over the new interfaces dor physics and usage factories
|
2021-01-08 09:16:01 -05:00 |
|
pilar
|
7e0840e759
|
adapted us and nyc to physics interface
|
2021-01-07 19:46:52 -05:00 |
|
pilar
|
67fe6a1ed4
|
adapted de and nyc to usage interface
|
2021-01-07 18:53:26 -05:00 |
|
Guille
|
1aa17575bf
|
Testing kelowna test case to debug triangulation and volume calculations
|
2021-01-07 16:16:48 -05:00 |
|
pilar
|
172ce69c4d
|
hft internal gains interface
|
2021-01-06 16:42:38 -05:00 |
|
pilar
|
cb2be1382c
|
nrel interface
|
2021-01-05 15:01:36 -05:00 |
|
pilar
|
74659b8a06
|
occupancy to schedules
|
2020-12-15 15:15:40 -05:00 |
|
pilar
|
4a7dda045d
|
occupancy to schedules
|
2020-12-15 14:57:46 -05:00 |
|
Guille
|
b0ca46332c
|
unit test name refactoring
|
2020-12-15 11:10:25 -05:00 |
|
Guille
|
e0990448bb
|
Code organization
|
2020-12-15 11:05:02 -05:00 |
|
Guille
|
46a88bf890
|
Code cleaning and adding new functions to save and load a city
|
2020-12-02 11:56:33 -05:00 |
|
Guille
|
2c0c30ad33
|
Remove debug message
|
2020-12-01 16:29:20 -05:00 |
|
Guille
|
534fdc1ee7
|
Remove debug message
|
2020-12-01 07:35:13 -05:00 |
|
Guille
|
be31e9517a
|
Lod2 import for citygml
|
2020-12-01 07:33:53 -05:00 |
|
Guille
|
33725e8b74
|
Lod2 import for citygml
|
2020-12-01 07:33:23 -05:00 |
|
Guille
|
5bfac5b01b
|
Partial implementation for non-triangular surfaces
|
2020-11-27 11:31:25 -05:00 |
|
Guille
|
bb9ecf11c0
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# tests/test_idf.py
|
2020-11-18 09:05:27 -05:00 |
|
Guille
|
cb24c7119b
|
Add the occupancy to the data model
|
2020-11-18 08:58:37 -05:00 |
|
Soroush
|
d34d4395c1
|
Add occupancy modified 1
|
2020-11-18 02:28:29 -05:00 |
|
Guille
|
fcbee21199
|
Bugfixing in idf_helper, changing the method exposure so now adding surfaces add materials and layers automatically, added surface getter for ThermalBoundary
|
2020-11-12 13:50:43 -05:00 |
|
pilar
|
62e561824b
|
added usage unittest
|
2020-11-06 05:40:17 -05:00 |
|
Guille
|
794f41262b
|
Add atributes for constructions materials and layers
|
2020-11-05 11:45:39 -05:00 |
|
Guille
|
7ffe395aa9
|
Add atributes for constructions materials and layers
|
2020-11-05 11:11:43 -05:00 |
|
Guille
|
93a35d359c
|
Fix broken unit test, change test gml file to 20 buildings instead 2 and correct physic path so standard library is used instead custom one
|
2020-11-04 11:56:57 -05:00 |
|
Guille
|
3c79c2288c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# requirements.txt
|
2020-11-04 08:59:27 -05:00 |
|
Guille
|
75ff0bd800
|
Corrected IDF helper, there are a bug related to the ep+ can not be executed directly from python in linux (more test are needed) a possible work around it's to call the console directly instead using "run function"
|
2020-11-04 08:54:10 -05:00 |
|
pilar
|
96ec16a6b8
|
modified files to include occupancy schedules and create yearly schedules from typical week days
|
2020-11-02 13:41:42 -05:00 |
|
pilar
|
ec5b5f626c
|
small changes to fit weather_factory idea
|
2020-10-30 16:01:12 -04:00 |
|
pilar
|
3a22e7afff
|
finished test_weather_factory.py
|
2020-10-30 08:25:36 -04:00 |
|
pilar
|
b17bab8df7
|
error in test_weather_factory.py
|
2020-10-30 06:23:29 -04:00 |
|
pilar
|
5c4f323e76
|
erased folders in factories
|
2020-10-29 08:16:48 -04:00 |
|
Guille
|
bf952d88e4
|
Correct paths and unittest errors caused by refactoring
|
2020-10-28 13:57:56 -04:00 |
|
pilar
|
94c593b651
|
created weather_factory but not completed
re-structured weather.py file accordingly (now in weather_factory.helpers
|
2020-10-28 13:14:05 -04:00 |
|
Guille
|
c1b7d346bd
|
Idf surfaces connection
|
2020-10-28 12:20:13 -04:00 |
|
Guille
|
e8758eb76d
|
Idf surfaces connection
|
2020-10-27 13:19:50 -04:00 |
|
pilar
|
20d9f00e77
|
fixed test_occupancy_factory.py
|
2020-10-27 12:53:29 -04:00 |
|
pilar
|
b2dcec9845
|
modified demo_occupancy_parameters.py
|
2020-10-27 09:31:57 -04:00 |
|
Guille
|
e8840de5a6
|
Idf blocks connection
|
2020-10-26 13:47:10 -04:00 |
|
Guille
|
e74f4ead79
|
Idf blocks connection
|
2020-10-26 13:33:03 -04:00 |
|
Guille
|
ee9364d704
|
Idf corrections and intermediate solution
|
2020-10-26 10:00:42 -04:00 |
|
Guille
|
f6ba7ac911
|
Correct idf_helper class
|
2020-10-22 12:04:04 -04:00 |
|
Guille
|
11fcd27926
|
Correct idf_helper class
|
2020-10-22 12:00:53 -04:00 |
|
Guille
|
8d14b040ed
|
Add the demo factory to the libs
|
2020-10-22 11:38:59 -04:00 |
|
Guille
|
1f2a79d43b
|
Add the demo factory to the libs
|
2020-10-22 11:02:41 -04:00 |
|
Guille
|
027bea5c2f
|
Rename the idf class into idf_helper, most likely in the future it will become a factory
|
2020-10-22 07:30:34 -04:00 |
|
Guille
|
ab42ea4ac4
|
Add idf base class corrections and test files
|
2020-10-21 15:23:06 -04:00 |
|
kpanchab
|
8e8feb3e98
|
I aaded 1 in the testcase
|
2020-10-21 09:16:29 -04:00 |
|
Guille
|
9cbcea5fd5
|
Remove deprecated assert call and unused variable
|
2020-10-19 11:48:34 -04:00 |
|
|
|
dc1515bb0d
|
test geometry update
|
2020-06-30 18:06:27 -04:00 |
|
