s_ranjbar/city_retrofit
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity
676 Commits 5 Branches 88 Tags 230 MiB
ed6f568b92
Commit Graph

171 Commits

Author SHA1 Message Date
atiya
dbab2d2501 Types of properties are added 2021-11-15 10:35:31 -05:00
guille
7529a3719a Merge remote-tracking branch 'origin/master' 2021-11-15 09:47:23 -05:00
guille
eeff2eec18 Integrate Peter's head pump branch into master 2021-11-15 09:47:09 -05:00
atiya
075e03396d Added LCA formulas 2021-11-15 08:28:50 -05:00
atiya
97ec2a1436 added Machine and Vehicle classes to Life Cycle Assessment 2021-11-13 00:55:04 -05:00
Peter Yefi
fee9dc5808 Modified xlsx heat pump method 2021-11-12 10:19:55 +00:00
guille
0439ab0cd2 Merge remote-tracking branch 'origin/master' 2021-11-12 04:42:29 -05:00
guille
c07a6f6c34 Base implementation for the fuel life cicle analisis 2021-11-12 04:41:17 -05:00
Pilar
3babe097f2 Changed hard-coded values to constant values 2021-11-11 17:27:19 -05:00
Pilar
46c3b8b63a Added comnet usage library, including import factory. Some modifications on internal_gains.py and hft_internal_gains_archetypes.py were required. Also created a class to pass from daily schedules to yearly schedule. 2021-11-11 17:25:53 -05:00
Peter Yefi
ebe5439f02 Fixed issue with coefficient computation 2021-11-10 10:17:01 +00:00
Peter Yefi
102e6ae2d4 Added return type to objective_function 2021-11-08 16:37:58 +00:00
Pilar
ef6afb0ab4 created customized imports factory and correspondent test 2021-11-05 10:16:35 -04:00
Peter Yefi
545c58a5f1 Modified heat pump import to compute coefficient of performance data 2021-11-01 14:53:51 +00:00
Peter Yefi
ae0e2a905f Fixed error with reading cooling data 2021-10-29 15:26:48 +00:00
Peter Yefi
bf649638d7 Changed code indentation 2021-10-26 11:12:02 +00:00
Peter Yefi
8e86f299d5 Changed variable names and code indentation 2021-10-26 11:11:48 +00:00
Pilar
688ba9bd37 created customized imports factory and correspondent test 2021-10-25 18:05:51 -04:00
Pilar
eb836809a8 Merge remote-tracking branch 'origin/master' 2021-10-25 13:33:48 -04:00
Pilar
9243a0a4d4 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-25 13:33:08 -04:00
guille
cbc24917c1 import changes into typevar to avoid circular references when documentation is created 2021-10-25 13:28:43 -04:00
Peter Yefi
e0924cf45f Implemented enriching city with energy systems 2021-10-21 13:50:02 +00: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
Pilar
a41a7ef801 New classes to integrate Saeeds work: heat_pump.py and the imports 2021-10-18 11:37:20 -04:00
guille
ba72bd9043 Partial test corrections 2021-09-23 09:17:23 -04:00
guille
fde837150d Small in the factories documentation 2021-09-22 07:25:53 -04:00
guille
5752c5d31d Small corrections in doe_idf import 2021-09-16 13:45:27 -04:00
Pilar
0b2a70f8ae temperature in Comnet in Fahrenheit, transformed to Celsius 2021-09-01 17:59:28 -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
guille
3bf9051d72 Documentation improvements 2021-09-01 09:39:27 -04:00
Soroush Samareh Abolhassani
b21f7a9f65 doe_idf is modified to read the XML format of doe idf addresses and connect it to the rest of the code. 2021-08-31 17:48:35 -04:00
guille
5282e51695 Review comments and homogenize getter and setters code comment texts 2021-08-30 14:39:24 -04:00
guille
d4056c4fb8 Review overall code quality and refactor tests folders 2021-08-30 11:38:28 -04:00
Pilar
952ef55cae add missing file 2021-08-27 17:45:32 -04:00
Pilar Monsalvete
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
guille
62bca29a82 Quality improvements 2021-08-27 12:51:30 -04:00
guille
312a9c34be Quality improvements 2021-08-26 13:27:43 -04:00
guille
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
guille
d86623f535 use small office as residential source for schedules till we got the proper idf file for it 2021-08-25 14:32:34 -04:00
guille
d006bdf69d Complete idf schedule import (doe_idf) 2021-08-25 14:29:30 -04:00
guille
c861dc6bc3 Partial implementation for idf schedule import (doe_idf) 2021-08-25 11:05:22 -04:00
guille
5af0984aee Partial implementation for idf schedule import (doe_idf) 2021-08-25 07:24:21 -04:00
guille
c8bdc0fb0f Partial implementation for idf schedule import (doe_idf) 2021-08-25 07:23:02 -04:00
Soroush Samareh Abolhassani
665adae908 Idf parser and standardization is done (correct version)_need to be updated 2021-08-20 18:36:28 -04:00
Soroush Samareh Abolhassani
1d0dd11409 Idf parser and standardization is done 2021-08-19 21:55:19 -04:00
guille
13eb9eaaa7 Idf factory can export now one building in kelowna 2021-08-12 14:18:44 -04:00
guille
7772d807dc correct idf factory 2021-08-12 11:58:24 -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
guille
49d97de3dd idf changes 2021-08-11 15:11:00 -04:00
guille
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
guille
11982a35bd Correct unit tests 2021-08-11 10:29:54 -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
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
6b7dac8123 added class Point and used in polygon.py 2021-06-22 13:16:17 -04:00
Pilar
b319ae50dc erased populate and created enrich in libs.helpers. 
add new constants to helpers.constants
 2021-06-10 10:48:30 -04:00
