Commit Graph

735 Commits

Author SHA1 Message Date
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
3005e5de6e Partial correction citygml read 2021-06-03 10:14:36 -04:00
81324c945e Partial correction citygml read 2021-06-03 10:12:06 -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
fec7f79d20 changes to add new sensors of other types 2021-06-02 11:28:24 -04:00
Pilar
22d00933c6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	data/sensors/concordia_energy_db.json
#	imports/sensors/concordia_energy_consumption.py
2021-06-02 11:25:27 -04:00
Pilar
360003276a changes to add new sensors of other types 2021-06-02 11:24:58 -04:00
3e179e9dff Small modification to be able to work with city clusters for the sensors. 2021-06-02 11:24:53 -04:00
4d821880a4 Bug fix and generalization for more concordia sensors 2021-06-02 11:16:00 -04:00
Pilar
2f0da19293 some typos fixed 2021-06-02 10:55:04 -04:00
Pilar
40a52e3966 Merge remote-tracking branch 'origin/master' 2021-06-02 09:56:45 -04:00
Pilar
683b465895 just fixed some typological warnings 2021-06-02 09:56:38 -04:00
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