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 |
|
pilar
|
ad67c4273b
|
modifications in demo_occupancy_parameters.py and added new Rabeeh xml files
|
2020-12-14 19:11:56 -05:00 |
|
Guille
|
0c65318294
|
Merge remote-tracking branch 'origin/master'
|
2020-12-14 10:51:17 -05:00 |
|
Guille
|
0d93c4ccb0
|
Error handling improvement for lod2
|
2020-12-14 10:51:10 -05:00 |
|
pilar
|
43c32bfceb
|
actualizing dynamic workflow
|
2020-12-08 16:48:07 -05:00 |
|
Guille
|
46a88bf890
|
Code cleaning and adding new functions to save and load a city
|
2020-12-02 11:56:33 -05:00 |
|
pilar
|
d638794dc4
|
clean of prints
|
2020-12-02 07:10:33 -05:00 |
|
pilar
|
5a19316136
|
solved another bug
|
2020-12-02 06:23:47 -05:00 |
|
pilar
|
f0d6176bab
|
solved one bug
|
2020-12-01 17:19:21 -05:00 |
|
pilar
|
7891e5450e
|
new way of calculating surface finished
|
2020-12-01 16:28:24 -05:00 |
|
pilar
|
024e47fe0c
|
Merge remote-tracking branch 'origin/master'
|
2020-12-01 16:03:09 -05:00 |
|
pilar
|
b3eeb7f4dc
|
new way of calculating surface
|
2020-12-01 16:02:56 -05:00 |
|
Guille
|
33725e8b74
|
Lod2 import for citygml
|
2020-12-01 07:33:23 -05:00 |
|
pilar
|
09f8515ee4
|
print points
|
2020-11-27 12:12:41 -05:00 |
|
Guille
|
38639d8ff9
|
Merge remote-tracking branch 'origin/master'
|
2020-11-27 11:31:56 -05:00 |
|
Guille
|
5bfac5b01b
|
Partial implementation for non-triangular surfaces
|
2020-11-27 11:31:25 -05:00 |
|
pilar
|
6cccb18cd1
|
fixing format and cleaning todos
|
2020-11-26 09:26:55 -05:00 |
|
pilar
|
5adcd7dbf3
|
Just formatting
|
2020-11-26 06:34:11 -05:00 |
|
Guille
|
cb24c7119b
|
Add the occupancy to the data model
|
2020-11-18 08:58:37 -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
|
8ad203bc90
|
added four more properties to usage_zone.py that can be extracted from de_library.xml
|
2020-11-06 05:32:19 -05:00 |
|
Guille
|
7ffe395aa9
|
Add atributes for constructions materials and layers
|
2020-11-05 11:11:43 -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
|
816ad2c7f5
|
small changes to fit weather_factory idea
|
2020-10-30 13:47:59 -04:00 |
|
pilar
|
584640ab6e
|
modified hourly/monthly values in building.py to reduce number of properties using dictionaries
|
2020-10-30 08:32:38 -04:00 |
|
pilar
|
3a22e7afff
|
finished test_weather_factory.py
|
2020-10-30 08:25:36 -04:00 |
|
pilar
|
094e95f221
|
Merge remote-tracking branch 'origin/master'
|
2020-10-29 07:40:57 -04:00 |
|
pilar
|
f4ea7686a5
|
first version of weather factory and related files
|
2020-10-29 07:40:40 -04:00 |
|
Guille
|
97344e0248
|
Correct class and file names to match CERC coding rules
|
2020-10-28 14:05:45 -04:00 |
|
pilar
|
b3f8647036
|
modified structure
|
2020-10-28 13:42:58 -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
|
ee9364d704
|
Idf corrections and intermediate solution
|
2020-10-26 10:00:42 -04:00 |
|
pilar
|
7b3197c5f0
|
modifications for hourly values
|
2020-10-26 08:26:31 -04:00 |
|
pilar
|
51df504a52
|
modified building.py for saving monthly heating and cooling values
|
2020-10-23 06:57:34 -04:00 |
|
Guille
|
351081993a
|
correct schedule setters
|
2020-10-22 08:39:12 -04:00 |
|
Guille
|
ab42ea4ac4
|
Add idf base class corrections and test files
|
2020-10-21 15:23:06 -04:00 |
|
Guille
|
537a90022f
|
Correct small typos in building and schedule_value class
|
2020-10-21 10:01:12 -04:00 |
|
Guille
|
7db28a9f09
|
change building constructor
|
2020-10-21 09:53:07 -04:00 |
|
SanamDabirian
|
9e2900ff83
|
Adding occupancy schedule attributes to building class
|
2020-10-21 01:12:36 -04:00 |
|
SanamDabirian
|
ab61e8b244
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# city_model_structure/building.py
|
2020-10-20 14:04:56 -04:00 |
|
SanamDabirian
|
0848339725
|
Add schedule_value class for occupancy
|
2020-10-20 11:28:21 -04:00 |
|
pilar
|
dc48e98bde
|
error solved in occupancy.py
|
2020-10-19 14:32:48 -04:00 |
|
pilar
|
68c37512ec
|
small change in monthly_to_hourly_demand.py
|
2020-10-19 14:28:38 -04:00 |
|
pilar
|
bb0408c26e
|
constants.py moved from MEB and monthly_to_hourly_demand.py created but not finished
|
2020-10-19 12:47:04 -04:00 |
|
pilar
|
799313cea1
|
Merge remote-tracking branch 'origin/master'
|
2020-10-19 12:46:54 -04:00 |
|
pilar
|
6f7bde1716
|
constants.py moved from MEB and monthly_to_hourly_demand.py created but not finished
|
2020-10-19 10:07:03 -04:00 |
|
SanamDabirian
|
1b2513692f
|
Add household class for occupancy
|
2020-10-17 01:49:33 -04:00 |
|
SanamDabirian
|
f22183331b
|
Add electrical appliances facilities class for occupancy
|
2020-10-17 01:40:19 -04:00 |
|
SanamDabirian
|
5e48597235
|
Add lighting facilities class for occupancy
|
2020-10-17 01:33:29 -04:00 |
|
SanamDabirian
|
849f459cee
|
Add HVAC facilities class for occupancy
|
2020-10-17 01:21:57 -04:00 |
|
|
|
c878b13bc5
|
correct tab
|
2020-10-16 12:27:24 -04:00 |
|
|
|
830a7f38a3
|
Change dhw_facvilities folder
|
2020-10-16 12:24:41 -04:00 |
|
SanamDabirian
|
b821696c8d
|
Add DHW facilities class for occupancy
|
2020-10-16 12:17:22 -04:00 |
|
SanamDabirian
|
7f9f99cb3b
|
Merge remote-tracking branch 'origin/master'
|
2020-10-16 12:11:17 -04:00 |
|
pilar
|
dd5b1cee68
|
modified monthly values to be a DataFrame and added hourly values
|
2020-10-16 08:05:17 -04:00 |
|
pilar
|
1e94596e1d
|
small error in comments
|
2020-10-16 07:49:46 -04:00 |
|
|
|
991e04e2a9
|
small correction in comment and constructor
|
2020-10-16 07:35:08 -04:00 |
|
pilar
|
ef0d503b48
|
Modified building.py to add monthly demand values
|
2020-10-16 06:54:49 -04:00 |
|
SanamDabirian
|
ac76934c96
|
New commit
|
2020-10-16 01:25:22 -04:00 |
|
SanamDabirian
|
fe33bd4480
|
My first commit
|
2020-10-15 09:18:35 -04:00 |
|
|
|
e1224521e6
|
Add building unit class for occupancy
|
2020-10-13 14:47:01 -04:00 |
|
|
|
dc1515bb0d
|
test geometry update
|
2020-06-30 18:06:27 -04:00 |
|
|
|
79a8b9f9d6
|
change reverse_geocoder for openmaps api call
|
2020-06-29 17:24:05 -04:00 |
|
|
|
5249a8fc76
|
change reverse_geocoder for openmaps api call
|
2020-06-26 14:42:52 -04:00 |
|
|
|
b6bc582201
|
change reverse_geocoder for openmaps api call
|
2020-06-26 14:38:42 -04:00 |
|
|
|
106fe545fa
|
change reverse_geocoder for openmaps api call
|
2020-06-26 14:34:37 -04:00 |
|
|
|
af22f7aaa9
|
Remove debug prints
|
2020-06-26 10:06:43 -04:00 |
|
|
|
254def746a
|
Merge remote-tracking branch 'origin/master'
|
2020-06-22 14:35:59 -04:00 |
|
|
|
0b187a05a1
|
Add max distance for adjacent buildings in the config file.
If the distance is bigger than the given one it's not even checked for shared walls
|
2020-06-22 14:35:40 -04:00 |
|
pilar
|
c764c96deb
|
added "residential" type to us_to_library_types.py
added building_type = "residential" to us_archetypes.xml
20 buildings example returns geometrical errors in third building
|
2020-06-22 14:34:29 -04:00 |
|
|
|
366551cf38
|
Implement lod2
|
2020-06-22 13:26:50 -04:00 |
|
|
|
523c96216a
|
Add the building/city_objects hierarchy to the city
|
2020-06-16 16:19:14 -04:00 |
|
|
|
5bbfa23c48
|
Add the building/city_objects hierarchy to the city
|
2020-06-16 16:06:33 -04:00 |
|
|
|
0722c5466e
|
Add the building/city_objects hierarchy to the city
|
2020-06-16 15:34:35 -04:00 |
|
pilar
|
fecf40247a
|
added bixi_feature.py, tree.py and composting_plant.py
|
2020-06-16 15:26:55 -04:00 |
|
pilar
|
f03317e4b5
|
Merge remote-tracking branch 'origin/master'
|
2020-06-16 15:14:31 -04:00 |
|
pilar
|
2f47df2a7c
|
adding new city_objects
|
2020-06-16 15:14:23 -04:00 |
|
|
|
4a58387f23
|
Add the building/city_objects hierarchy to the city
|
2020-06-16 15:12:18 -04:00 |
|
|
|
2f8de273dd
|
Add virtual environment to the git repository, this isn't 100% right but it's practical at this development point
|
2020-06-16 10:34:17 -04:00 |
|
pilar
|
3a5daa84e8
|
new todo in thermal_zone.py
|
2020-06-16 10:06:32 -04:00 |
|
pilar
|
3241eddd4e
|
stl save changed to stl export
|
2020-06-15 11:03:04 -04:00 |
|
pilar
|
2da64d7c60
|
MEB workflow run to the end only with option: sra_calculated = True
|
2020-06-11 18:30:50 -04:00 |
|
pilar
|
2de8869dd3
|
Merge remote-tracking branch 'origin/master'
|
2020-06-11 17:30:56 -04:00 |
|
pilar
|
7329e36bc8
|
changed stl to trimesh
|
2020-06-11 17:30:50 -04:00 |
|
|
|
4e63ba72c6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# city_model_structure/surface.py
# helpers/configuration_helper.py
# helpers/geometry_helper.py
|
2020-06-11 16:58:20 -04:00 |
|