Pilar
e5cc627ce4 just changed pilar_monsalvete@yahoo.es with pilar.monsalvete@concordia.ca 2021-06-10 08:29:24 -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
guille
cae22102c9 Remove useless debug code 2021-06-08 11:41:45 -04:00
guille
47c4cbed65 Reorganize the citygml classes 2021-06-08 11:34:30 -04:00
guille
c1c0f598da Reorganize the citygml classes 2021-06-04 09:22:06 -04:00
guille
8def8ece2d Merge remote-tracking branch 'origin/master' 2021-06-03 16:26:08 -04:00
guille
5e65b09665 Fixt test and implement lod2 with multiparts 2021-06-03 16:26:00 -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
1431e86a37 Merge remote-tracking branch 'origin/master' 2021-06-03 13:45:18 -04:00
guille
d37f8bc68c Fixt test and implement lod2 with multiparts 2021-06-03 13:35:16 -04:00
Pilar
663436c998 fixing sensor tests (not working version) 2021-06-03 13:34:56 -04:00
guille
de471ee88a Temporary fix sensor test 2021-06-03 12:42:00 -04:00
Pilar
311342e17e added clusters to the city 2021-06-03 11:45:17 -04:00
Pilar
f725ec9d4c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	imports/geometry/citygml.py
 2021-06-03 11:38:05 -04:00
guille
23360021c3 Improve comments 2021-06-03 11:27:48 -04:00
guille
62a1dbbf7f Partial correction citygml read 2021-06-03 11:16:21 -04:00
Pilar
9fdedc68d4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	imports/geometry/citygml.py
#	imports/geometry/helpers/geometry_helper.py
 2021-06-03 10:37:32 -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
guille
3005e5de6e Partial correction citygml read 2021-06-03 10:14:36 -04:00
guille
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
guille
3e179e9dff Small modification to be able to work with city clusters for the sensors. 2021-06-02 11:24:53 -04:00
guille
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
guille
85a275d7c1 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	city_model_structure/attributes/concordia_energy_sensor.py
 2021-06-02 09:31:04 -04:00
guille
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
guille
5ea6a0f125 Create new factory to import concordia energy files into the libs. 
Minor cosmetic changes
 2021-06-01 18:31:50 -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
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