Commit Graph

592 Commits

Author SHA1 Message Date
024469ac0a Link materials and lca_materials in the city 2022-03-02 12:56:20 -05:00
6668c48039 Merge remote-tracking branch 'origin/master' 2022-03-02 12:13:16 -05:00
6b9e09ba88 Partial commit for dompark project including sensors, lca materials and overall improvements 2022-03-02 12:13:11 -05:00
atiya
0870d12029 Machines added into City class 2022-03-02 12:12:17 -05:00
atiya
a40c1a0154 Machines added into City class 2022-02-22 16:24:12 -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
659df7079c Merge remote-tracking branch 'origin/master' 2022-02-17 12:37:33 -05:00
Pilar
e74fa4dfe9 modified doe_idf.py to save on new schedule format 2022-02-17 12:37:14 -05:00
becc8f6068 Rhino implementation for dompark project. 2022-02-17 11:35:34 -05:00
49bfc6eec9 Rhino implementation partially completed, need to be fully tested 2022-02-16 15:08:05 -05:00
sanam
b54048f7db Adding the LoD1 EV Building gml file 2022-01-08 12:33:07 -05: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
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
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
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