Commit Graph

74 Commits

Author SHA1 Message Date
1d48adf570 Add dompark aechetype 2022-04-26 18:43:48 -04:00
a273c38a45 remove nrcan construction library and fix some unit tests 2022-04-11 14:32:44 -04:00
d46576c890 Bug correction in the lca factory and lca_data.xml 2022-04-06 16:37:51 -04:00
2bc217773e Correct merge error add deleted files 2022-03-24 19:06:47 -04:00
Pilar
62dcc3805b complete modification of the structure of the classes that define the buildig for a better adjustment to the different data sources and the connected tools. NOT finished 2022-03-24 18:43:55 -04:00
Pilar
cf19f6fce5 fixed bug saving values 2022-03-24 18:43:55 -04:00
f2ff10ad47 Merge remote-tracking branch 'origin/master' into heat_pump
# Conflicts:
#	city_model_structure/city.py
#	city_model_structure/energy_system.py
#	city_model_structure/fuel.py
#	city_model_structure/machine.py
#	city_model_structure/vehicle.py
#	data/life_cycle_assessment/lca_data.xml
#	exports/energy_systems_factory.py
#	helpers/constants.py
#	helpers/yearly_from_daily_schedules.py
#	imports/energy_systems/air_source_hp_parameters.py
#	imports/geometry/rhino.py
#	imports/geometry_factory.py
#	imports/life_cycle_assessment/lca_fuel.py
#	imports/life_cycle_assessment/lca_machine.py
#	imports/life_cycle_assessment/lca_vehicle.py
#	imports/life_cycle_assessment_factory.py
#	requirements.txt
#	unittests/test_life_cycle_assessment_factory.py
2022-03-17 14:34:11 -04:00
Peter Yefi
73593744b7 Modified coefficient computation for water to water hp 2022-03-17 10:37:47 -04:00
Peter Yefi
380c6644a3 Changed how coefficients are generated 2022-03-10 12:44:04 -05:00
Peter Yefi
409e894097 Modified template files 2022-03-10 12:41:35 -05:00
7db319f3fd Partial implementation for the greenery catalog integration 2022-03-03 16:52:01 -05:00
atiya
0870d12029 Machines added into City class 2022-03-02 12:12:17 -05:00
Peter Yefi
5269caba9d Added different template files for parallel and series w2w and air source 2022-02-26 11:40:19 -05:00
Peter Yefi
34fbd393aa Added constants for w2w hp 2022-01-29 09:41:17 -05:00
Peter Yefi
a7ac455d65 Renamed template for air source hp data 2022-01-26 10:40:41 -05:00
sanam
b54048f7db Adding the LoD1 EV Building gml file 2022-01-08 12:33:07 -05:00
Peter Yefi
ddbc047640 Fixed and merged conflicts 2021-12-15 09:30:53 +00:00
Peter Yefi
12181cc12b Included required data for importation 2021-12-15 09:26:14 +00:00
Peter Yefi
02882f5e1c Added water to water heat pump 2021-12-15 09:19:10 +00:00
sanam
976108e434 Adding the Dompark gml file 2021-12-03 10:07:40 -05:00
Sanam Dabirian
5d1a7e9172 Upload New File 2021-12-02 19:43:50 +00:00
atiya
01ff8ddcf3 LCA materials XML 2021-11-18 16:55:49 -05:00
atiya
5a686f867a LCA materials XML 2021-11-16 14:25:25 -05:00
a692f9c22a Test driven partial corrections 2021-11-16 07:57:47 -05:00
Pilar
068a780ebb 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-15 11:07:15 -05:00
9837bb8427 Base implementation for the fuel life cicle analisis 2021-11-15 11:06:55 -05:00
Pilar
3adf8c9604 created customized imports factory and correspondent test 2021-11-15 11:02:52 -05:00
Pilar
2c5490d138 added many new classes needed for the transportation group models. The documentation is not done because it is needed the students feed-back 2021-11-15 11:02:42 -05:00
atiya
35c62b4808 Merge remote-tracking branch 'origin/master' 2021-11-15 10:36:16 -05:00
atiya
dbab2d2501 Types of properties are added 2021-11-15 10:35:31 -05:00
eeff2eec18 Integrate Peter's head pump branch into master 2021-11-15 09:47:09 -05:00
0439ab0cd2 Merge remote-tracking branch 'origin/master' 2021-11-12 04:42:29 -05:00
c07a6f6c34 Base implementation for the fuel life cicle analisis 2021-11-12 04:41:17 -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
ce2e46a236 Added yaml file to have heat pump constants 2021-11-08 16:28:21 +00:00
Pilar
ef6afb0ab4 created customized imports factory and correspondent test 2021-11-05 10:16:35 -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
Pilar
a41a7ef801 New classes to integrate Saeeds work: heat_pump.py and the imports 2021-10-18 11:37:20 -04:00
5752c5d31d Small corrections in doe_idf import 2021-09-16 13:45:27 -04:00
Pilar
f4d62bb505 Forced the type in setters 2021-09-13 15:14:54 -04:00
Soroush Samareh Abolhassani
63f958deba The xml file for doe idf generated and added to the libs. 2021-08-31 12:16:48 -04:00
Soroush Samareh Abolhassani
1e591ba5b4 The idf files have been added. 2021-08-30 18:46:35 -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
Soroush Samareh Abolhassani
c2e5cd5970 idf sample from DOE 2021-08-24 15:18:40 -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
3d922ab4f4 I added an idf sample from DOE 2021-08-17 10:17:07 -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
e77f6890f4 added Montreal weather file 2021-06-08 12:53:17 -04:00