cbc24917c1
import changes into typevar to avoid circular references when documentation is created
2021-10-25 13:28:43 -04:00
Pilar
f820816f12
added many new classes needed for the transportation group models. The documentation is not done because it is needed the students feed-back
2021-10-22 13:13:12 -04:00
Pilar
c34e64eb56
added the belonging specific edges and nodes to origind-destination and traffic networks
2021-10-22 11:28:22 -04:00
Peter Yefi
e0924cf45f
Implemented enriching city with energy systems
2021-10-21 13:50:02 +00:00
Peter Yefi
567fde0012
Included energy systems attribute
2021-10-21 13:49:26 +00:00
Pilar
bb5351da27
modified name of class due to an error in the format
2021-10-20 10:24:01 -04:00
Peter Yefi
df3f33b45a
Added a method to read heat pump data into dictionary
2021-10-20 13:00:59 +00:00
Peter Yefi
1951861061
Finished defining the data structure heat pump
2021-10-19 17:17:11 +00:00
Peter Yefi
143b397ef3
Merge branch 'master' of https://rs-loy-gitlab.concordia.ca/Guille/libs
2021-10-19 16:46:30 +00:00
Peter Yefi
9c2b4ca7ef
Formatted filles
2021-10-19 13:58:46 +00:00
Pilar
5794ea09f7
New classes for traffic group
2021-10-18 16:07:18 -04:00
Pilar
a41a7ef801
New classes to integrate Saeeds work: heat_pump.py and the imports
2021-10-18 11:37:20 -04:00
ba72bd9043
Partial test corrections
2021-09-23 09:17:23 -04:00
e40926e74d
Remove tree, bixi_features and compostring classes
2021-09-23 07:43:32 -04:00
fde837150d
Small in the factories documentation
2021-09-22 07:25:53 -04:00
5752c5d31d
Small corrections in doe_idf import
2021-09-16 13:45:27 -04:00
Pilar
2780dd5b7e
Forced types in attributes
2021-09-14 13:46:48 -04:00
Pilar
f4d62bb505
Forced the type in setters
2021-09-13 15:14:54 -04:00
Pilar
83b0716f0f
added Schedule class. Modified schedules attribute in usage_zone.py according to this new class. Modified comnet import and its test. Other imports and exports related to schedules will be broken.
2021-09-01 17:36:02 -04:00
Pilar
7bb775f92a
Merge remote-tracking branch 'origin/master'
2021-09-01 15:14:50 -04:00
Pilar
e116acdeca
added Schedule class. Modified schedules attribute in usage_zone.py according to this new class. Modified comnet import and its test. Other imports and exports related to schedules will be broken.
2021-09-01 12:14:48 -04:00
3bf9051d72
Documentation improvements
2021-09-01 09:39:27 -04:00
Pilar
a626d83a63
erased not used attribute
2021-08-31 16:19:21 -04:00
Pilar
b3d7bc91a3
Merge remote-tracking branch 'origin/master'
2021-08-31 12:17:53 -04:00
Pilar
44c4f666d2
added id to thermal_boundary.py and thermal_opening.py
...
erased \r from files generators
added generator of auxiliary files for dynamic model
2021-08-31 12:17:42 -04:00
c87e573307
Remove documentation from the project, will create a separate repository for it
2021-08-31 11:49:23 -04:00
5282e51695
Review comments and homogenize getter and setters code comment texts
2021-08-30 14:39:24 -04:00
1c8ffcfee0
Revert "Restore repo"
...
This reverts commit c60aca4c07
2021-08-27 21:31:49 +00:00
Pilar
c60aca4c07
Restore repo
2021-08-27 17:29:32 -04:00
Pilar
a78cb879a0
First working version of dynamic building simulation
2021-08-27 17:20:24 -04:00
62bca29a82
Quality improvements
2021-08-27 12:51:30 -04:00
312a9c34be
Quality improvements
2021-08-26 13:27:43 -04:00
Pilar
58066a45cc
Merge remote-tracking branch 'origin/master'
2021-08-26 11:21:21 -04:00
Pilar
ef58f6a142
Added documentation to new attributes in thermal_boundary.py and thermal_opening.py
2021-08-26 11:21:12 -04:00
9e15b77361
Quality improvements
2021-08-26 11:12:31 -04:00
53a7e259e4
Change bounded to thermal_boundaries and overall code quality review
2021-08-26 11:00:59 -04:00
Pilar
8636f4693c
Merge remote-tracking branch 'origin/master'
2021-08-26 09:45:29 -04:00
Pilar
03a7f4cc33
Added new attributes in thermal_opening.py and thermal_boundary.py. Modified surface.py and thermal_boundary.py to adapt to dynamic simulation. First version of thermal_demand_dynamic_simulation.py working well (only tested for one room)
2021-08-26 09:36:10 -04:00
338adb399e
Overall code quality review for the city_model_structure
2021-08-26 09:19:38 -04:00
c8bdc0fb0f
Partial implementation for idf schedule import (doe_idf)
2021-08-25 07:23:02 -04:00
abafd57223
Traffic classes proposal
2021-08-17 13:30:51 -04:00
487ae2fa26
Traffic classes proposal
2021-08-17 12:52:48 -04:00
f1d23a056b
Idf factory can export now one building in kelowna
2021-08-17 12:49:12 -04:00
13eb9eaaa7
Idf factory can export now one building in kelowna
2021-08-12 14:18:44 -04:00
Pilar
17477bc049
is_heated and is_cooled pass from thermal_zone to usage_zone
2021-08-12 11:42:47 -04:00
Pilar
6970bac1f0
Added a parameter in building.py to specifically decide whether dividing the building in storeys or not. By default, False.
2021-08-12 11:08:29 -04:00
Pilar
398a114333
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# city_model_structure/building_demand/thermal_zone.py
2021-08-11 16:39:46 -04:00
Pilar
eb32b7b3e6
added volume to thermal_zones
2021-08-11 16:38:06 -04:00
4dbf77fd11
Merge remote-tracking branch 'origin/master'
2021-08-11 15:11:06 -04:00
49d97de3dd
idf changes
2021-08-11 15:11:00 -04:00
Pilar
c7ebce49b7
fixed a bug in us_archetypes.xml, "interior slab" for "exterior slab"
...
added number_of_storeys = 1 in building.py; it must be reviewed
2021-08-11 12:53:49 -04:00
f06c19722e
Add c40
2021-08-11 12:13:16 -04:00
Pilar
2f86f6c8d4
only 2 unittest don't pass and must be reviewed, test_import_obj and test_subway
2021-08-11 11:14:06 -04:00
Pilar
a28774fde0
Finished the changes to divide buildings by storey to be used in dynamic bulding simulations. Some unittests don't pass yet but the problem can come from the gml reading.
2021-08-10 17:09:42 -04:00
Pilar
70c020ee77
added one more class in transport
2021-08-09 11:29:18 -04:00
Pilar
77d1c01755
added one more class in transport
2021-08-09 11:27:25 -04:00
Pilar
2d71136d33
Added first version of traffic classes.
...
Reorganized classes inside "attributes" into different folders by topic.
2021-08-06 12:28:20 -04:00
Pilar
533e117b03
modified structure to new concept (thermal zones created after building division). Thermal_zone still not created, all tests related to thermal zones don't pass.
2021-06-23 09:53:33 -04:00
Pilar
6b7dac8123
added class Point and used in polygon.py
2021-06-22 13:16:17 -04:00
Pilar
e5cc627ce4
just changed pilar_monsalvete@yahoo.es with pilar.monsalvete@concordia.ca
2021-06-10 08:29:24 -04:00
Pilar
e4cf62b2ff
updating comments in classes for documentation
2021-06-09 14:23:45 -04:00
Pilar
31b5a26256
nrel_physics_interface.py: fixed a bug due to a refactor
...
polygon.py: fixed an error due to normal = 0 that created an infinite loop
simplified_radiosity_algorithm.py: added list of target buildings names to be simulated
2021-06-09 10:46:53 -04:00
Pilar
1d4841df83
city_objects_clusters are now city_objects
...
test_sensors_factory.py passes
2021-06-03 15:56:59 -04:00
Pilar
673c809dd4
fixing sensor tests (not working version)
2021-06-03 13:34:41 -04:00
de471ee88a
Temporary fix sensor test
2021-06-03 12:42:00 -04:00
eb249f84d3
Temporary fix sensor test
2021-06-03 11:52:00 -04:00
Pilar
311342e17e
added clusters to the city
2021-06-03 11:45:17 -04:00
Pilar
df407a6dfa
added clusters to the city
2021-06-03 11:23:09 -04:00
Pilar
b9ca7d084a
WallSurface was converted back in Wall (and all the other types) as internal naming. The previous change was due to an error in changes in citygml import
2021-06-03 10:17:36 -04:00
Pilar
f5e32e16ea
finished the new sensors and added to the factory (concordia_temperature and concordia_gas_flow)
2021-06-02 11:56:38 -04:00
Pilar
360003276a
changes to add new sensors of other types
2021-06-02 11:24:58 -04:00
Pilar
2f0da19293
some typos fixed
2021-06-02 10:55:04 -04:00
85a275d7c1
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# city_model_structure/attributes/concordia_energy_sensor.py
2021-06-02 09:31:04 -04:00
b29f3bf301
small improvements in sensors modeling including the posibility to update the measured dataframes
2021-06-02 09:30:01 -04:00
Pilar
917949f671
just fixed some typological warnings
2021-06-01 19:03:55 -04:00
5ea6a0f125
Create new factory to import concordia energy files into the libs.
...
Minor cosmetic changes
2021-06-01 18:31:50 -04:00
Pilar
4b7ae34985
Sra step repaired. Wall changed to WallSurface in simplified_radiosity_algorithm.py. A decision on the internal names of the surfaces must be also taken (not yet).
2021-05-28 11:53:23 -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
Pilar
a7b7e6bb0d
added pv and hp classes and modified surface to include pv_systems
2021-04-15 17:26:00 -04:00
Pilar
7b9ce04e16
modified ca_usage_parameters.py to make a walk around for a bug in python
2021-04-15 10:04:44 -04:00
3a0eb76834
Correct errors in simplified radiosity algorithm export
2021-04-14 10:41:51 -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
82f029684e
Partial correction for unit test after merge
2021-04-07 14:33:08 -04:00
Pilar
48ed0ace4b
fixed bug when merging
2021-04-07 14:31:16 -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
Pilar
5290cb6ba9
adding import obj (not yet working). Also erased accent from Alvarez
2021-04-07 11:47:39 -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
ba735fb53d
changes for new definition of surfaces (by polygons) and buildings (by polyhedrons)
2021-04-06 13:48:18 -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
48dfbb8c1f
Merge remote-tracking branch 'origin/master'
2021-04-01 10:36:14 -04:00
Pilar
fc588fab62
reorganized properties in city_object and building
2021-04-01 10:36:07 -04:00
cd607122d3
Partial implementation energy ADE, till thermal zones
2021-04-01 10:35:22 -04:00
7620f89629
Partial implementation energy ADE, till thermal zones
2021-04-01 09:25:39 -04:00
Pilar
1498731275
code for storeys division cleaned
2021-03-31 14:17:53 -04:00
Pilar
809dc1b3b6
storey division working, code needs to be cleaned
2021-03-30 17:57:38 -04:00
Pilar
2702c77a33
Merge remote-tracking branch 'origin/master'
2021-03-30 15:13:03 -04:00
Pilar
17ff59827e
sent triangulate from polyhedron.py to polygon.py
2021-03-30 15:12:54 -04:00
8560c62be4
Partial implementation energy ADE, till thermal zones
2021-03-26 12:53:27 -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
f0e7f55535
Export energy ade
2021-03-16 20:14:40 -04:00
Pilar
f98a341ea2
Merge remote-tracking branch 'origin/master'
2021-03-16 13:44:06 -04:00
Pilar
8ec399947c
erased many classes created by Sanam but never used. Modified some classes to adapt to EnergyADE
2021-03-16 13:43:59 -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
b8e5d74e39
reestablished name and country_code in city.py
2021-03-15 12:44:33 -04:00
Pilar
69d7f9d7af
actualized requirements.txt
2021-03-15 11:47:30 -04:00
Pilar
21651aa0f4
changes in archetypes reduced from Rabeeh, erased foot_print in building.py and erased default values in thermal_boundary.py and thermal_opening.py
2021-03-11 14:31:28 -05: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
2ef357b5d9
erased self._buildings in city.py
2021-02-03 09:20:35 -05:00
Pilar
6f58fde55b
added region to city.py
2021-01-27 16:08:11 -05:00
Pilar
043eecf814
normal function in surface.py cleaner
2021-01-20 16:22:58 -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
a53d48e49d
added is_planar
2021-01-13 12:22:10 -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
Pilar
215d62b62b
created distance_between_points in geometry_helper.py, erased almost_equal in polyhedron points
2021-01-11 10:25:34 -05:00
Pilar
c3e06b5fa7
chek units from libraries and storing classes
2021-01-08 16:08:29 -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
f3a0a7c942
Merge remote-tracking branch 'origin/master'
2021-01-07 17:34:08 -05:00
pilar
4faa02d18b
substitute print by sys.write
2021-01-07 17:33:55 -05:00
Guille
1aa17575bf
Testing kelowna test case to debug triangulation and volume calculations
2021-01-07 16:16:48 -05:00
pilar
592afe929d
print erased
2021-01-07 16:14:19 -05:00
pilar
172ce69c4d
hft internal gains interface
2021-01-06 16:42:38 -05:00
Guille
df0509120e
Triangulation changes
2020-12-22 15:44:00 -05:00
Guille
96fa465d42
Fix unit tests and remove debug information
2020-12-21 11:58:24 -05:00
Guille
9c0483f1d8
Correct surface triangulation algorithms
2020-12-21 11:08:54 -05:00
Guille
4c7eea5524
Correct surface triangulation algorithms
2020-12-21 09:42:54 -05:00
Guille
e0990448bb
Code organization
2020-12-15 11:05:02 -05:00
Guille
229f942734
Call parent constructor into the children
2020-12-15 10:04:51 -05:00
Guille
33c773286c
Add inheritance to the facilities and improve the class naming
2020-12-15 09:59:07 -05:00
Guille
4390ecbad8
Code cleaning and adding new functions to save and load a city
2020-12-15 09:32:18 -05:00
pilar
d4d336cf93
Merge remote-tracking branch 'origin/master'
2020-12-14 19:12:56 -05:00
