Commit Graph

964 Commits

Author SHA1 Message Date
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
9d2d115549 Merge branch 'master' of https://rs-loy-gitlab.concordia.ca/Guille/libs 2021-11-15 08:29:16 -05:00
atiya
075e03396d Added LCA formulas 2021-11-15 08:28:50 -05:00
atiya
1d9498cf26 Added LCA formulas 2021-11-15 08:24:03 -05:00
atiya
97ec2a1436 added Machine and Vehicle classes to Life Cycle Assessment 2021-11-13 00:55:04 -05:00
Peter Yefi
8cb8cc5f9c updated file with output files generated by insel 2021-11-12 10:21:37 +00:00
Peter Yefi
fee9dc5808 Modified xlsx heat pump method 2021-11-12 10:19:55 +00:00
Peter Yefi
bc762e4844 Added export method to export factory 2021-11-12 10:16:22 +00:00
Peter Yefi
a06ad62ec7 Added parameter for caller to specify output file path 2021-11-12 10:14:54 +00:00
Peter Yefi
216dbf6d7c updated file with output files generated by insel 2021-11-12 10:12:38 +00:00
Peter Yefi
35864ee67a Added unittest for energy system factory 2021-11-12 10:11:56 +00: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
593a3f8b8e Added new values to configuration.ini for comnet usage 2021-11-11 17:28:28 -05:00
Pilar
3babe097f2 Changed hard-coded values to constant values 2021-11-11 17:27:19 -05:00
Pilar
1657808b77 Merge remote-tracking branch 'origin/master' 2021-11-11 17:26:18 -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
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
Peter Yefi
b7d1197a2b Added method to write user output 2021-11-10 16:58:01 +00:00
Peter Yefi
ebe5439f02 Fixed issue with coefficient computation 2021-11-10 10:17:01 +00:00
Peter Yefi
f6de5b6f96 Modified export_heat_pump to run insel instead of exporting to CSV 2021-11-10 10:14:31 +00:00
Peter Yefi
c7d569b688 Added methods to run insel and write output files 2021-11-10 10:13:17 +00:00
Peter Yefi
102e6ae2d4 Added return type to objective_function 2021-11-08 16:37:58 +00:00
Peter Yefi
2976434bc7 Updated requirement file with PyYAML 2021-11-08 16:37:16 +00:00
Peter Yefi
e505351853 Removed heat pump constants 2021-11-08 16:33:43 +00:00
Peter Yefi
45f682767d Added heatpump export module 2021-11-08 16:33:24 +00: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
Peter Yefi
545c58a5f1 Modified heat pump import to compute coefficient of performance data 2021-11-01 14:53:51 +00:00
Peter Yefi
c221c9876f Added attributes for heatpump coefficients 2021-11-01 14:52:38 +00:00
Peter Yefi
12f8beb0d2 Included energy system export factory 2021-10-29 15:28:10 +00:00
Peter Yefi
20ca5a0fc3 Included export for heat pump energy system 2021-10-29 15:27:25 +00:00
Peter Yefi
ae0e2a905f Fixed error with reading cooling data 2021-10-29 15:26:48 +00:00
Peter Yefi
4eea12a069 Included scipy for heat pump coefficient computation 2021-10-29 15:25:53 +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
Peter Yefi
ca191ab480 Renamed variables, changed indentation to 2 spaces 2021-10-26 11:11:19 +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
cbc24917c1 import changes into typevar to avoid circular references when documentation is created 2021-10-25 13:28:43 -04:00
Pilar
f820816f12 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-22 13:13:12 -04:00
Pilar
c34e64eb56 added the belonging specific edges and nodes to origind-destination and traffic networks 2021-10-22 11:28:22 -04:00
Peter Yefi
e0924cf45f Implemented enriching city with energy systems 2021-10-21 13:50:02 +00:00
Peter Yefi
567fde0012 Included energy systems attribute 2021-10-21 13:49:26 +00:00
Pilar
bb5351da27 modified name of class due to an error in the format 2021-10-20 10:24:01 -04:00
Peter Yefi
df3f33b45a Added a method to read heat pump data into dictionary 2021-10-20 13:00:59 +00:00