From be10bc81f14138541997b8319a3d93cfe1c10e4a Mon Sep 17 00:00:00 2001 From: Peter Yefi Date: Fri, 8 Apr 2022 13:38:32 -0400 Subject: [PATCH] Changed air source filename. Cleanup --- .../__pycache__/greenery_content.cpython-38.pyc | Bin 0 -> 1232 bytes .../greenery/__pycache__/plant.cpython-38.pyc | Bin 0 -> 2642 bytes .../__pycache__/plant_percentage.cpython-38.pyc | Bin 0 -> 1009 bytes .../greenery/__pycache__/soil.cpython-38.pyc | Bin 0 -> 3298 bytes .../__pycache__/vegetation.cpython-38.pyc | Bin 0 -> 5030 bytes .../__pycache__/__init__.cpython-38.pyc | Bin 163 -> 0 bytes .../__pycache__/heat_pump_export.cpython-38.pyc | Bin 8925 -> 0 bytes exports/energy_systems/air_source_hp_export.py | 2 +- .../energy_systems/air_source_hp_parameters.py | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 catalogs/data_model/greenery/__pycache__/greenery_content.cpython-38.pyc create mode 100644 catalogs/data_model/greenery/__pycache__/plant.cpython-38.pyc create mode 100644 catalogs/data_model/greenery/__pycache__/plant_percentage.cpython-38.pyc create mode 100644 catalogs/data_model/greenery/__pycache__/soil.cpython-38.pyc create mode 100644 catalogs/data_model/greenery/__pycache__/vegetation.cpython-38.pyc delete mode 100644 exports/energy_systems/__pycache__/__init__.cpython-38.pyc delete mode 100644 exports/energy_systems/__pycache__/heat_pump_export.cpython-38.pyc diff --git a/catalogs/data_model/greenery/__pycache__/greenery_content.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/greenery_content.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..dc52456766e1b52c7da756f410cd28336ac687c0 GIT binary patch literal 1232 zcma)4!D<^Z5Y?{N>&+%^FHI=qBHBaoA>QC#N+~5F0aFNRAfyyu#AYSiO61j6k_$Gz zCHMY8uO+|H&)94KqNk3uw&R)vqGe`BqtWQio4IH$DKMZU8EGpXS+*JXngBF&91L!u=Yx)qdxW};tiu11CPpt_5>LuvzF`uioh z&`jy1V8H2w^?7p4^tF*iLglDP)pa8HrB3Dz(+P#nk&&cKB!hW3mj;=)vt3Neh!CE0 zLr7%n2|*z*gm3zCjfD0hF!OBCd|BIyW5eE_p(|JY^i7Om9SVW(i^Dv}X2=#}>*b^!dal8iMKNH6z=>Px# literal 0 HcmV?d00001 diff --git a/catalogs/data_model/greenery/__pycache__/plant.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/plant.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7a5d1110a90312fd0e30422502b1e010afb52c79 GIT binary patch literal 2642 zcma)8&2Hm15EgA&wiW;6XS3OMw=L6M6!0PTBHL426xnWyAZ?HhHdvrAP!Nj9ILgYB zLdtC&q^IQ2hbW5nm>1{+^f7epsjtveXDF#woH#HI&J4*R=hKk<=(o+LZ9w^L_4Uz< zs$u+%jbbT7V+*SK7z8)^1}D7alVPb}CdQ7z%iO#&xOrLXo4j&pbga>z;ArniAp#-C z)OBLV4+oTkro)g6pC0&55L4H8l(G*Gw!fnrbkB1|pafXETm-Rq>0$VVnSmJs`>?lF!}_tQNnCo8U3;_ z(@b2Feg*6bx2_DZEwHP+rtK=&b#80B2KEAPXuA$}lee^OgWcwf+Fk&Ai7#urAxzO6 z5Wey&;Sc!gl?iLN_(RC|T2j&ZbaA8df>0|^UqMwI#6{`UxG)&GARtT7DuXsbS3p~! ztDtM3>!5AW3!odIo1j|*oZE)h;KSn-}c@rAyqFDaL~u%*z0Wz^)3#h9uJ3+Bj5FK#a?!)R1a?z z)3>TO$ZlLuFWZgANsU1!y_m5DJO&Rz7^FrlsFR;XY;xYxC#ajdy98acf;Lutlq@h{ z^Yvz*Ke8#59T8IZZ)t`3oS_^ydu1EoJK6;H5BpzD=LvmH z&Yw<&#tT64-cWsSatui8cVS4{Qx|QcfM+$uGvzT4Fo`*Zoo~zvyQCK_-rY|Nf!7Lw zi$3#&?##%^gah)Nv}S=zb26Fmc>!86Clil3f%T>~E8`oQ^9`NwO%8H#7RblYJ%2#DlLw@mKOkMqltgw;q2TPhpd_^~(hvU<-v@=fZd#4MynITb=rOX;CLL<;Gxgp!hgDTLGzQi?8%qFp;m)?Rg2J~;T6 zK;ELXM?XgU7<=uhkInn|kl*O6O9aj_9QzuS zAQ=%<1d0xWETp7ML@1&MA|e^yhgl>V7o^i1|AbfLu90#i&4d+sohvKeY;0=;z!7mj@ch9nsUHo+t5Q{?l|%0d~<+1%5t@kk<)HGxgT z?fP`Rr_l=pycD$YU~;<$swVg3JDmp8@JB$&luii`1i2tHdfo|L!;XQWYjIwV%9?Yx z#aB!_k&CQUeHX7{Zl^->99AL++Du%-`!nh`Irlr@d`A9#PA{!AHmxKOp2&Wgo=SUL z>nas`Smow6RppgU7mKwiZkGGarh~=S(|Ms)=>*o)go(CrG(R)lp?7=FXe7%~3iubF z1Z_Mga4aU7k{f_vFinS=jrrAr%j`Uhqp=Zg6!2U37EfOr-kfs6B7DG0GP(;R2Dw`fD z2XK(P_91q)`#iv2V2`2Oy~VC}4lUVIA_tPeb3T!WJl~YawF-h6$Htz)OqP3Ru-x0+vB~C+j8=a5Hw;>PlJh>7BjVV;?TId7ph-_K z?vW$mdc^T;rL3dF-CxOLvhO;)uQ;He8Sneq!@P3`dq2NqEp<2{bobQcQ0Ij^x||^j*xj!r%aA$ zd@QKJIZz3s1#J{|2Te8L4xAI`CvN-Gl^WV88lz`07&QDdE_=53>_iDU@a?|CgB2Qf zQajdLQ^K=l+^#`&SHh}s;VSpU<8iwc8g?cuH-2>7ZWqu3+-@UwBbX^mCJ^ zAmLxUHsn1xX#f4vd8N2iodJi-I^w5pXP2utz8G|v=nZW7rsKIMsuSh~)xpF7!9rr_ zbi<_4!S&jMQBbCu2c=~^$Cz~tvz+p~tl~LpN7jysmf?dKo4yJ~09VGjKD3u>7J+Av z`vmwRdE=SA&#GC!mHjih_Hc_e=GA{Hg|ox%cc=8e0$5u?=9lx|vNWcJ`Tv+%k{ zq@XCJlbT1Dq4B3NKD7y-a4;j4&D&I>q(U&MM19dO;8?4G2qf4>9QxW z0?7v`K14xKJVfyk3M>S26U7#aM<}KxOe0-Eu^MA}QEd=V&Z{}oDrRdE=N`a^M~PA< W97=UZnwOyb-8iuCaf&XP`QrZwmRCRk literal 0 HcmV?d00001 diff --git a/catalogs/data_model/greenery/__pycache__/vegetation.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/vegetation.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6d2b673ab8c7d3cbdff91450f9ed5f946f128c06 GIT binary patch literal 5030 zcma)9OK;mo5GG|wmg$FN+43W?9XgJiD2XM}+1>D4dk)SY85Hxo!)22ja zNg0q~Uuxfa>$%81zoEDO3|@O_{z6ZkS-w^;gA};?ad$ZT&1iNw`+j^}k>L7NdUxI4gLn`CQp>n{*gwi%@j z%G#=-ySio9R06$Pw+Xe>541*I-8JooYFN7CD0{nGzo={Kj%m<_LjnCnXu~xRP0C)V zJKMWEF!Z>x4z119HA{CXQ{LFkHZyBSuKM?9bz^;FL)~TeF*RKEb;~^hx$Tx|Srj@K z)G&Ic*7yLc+m%{4R=1h$(oMr|7&arOUNLm#3(%L!vX|er^oF}j8IW@I8Z~fSywdQn z3AghvG*sG`!8Ii)4!9alq50#PI~+88XXp9`GEQ=ePj)2D!=cB;WjC1^@3|Pl^9O1AP!)h*NOCf!p~6&3Wor zI+ry0T!uCUPeahBq0c~{g?O}r2Qg7^)edoMl^_4TC-W(%ezOWanhiU z^X_oZHZ3o&InZg*u&31Z282Z&qQe{2gomtdvTeQT8jRfqy!0rra1AvqaK26JA?X;K3=l<_0g-B{;r zEEx)DM2-4^4?;)89q>eOYX@w06@FiPLp4Hw=2Fjy=S)lMT>tsV$#;59D2%&23M zmTnDJc;8nT3SO&DH5;aDUZ<_>YYXJARaVrRn02&fly;nQ8sdjqhh8oUPUSSppx$K9 z3!f!+4|d;wyVds&Wlpt8Az!xXp;_Ic&WUR`tHiE1b#_v<%mb$yBxt9K85+C=8M;~v zvUfFJsM2ghL~Ce-rr{@pe-I=&CuiZtpVIetHWjCfO8CAZgM#ovj5p64SpetKG2fqO zi;4=@Hg(mQhl=}$kC$bZ0qM^&y8|7!*>B4Dh}mcnZU0QVB`T zMWo{V7ZSo4=|_l-z{G~Yq9m}0)g)w4iWoq$RUz4i%a09M-Wv|G@^gVgQJ@e^Lj{m! z6tYaCg9(;H7+O47p8z281$^F)r7h{#;zjCQc4he3q%P%W(uMp{IfruKB+V-B5E;6Z zf8&zy=}Dj6ig@$=s|p*Q&(uIQzrGOY&YnO%R=Xu3^I#k};_iSa`;;>E(fayoIn7q! zWiNAR*^twfcn$c5>sE_?&zQ~1L;n7GgrbG+Y|%qUa9t3by;Sz$Ow%$f9ejMPKGHvukdT<%A+LpmYZ)lRZOMW*t) zi&tbJ+qpq(=Ypi(Q?S_r-xY!HAo+xhyJD0Ve|`Ag7{qsmuisNMo(gP5@Aj8Y$hFJ6 zLG9Ux?ZP0ozIXc+trr5{9`E*%PssRrXFSA(u^LyqaKiRWV@wWM?S?V3G{}kvz84df z&R2qAPrJh==5t+zo6y#0owkOBcoIw1L6(-erJ<_pNd7L^`J~&!XjS1d=Tb{-90DgBh4bHZBa%fqI$29FDoUZ&Cb|2R9a!qDK z_2IU8SIDo}en- brI2qZD(T1A%f0gb_#GBW4py4!>{#l5dp;@? literal 0 HcmV?d00001 diff --git a/exports/energy_systems/__pycache__/__init__.cpython-38.pyc b/exports/energy_systems/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 2c72bf79a0ddfec56d36678103fa2610d83ed71b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmWIL<>g`kf`3iF5<&E15P=LBfgA@QE@lA|DGb33nv8xc8Hzx{2;!HAerR!OQL%nO zYDsEQWolZczDsIxc1eDLeoB6BL1Iz1eokgmv3_brL4HvQkj_gjO0SGBt}HG|%`MiC fkI&4@EQycTE2zB1VUwGmQks)$2eRQa5HkP({PQYb diff --git a/exports/energy_systems/__pycache__/heat_pump_export.cpython-38.pyc b/exports/energy_systems/__pycache__/heat_pump_export.cpython-38.pyc deleted file mode 100644 index f72a477ebe7ebf26c9941029c35997cf0293427f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8925 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 u;Dgu))7Yl diff --git a/exports/energy_systems/air_source_hp_export.py b/exports/energy_systems/air_source_hp_export.py index 29daa827..5e99b2a9 100644 --- a/exports/energy_systems/air_source_hp_export.py +++ b/exports/energy_systems/air_source_hp_export.py @@ -21,7 +21,7 @@ class AirSourceHPExport(HeatPumpExport): :param base_path: path to energy system files :param city: the city object :param output_path: the file to hold insel simulation results - :param sim_type: the simulation type to run: 1 for series, 0 for parallel + :param sim_type: the simulation type to run: 0 for series, 1 for parallel """ tmp_file = 'heat_pumps/as_series.txt' if sim_type == 0 else 'heat_pumps/as_parallel.txt' template_path = (base_path / tmp_file) diff --git a/imports/energy_systems/air_source_hp_parameters.py b/imports/energy_systems/air_source_hp_parameters.py index decb6617..72cf41e8 100644 --- a/imports/energy_systems/air_source_hp_parameters.py +++ b/imports/energy_systems/air_source_hp_parameters.py @@ -22,7 +22,7 @@ class AirSourceHeatPumpParameters: def __init__(self, city, base_path): self._city = city - self._base_path = (base_path / 'heat_pumps/Air source.xlsx') + self._base_path = (base_path / 'heat_pumps/air_source.xlsx') def _read_file(self) -> Dict: """