Commit Graph

773 Commits

Author SHA1 Message Date
30d5502b63 Correct failing unittest test_city_with_sensors 2021-06-02 09:42:39 -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
67f5521d66 Some bugs of libs solved (due to last commit) and populate.py of Dynamic finished 2021-05-27 18:23:39 -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
e486e352a4 Merge remote-tracking branch 'origin/master' 2021-05-25 13:35:06 -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
Guillermo Gutierrez Morote
950310febf Merge branch 'master' into 'master'
Master

See merge request Guille/libs!3
2021-04-30 17:08:32 +00:00
Behnam Farsi Balouch
18b08b2c76 Replace citygml.py 2021-04-30 17:02:53 +00:00
Behnam Farsi Balouch
6e360251fb Update citygml.py 2021-04-30 16:59:04 +00:00
Behnam Farsi Balouch
f831ed5d3c Behnam Contribution 2021-04-30 16:53:36 +00:00
Pilar
a7b7e6bb0d added pv and hp classes and modified surface to include pv_systems 2021-04-15 17:26:00 -04:00
Pilar
e31fc59b8f modified ca_usage_parameters.py to make a walk around for a bug in python 2021-04-15 11:20:11 -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
Guillermo Gutierrez Morote
dcf23c239b Merge branch 'undefined' into 'master'
Updated code by Behnam

See merge request Guille/libs!2
2021-04-12 09:55:13 -04:00
Behnam Farsi Balouch
b6fb373fbb Updated code by Behnam 2021-04-08 20:14:50 -04:00
Pilar
8fc66b7060 fixed unittests to adapt to last changes 2021-04-08 11:47:58 -04:00
Pilar
29d14fdff3 Merge remote-tracking branch 'origin/master' 2021-04-07 14:39:55 -04:00
Pilar
d6e09585ac changed _city_debug with city 2021-04-07 14:39:50 -04:00
ae47bfd25e Partial correction for unit test after merge 2021-04-07 14:35:40 -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
1c444f3667 Correct energy ade export to work with new surfaces 2021-04-07 13:07:57 -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
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