Commit Graph

795 Commits

Author SHA1 Message Date
atiya
02d120add9 Contributors added in LCA code 2021-11-22 20:57:29 -05:00
atiya
b4a0b25792 LCA material class 2021-11-18 17:14:58 -05:00
atiya
dff87c2390 LCA materials XML 2021-11-18 17:13:27 -05:00
Pilar
e3a5d73c38 just making material parameters optional 2021-11-18 17:02:19 -05:00
Pilar
be0db6d347 extra material deleted 2021-11-18 16:57:27 -05:00
atiya
1426a7aaa4 Merge remote-tracking branch 'origin/master' 2021-11-18 16:56:05 -05:00
atiya
01ff8ddcf3 LCA materials XML 2021-11-18 16:55:49 -05:00
Pilar
1e2234e4b4 Added 1 to fit with the length needed by FAST_READD 2021-11-18 13:07:49 -05:00
atiya
5246cb27ee Merge remote-tracking branch 'origin/master' 2021-11-16 14:25:35 -05:00
atiya
5a686f867a LCA materials XML 2021-11-16 14:25:25 -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
155daa47b7 Correct merge mistake 2021-11-16 07:37:27 -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
Pilar
61e5e95c0c Added new values to configuration.ini for comnet usage 2021-11-15 11:07:16 -05:00
Pilar
da17cd5d82 Changed hard-coded values to constant values 2021-11-15 11:07:16 -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
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
beec608229 import changes into typevar to avoid circular references when documentation is created 2021-11-15 11:02:51 -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
Pilar
0a75cf46e6 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
Pilar
41f79b189a added the belonging specific edges and nodes to origind-destination and traffic networks 2021-11-15 11:02:42 -05:00
Pilar
7af71db19d modified name of class due to an error in the format 2021-11-15 11:02:40 -05:00
atiya
c04c3d5f5a Types of properties are added 2021-11-15 10:43:35 -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
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