Commit Graph

95 Commits

Author SHA1 Message Date
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
2585cd3245 partially finished usage factory test 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
c8c4a681e3 Fixing bugs in idf export 2022-03-16 13:21:51 -04:00
Peter Yefi
380c6644a3 Changed how coefficients are generated 2022-03-10 12:44:04 -05:00
d5a4ffe0fa Complete implementation for the greenery catalog integration 2022-03-09 11:40:06 -05:00
024469ac0a Link materials and lca_materials in the city 2022-03-02 12:56:20 -05:00
6b9e09ba88 Partial commit for dompark project including sensors, lca materials and overall improvements 2022-03-02 12:13:11 -05:00
651151c6ac Partial implementation of the new iot sensors, this change broke the sensor factories and a few unit tests that will be fixed in next commit. 2022-02-21 13:26:14 -05:00
Pilar
99f2dea55f fixed bug saving values 2022-02-17 12:48:23 -05:00
Pilar
e74fa4dfe9 modified doe_idf.py to save on new schedule format 2022-02-17 12:37:14 -05:00
Peter Yefi
7f21cc22c3 Added Reactivation and Deactivation Temps 2022-02-02 07:03:22 -05:00
Peter Yefi
702c8c4103 Changed names of insel generated output files 2022-01-29 09:43:57 -05:00
Peter Yefi
ddbc047640 Fixed and merged conflicts 2021-12-15 09:30:53 +00:00
Peter Yefi
286a03441f Added unit test for water to water source import 2021-12-15 09:25:56 +00:00
Peter Yefi
02882f5e1c Added water to water heat pump 2021-12-15 09:19:10 +00:00
atiya
02d120add9 Contributors added in LCA code 2021-11-22 20:57:29 -05:00
Pilar
1e2234e4b4 Added 1 to fit with the length needed by FAST_READD 2021-11-18 13:07:49 -05:00
d2d86bc942 Test driven partial corrections 2021-11-16 12:27:49 -05:00
a692f9c22a Test driven partial corrections 2021-11-16 07:57:47 -05:00
atiya
d76ea58b74 Added LCA formulas 2021-11-15 11:07:16 -05:00
atiya
cc56c19aa0 added Machine and Vehicle classes to Life Cycle Assessment 2021-11-15 11:07:16 -05:00
9837bb8427 Base implementation for the fuel life cicle analisis 2021-11-15 11:06:55 -05:00
Guillermo Gutierrez Morote
b87cfea509 Update test_doe_idf.py 2021-11-15 11:03:04 -05:00
e5e339841c testing something with sanam 2021-11-15 11:02:52 -05:00
Pilar
3adf8c9604 created customized imports factory and correspondent test 2021-11-15 11:02:52 -05:00
Pilar
2af8bf5db3 created customized imports factory and correspondent test 2021-11-15 11:02:52 -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
7529a3719a Merge remote-tracking branch 'origin/master' 2021-11-15 09:47:23 -05:00
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
35864ee67a Added unittest for energy system factory 2021-11-12 10:11:56 +00:00
c07a6f6c34 Base implementation for the fuel life cicle analisis 2021-11-12 04:41:17 -05:00
b7de8ad53a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	unittests/test_doe_idf.py
2021-11-11 11:51:22 -05:00
8c12ac19a1 testing something with sanam 2021-11-11 11:50:07 -05:00
Guillermo Gutierrez Morote
d6323362a3 Update test_doe_idf.py 2021-11-11 16:49:21 +00:00
Pilar
ef6afb0ab4 created customized imports factory and correspondent test 2021-11-05 10:16:35 -04:00
Pilar
688ba9bd37 created customized imports factory and correspondent test 2021-10-25 18:05:51 -04:00
ba72bd9043 Partial test corrections 2021-09-23 09:17:23 -04:00
5752c5d31d Small corrections in doe_idf import 2021-09-16 13:45:27 -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
d4056c4fb8 Review overall code quality and refactor tests folders 2021-08-30 11:38:28 -04:00