Commit Graph

681 Commits

Author SHA1 Message Date
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
Peter Yefi
883461782c Added option for running series or parallel simulation 2022-02-26 11:47:23 -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
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
Peter Yefi
e692f99316 Removed deprecated pandas method 2022-02-17 13:56:42 -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
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
81bb8a1795 Added additional parameter to method for running insel 2022-01-29 09:42:34 -05:00
Peter Yefi
34fbd393aa Added constants for w2w hp 2022-01-29 09:41:17 -05:00
Peter Yefi
e948b69349 Refactored variable names 2022-01-26 10:42:44 -05:00
Peter Yefi
aa7463cb9d Added separate classes of water to water and air source hp. Refactored energy systems factory 2022-01-26 10:42:01 -05:00
Peter Yefi
a7ac455d65 Renamed template for air source hp data 2022-01-26 10:40:41 -05:00
Peter Yefi
f728685c65 Renamed certain variables and added comments for insel required coefficients 2022-01-26 10:40:14 -05:00
Peter Yefi
ecc8bfcbb1 Added comments for a and b insel coefficient values 2022-01-26 10:39:26 -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
f8d2aab9f5 Updated file with DS_Store 2021-12-15 09:26:42 +00:00
Peter Yefi
12181cc12b Included required data for importation 2021-12-15 09:26:14 +00:00
Peter Yefi
286a03441f Added unit test for water to water source import 2021-12-15 09:25:56 +00:00
Peter Yefi
f6354586d6 Added method for importing water to water source. Made some modifications to reflect data source 2021-12-15 09:25:37 +00:00
Peter Yefi
93160912c3 Added a module for importing water to water source heat pump 2021-12-15 09:24:52 +00:00
Peter Yefi
1ed60762c3 Added water to water heat pump model 2021-12-15 09:22:44 +00:00
Peter Yefi
d703b8c8cf Made heat pump a parent class for air source and water to water sources heat pumps 2021-12-15 09:22:20 +00:00
Peter Yefi
680b635025 changed heat_pump to air source to reflect data source 2021-12-15 09:20:08 +00:00
Peter Yefi
02882f5e1c Added water to water heat pump 2021-12-15 09:19:10 +00:00
Peter Yefi
179efbc4fb Excluded pycache from git files 2021-12-09 09:01:06 +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
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