From 5a9bde6c51ebac47bb60e2e1e05457f4dae97a37 Mon Sep 17 00:00:00 2001
From: Peter Yefi <peteryefi@gmail.com>
Date: Thu, 10 Mar 2022 10:43:59 -0500
Subject: [PATCH 1/5] Updated git ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ca8768ed..10a17b31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /development_tests/
 /data/energy_systems/heat_pumps/*.csv
 /data/energy_systems/heat_pumps/*.insel
+.DS_Store
\ No newline at end of file

From be10bc81f14138541997b8319a3d93cfe1c10e4a Mon Sep 17 00:00:00 2001
From: Peter Yefi <peteryefi@gmail.com>
Date: Fri, 8 Apr 2022 13:38:32 -0400
Subject: [PATCH 2/5] 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<V+8Bx_UFqVK0<%&W_8tIa{!`u
zKvC2~T|_<V-y-VY_&tx-&QU8E|AND~s~F3fn&2!osgMJl$=tBq#OG(nU-2G3;Tg*{
z1M3q7H}7+%-s6+**$KGbw)a6xh4(~in2L{NF;RRlH2C)&?(BCu_)N(wmKl6FHbaQ(
zj=2yFeg@JgHpK(yP$StMEPNxWq+thuBa@2qw4J4K22lT7%L?Ctn<1zP_57;FUX2B`
zMuS^)<Mrxb*J<eN5bOqxoZX-sz(HI-U(|n8m7N7E&sZDiMMofx%9%Gq1kHTV-mC`N
zrwGz`r>$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=#}<sw?1
zvUJ{gst!L_Y^CfpE1R+jqHPSSPj}Z*-6z*i1onCftRngmP<EKqmQ|Mj6-W)(z5rQ3
z+F6HGrF|lrS4%Xm-H(8=L-!yU+qK;lFx%^3T-MW8WE-8QBSuIW6FV4VVeKtKzKv5+
zov2O7R7Qo81yg3?$XB*pWuIB$!7<|cV|#BS^fOSA7u9_)4l7ai?6l>>*b^!<LY(8F
QEM@ee0`$>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><Rf9-P<|XgRU3d
z=O9B#H+&}+(tZ_2W9bb}V*1xL-F&{eNe^UrD%_a99K|Q#w=?p5Ux12X87a=`KzGPt
z*d643!%&8?*mA?b4JG%SuIt$U0CJ;467w+hd>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;<oYqgP&pUY5Vu3c=@7yN&X<jIQxbh0EO&#RuVIC
zh9apjt?CT6UkpMyPOKAwTb5K=W;A`_9KV#p*$ue(DOqILW)5^PFYUpOH{#fbo%Me3
z;&HN^`p9Bm3%$M`dP=1}**ap<^WM-4yrJVC#^DeT;~Swo6+3||k|!)1V=5bDax%K;
zhMR}tY$Q}Ho!AQl003P~-RP^cfee3C42G-PdL1N|6GbB6N!|C36jN}TI%Z-j;U6cp
z|1(mF@E$-n3||}aF>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#59T8I<k>ZZ)t`3oS_^ydu1EoJK6;H5<XY&zMRRUpD&h0cf&Ym;y`c&XN
zqc;#BRQVwaOl%=O#{LLu9zXl|e33aZyg!8@J=FQ<*D&N=!GU3oPYS^s>BpzD=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#7Rbl<kkwZO
z!0Tx)@9~}!e0K^wkRQE4e(<_SjtkVBV_%+yed!i)?iLVdyMN0E-eOCNcqD^45kI?y
z7+5p*j^N(_(yYpHuFS$&%gOwp057A6d}zPZMs7vMVl1&467a}JyTRDm$nnz=`2j4E
z)FK&1LdIiFd=lA5A`3{0VjTtkvyx9yJVSv*Es-P&%%wR@(<eUjc(oOJ0FO6I#J29Q
z66fr9D)9C)9=d>YJ%2#DlLw@mKOkMqltgw;q2TPhpd_^~(hvU<-v@=fZd#4<f8$4d
AZ~y=R

literal 0
HcmV?d00001

diff --git a/catalogs/data_model/greenery/__pycache__/plant_percentage.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/plant_percentage.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6bf53447e8b05c79aceb3248928428a5b715fa2f
GIT binary patch
literal 1009
zcmZ9K&1%~~5P)|j*>MynITb=rOX;CLL<;Gxgp!hgDTLGzQi?8%qFp;m)?Rg2J~;T6
zK;ELXM?XgU7<=uhkI<evv$kWCft{ThN%QlKF1NR10`l#}r>nn|kl*O6O9aj_9QzuS
zAQ=%<1d0xWETp7ML@1&MA|e^yhgl>V7o^i1|AbfLu90#i&4d+sohv<H0&X_cLMql%
z`KV@<G=&`1`9QKl<<`a*z0)sjpPiKuwi2w50-l%sQkr+{tlK+-(A(qyv^H#C<+U{N
ziLNH599-Az*Nhz=93HZs(KoWF*@tm`4excwrBV{E8qyef#|A!NhB_H6V?%9pEsqO5
zDzp)0o)mff2ZkUW>KeY;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`U<U9>hqp<x41B)EI|yxyw8&IW=U<wFS|V~+ET
z720jizm9V?f8u9wt;%TlvYz+?ZhHZ*kV<jB)<YYL8s7+R6r1tww}N&QP=m2^_$4+t
v7rKB-ua-oU713l#H1R|Y4&q|u&*uTmvR2Xqz>=<YG#}wTqVve3W;^%~aGDEJ

literal 0
HcmV?d00001

diff --git a/catalogs/data_model/greenery/__pycache__/soil.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/soil.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..61391775bccf68fb74b7b1f106694280f0b37d84
GIT binary patch
literal 3298
zcma)8-EP}96qX$SDsf^vagudi$1X`XZ>Zg6!2U37EfOr-kfs6B7DG0GP(;R2Dw`fD
z2XK(P_91q)`#iv2V2`2Oy~VC}4lUVIA_tPeb3T!WJl~<obM&fOwG4RvYQ8wxsTjt;
z_!58S;N>YawF-h6$Htz)OqP3Ru-x0+vB~C+j8=a5Hw;>PlJh>7BjVV;?TId7ph-_K
z?vW$mdc^T;rL3dF-CxOLvhO;)uQ;He8Sne<smtZJWPk5)AG*G1KLIHudF<Ifm)4FL
zjHKH=^T|KgWc$hXHaV2yoI5^wHuTTHZg1#%9tY*aGLm1CuI`XM(e6flJt2k9pE{!N
z2+3T#?bwzB#1qdX-anz68xWy!oEt}cJje5Fj^*DOZ_VQZ-~uaZTm)QVWsOUKE6mck
z40xU`Xj}nYWs4eHfR|WJ<9Wb!*3ftX@G@J`xC*$*RyAG(yvEiwUSjXTj^7LNxT8)k
z#vL)X9cb!z5Lf28ab-{wbPn_!=sf5G=pyJ6=rZUEXbbc_=mpSK(2Jm#K-WOmK{r4z
zgI)pMWCk!W4_d21zHj$<P@q~>q!@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<axUrR}?-|5|v%9`~i|JQuElUcMvx
zKAiR7V>-2>7ZWqu3+-@UwBbX^mCJ^<H+!uu8rj^r5^?*k@7}f0CJjyQTBnr@@``(>
zAmLxUHsn1xX#f4vd8N2iodJi-I^w5pXP2utz8G|v=nZW7rsKIMsuSh~)xpF7!9rr_
zbi<_4!S&jMQBbCu2c=~^$Cz~tvz+p~tl~LpN7jysmf?dKo4yJ~09VGjKD3u>7J+Av
z`vm<FJh-~2WlFsH*QQ(trK1{)_wg04RTG-h_pNYQ(XMfFMz{BqZYQ@R@?AhLAE3bf
zjCsz(>wRdE=SA&#GC!mHjih_Hc_e=GA{Hg|ox%cc=8e0$5u?=9lx|vNWcJ`Tv+%k{
zq@XCJlbT1Dq4B3NKD7y-a4;j4&D&I>q(U&MM1<yN5vn7hXo}85pT}sePG}`eGLqX$
zk_$5#(V0xAw}@SJ7Q5w??Duty-@4|PVw92LjWecmXbQijS^Vm^vhEKtcH`Z<Ws;HG
zjol0Lb_%=tEOyH&x&Fr(zwz#+7-eMmP4fSpmIpE|5AZ29E+cq(u{=co`SL8*kEZL~
zmDHcd0{KiIgKYCM#`aY*wy0cXi42o&YDU_OR=F##m$A57I<73UGDh`fGODn4W(jI-
zR!|!m3h-~Sm_E@lWteo(s$pHlf<-BOonh@AdWaV&{R2KP#v>9dO;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
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
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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

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:
     """

From 04d13e50d1659ca19e8f2000002a9475ad50d3ba Mon Sep 17 00:00:00 2001
From: Peter Yefi <peteryefi@gmail.com>
Date: Mon, 25 Apr 2022 15:16:22 -0400
Subject: [PATCH 3/5] modified ignore file

---
 .gitignore                                       |   3 ++-
 .../__pycache__/greenery_content.cpython-38.pyc  | Bin 1232 -> 0 bytes
 .../greenery/__pycache__/plant.cpython-38.pyc    | Bin 2642 -> 0 bytes
 .../__pycache__/plant_percentage.cpython-38.pyc  | Bin 1009 -> 0 bytes
 .../greenery/__pycache__/soil.cpython-38.pyc     | Bin 3298 -> 0 bytes
 .../__pycache__/vegetation.cpython-38.pyc        | Bin 5030 -> 0 bytes
 6 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 catalogs/data_model/greenery/__pycache__/greenery_content.cpython-38.pyc
 delete mode 100644 catalogs/data_model/greenery/__pycache__/plant.cpython-38.pyc
 delete mode 100644 catalogs/data_model/greenery/__pycache__/plant_percentage.cpython-38.pyc
 delete mode 100644 catalogs/data_model/greenery/__pycache__/soil.cpython-38.pyc
 delete mode 100644 catalogs/data_model/greenery/__pycache__/vegetation.cpython-38.pyc

diff --git a/.gitignore b/.gitignore
index 10a17b31..f6fcde6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 /development_tests/
 /data/energy_systems/heat_pumps/*.csv
 /data/energy_systems/heat_pumps/*.insel
-.DS_Store
\ No newline at end of file
+.DS_Store
+libshortwave.dylib
\ No newline at end of file
diff --git a/catalogs/data_model/greenery/__pycache__/greenery_content.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/greenery_content.cpython-38.pyc
deleted file mode 100644
index dc52456766e1b52c7da756f410cd28336ac687c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1232
zcma)4!D<^Z5Y?{N>&+%^FHI=qBHBaoA>QC#N+~5F0aFNRAfyyu#AYSiO61j6k_$Gz
zCHMY8uO+|H&)94KqNk3uw&R)vqGe`BqtWQio4IH<V+8Bx_UFqVK0<%&W_8tIa{!`u
zKvC2~T|_<V-y-VY_&tx-&QU8E|AND~s~F3fn&2!osgMJl$=tBq#OG(nU-2G3;Tg*{
z1M3q7H}7+%-s6+**$KGbw)a6xh4(~in2L{NF;RRlH2C)&?(BCu_)N(wmKl6FHbaQ(
zj=2yFeg@JgHpK(yP$StMEPNxWq+thuBa@2qw4J4K22lT7%L?Ctn<1zP_57;FUX2B`
zMuS^)<Mrxb*J<eN5bOqxoZX-sz(HI-U(|n8m7N7E&sZDiMMofx%9%Gq1kHTV-mC`N
zrwGz`r>$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=#}<sw?1
zvUJ{gst!L_Y^CfpE1R+jqHPSSPj}Z*-6z*i1onCftRngmP<EKqmQ|Mj6-W)(z5rQ3
z+F6HGrF|lrS4%Xm-H(8=L-!yU+qK;lFx%^3T-MW8WE-8QBSuIW6FV4VVeKtKzKv5+
zov2O7R7Qo81yg3?$XB*pWuIB$!7<|cV|#BS^fOSA7u9_)4l7ai?6l>>*b^!<LY(8F
QEM@ee0`$>dal8iMKNH6z=>Px#

diff --git a/catalogs/data_model/greenery/__pycache__/plant.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/plant.cpython-38.pyc
deleted file mode 100644
index 7a5d1110a90312fd0e30422502b1e010afb52c79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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><Rf9-P<|XgRU3d
z=O9B#H+&}+(tZ_2W9bb}V*1xL-F&{eNe^UrD%_a99K|Q#w=?p5Ux12X87a=`KzGPt
z*d643!%&8?*mA?b4JG%SuIt$U0CJ;467w+hd>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;<oYqgP&pUY5Vu3c=@7yN&X<jIQxbh0EO&#RuVIC
zh9apjt?CT6UkpMyPOKAwTb5K=W;A`_9KV#p*$ue(DOqILW)5^PFYUpOH{#fbo%Me3
z;&HN^`p9Bm3%$M`dP=1}**ap<^WM-4yrJVC#^DeT;~Swo6+3||k|!)1V=5bDax%K;
zhMR}tY$Q}Ho!AQl003P~-RP^cfee3C42G-PdL1N|6GbB6N!|C36jN}TI%Z-j;U6cp
z|1(mF@E$-n3||}aF>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#59T8I<k>ZZ)t`3oS_^ydu1EoJK6;H5<XY&zMRRUpD&h0cf&Ym;y`c&XN
zqc;#BRQVwaOl%=O#{LLu9zXl|e33aZyg!8@J=FQ<*D&N=!GU3oPYS^s>BpzD=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#7Rbl<kkwZO
z!0Tx)@9~}!e0K^wkRQE4e(<_SjtkVBV_%+yed!i)?iLVdyMN0E-eOCNcqD^45kI?y
z7+5p*j^N(_(yYpHuFS$&%gOwp057A6d}zPZMs7vMVl1&467a}JyTRDm$nnz=`2j4E
z)FK&1LdIiFd=lA5A`3{0VjTtkvyx9yJVSv*Es-P&%%wR@(<eUjc(oOJ0FO6I#J29Q
z66fr9D)9C)9=d>YJ%2#DlLw@mKOkMqltgw;q2TPhpd_^~(hvU<-v@=fZd#4<f8$4d
AZ~y=R

diff --git a/catalogs/data_model/greenery/__pycache__/plant_percentage.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/plant_percentage.cpython-38.pyc
deleted file mode 100644
index 6bf53447e8b05c79aceb3248928428a5b715fa2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1009
zcmZ9K&1%~~5P)|j*>MynITb=rOX;CLL<;Gxgp!hgDTLGzQi?8%qFp;m)?Rg2J~;T6
zK;ELXM?XgU7<=uhkI<evv$kWCft{ThN%QlKF1NR10`l#}r>nn|kl*O6O9aj_9QzuS
zAQ=%<1d0xWETp7ML@1&MA|e^yhgl>V7o^i1|AbfLu90#i&4d+sohv<H0&X_cLMql%
z`KV@<G=&`1`9QKl<<`a*z0)sjpPiKuwi2w50-l%sQkr+{tlK+-(A(qyv^H#C<+U{N
ziLNH599-Az*Nhz=93HZs(KoWF*@tm`4excwrBV{E8qyef#|A!NhB_H6V?%9pEsqO5
zDzp)0o)mff2ZkUW>KeY;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`U<U9>hqp<x41B)EI|yxyw8&IW=U<wFS|V~+ET
z720jizm9V?f8u9wt;%TlvYz+?ZhHZ*kV<jB)<YYL8s7+R6r1tww}N&QP=m2^_$4+t
v7rKB-ua-oU713l#H1R|Y4&q|u&*uTmvR2Xqz>=<YG#}wTqVve3W;^%~aGDEJ

diff --git a/catalogs/data_model/greenery/__pycache__/soil.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/soil.cpython-38.pyc
deleted file mode 100644
index 61391775bccf68fb74b7b1f106694280f0b37d84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3298
zcma)8-EP}96qX$SDsf^vagudi$1X`XZ>Zg6!2U37EfOr-kfs6B7DG0GP(;R2Dw`fD
z2XK(P_91q)`#iv2V2`2Oy~VC}4lUVIA_tPeb3T!WJl~<obM&fOwG4RvYQ8wxsTjt;
z_!58S;N>YawF-h6$Htz)OqP3Ru-x0+vB~C+j8=a5Hw;>PlJh>7BjVV;?TId7ph-_K
z?vW$mdc^T;rL3dF-CxOLvhO;)uQ;He8Sne<smtZJWPk5)AG*G1KLIHudF<Ifm)4FL
zjHKH=^T|KgWc$hXHaV2yoI5^wHuTTHZg1#%9tY*aGLm1CuI`XM(e6flJt2k9pE{!N
z2+3T#?bwzB#1qdX-anz68xWy!oEt}cJje5Fj^*DOZ_VQZ-~uaZTm)QVWsOUKE6mck
z40xU`Xj}nYWs4eHfR|WJ<9Wb!*3ftX@G@J`xC*$*RyAG(yvEiwUSjXTj^7LNxT8)k
z#vL)X9cb!z5Lf28ab-{wbPn_!=sf5G=pyJ6=rZUEXbbc_=mpSK(2Jm#K-WOmK{r4z
zgI)pMWCk!W4_d21zHj$<P@q~>q!@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<axUrR}?-|5|v%9`~i|JQuElUcMvx
zKAiR7V>-2>7ZWqu3+-@UwBbX^mCJ^<H+!uu8rj^r5^?*k@7}f0CJjyQTBnr@@``(>
zAmLxUHsn1xX#f4vd8N2iodJi-I^w5pXP2utz8G|v=nZW7rsKIMsuSh~)xpF7!9rr_
zbi<_4!S&jMQBbCu2c=~^$Cz~tvz+p~tl~LpN7jysmf?dKo4yJ~09VGjKD3u>7J+Av
z`vm<FJh-~2WlFsH*QQ(trK1{)_wg04RTG-h_pNYQ(XMfFMz{BqZYQ@R@?AhLAE3bf
zjCsz(>wRdE=SA&#GC!mHjih_Hc_e=GA{Hg|ox%cc=8e0$5u?=9lx|vNWcJ`Tv+%k{
zq@XCJlbT1Dq4B3NKD7y-a4;j4&D&I>q(U&MM1<yN5vn7hXo}85pT}sePG}`eGLqX$
zk_$5#(V0xAw}@SJ7Q5w??Duty-@4|PVw92LjWecmXbQijS^Vm^vhEKtcH`Z<Ws;HG
zjol0Lb_%=tEOyH&x&Fr(zwz#+7-eMmP4fSpmIpE|5AZ29E+cq(u{=co`SL8*kEZL~
zmDHcd0{KiIgKYCM#`aY*wy0cXi42o&YDU_OR=F##m$A57I<73UGDh`fGODn4W(jI-
zR!|!m3h-~Sm_E@lWteo(s$pHlf<-BOonh@AdWaV&{R2KP#v>9dO;8?4G2qf4>9QxW
z0?7v`K14xKJVfyk3M>S26U7#aM<}KxOe0-Eu^MA}QEd=V&Z{}oDrRdE=N`a^M~PA<
W97=UZnwOyb-8iuCaf&XP`QrZwmRCRk

diff --git a/catalogs/data_model/greenery/__pycache__/vegetation.cpython-38.pyc b/catalogs/data_model/greenery/__pycache__/vegetation.cpython-38.pyc
deleted file mode 100644
index 6d2b673ab8c7d3cbdff91450f9ed5f946f128c06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5030
zcma)9OK;mo5GG|wmg$FN+43W?9XgJiD2XM<Nt5Q$!a>}+1>D4dk)SY85Hxo!)22ja
zNg0q~Uuxfa>$%81zoEDO3|@O_{z6ZkS-w^;gA};?ad$ZT&1iNw`+j^}k>L7NdUx<L
zFG>I4gLn<W!zSF$ZD@$JFA<rfEV-WAPs!4@M21NEN+RjY)cz33>`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`!8<AR&Xu%3MAN=!F6I3U;0(!LNr1C}he?j(VZb9q;W!6)l#FpaLeo^K
z$z=RbnM{!URT|zKh4})R<nv>Ii)4!9alq50#PI~+88XXp9`GEQ=ePj)2D!=cB;W<I
z$Z-+y61m0k6kwGsb36_BHd*1g1o#eF<#>jC1^@3|Pl^9O1AP!)h*NOCf!p~6&3Wor
zI+ry0T!uCUPeahBq0c~{g?<?N9P}exPT^=2#>O}r2Q<M^9#Da!NkB!8rT|TIR01@^
z(JY`jj^+W~;OHix1&$U0EuABWTSNj&<hNzjOE>g7^)edoMl^_4TC-W(%ezOWanhiU
z^X_oZHZ3o&InZg*u&31Z282Z&qQe{2gomtdvTeQT<um|V4Nw|i^%P%&zY?=swIfs?
zDvk$A5RRl}xaO(pw%;9Yu{I|#qY>8jRfqy!0rra1AvqaK26JA?X;K3=l<_0g-B{;r
zEEx)DM<C%9-6P8Cy7l_Nv02mA8wT~}Ll5v7O&6vLj&12o6rS~k`FMwD@ziw81B;5n
zf#zVQLwv>2-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}mcnZU<A6lsU@_G*CrC3d{W{gnvXx
z14*+7*r4MD607it<U$gnFG3{=i7Z4!Fqx=P9tt_+aOFN6yot`dg(4xHdBG>0QVB`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|<UkcR^|sZU_A<Wzw+c3w-yVEeJmB
z*5Y*daPWqojl9BxT-@ptuw1`z@<w>%qUa9t3by;Sz$Ow%$f9ejMPKGHv<ic$_**TK
z-xK)sY_&)#A*q#4*FY_xie*5^tvHBVsc-eLFHjWf@=9OfgiM!unFeJ@NOF1*$wIVl
z@P;n%yD9vo-Es-3-RY$k);%iLJt4uFK?G-_g~RuFy>ukdT<%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~&<BnlE*`Lxr@;DC_C
z$lHUAyvL19aMbuiu<>!XjS1d=Tb{-90DgBh4bHZBa%fqI$29FDoUZ&Cb|2R9a!qDK
z_2IU8S<bL5W)HE!T9B<_gWqk2)dj<<ihYgEQ*54L^9?pwv9TA}yu{`eHs50N9X4_4
z%@IEYV6}!zI6puGXOyXwtYmxd;%M(!KRFy@sPiox%7!(K*aq0U7M`Fg@d>IDo}en-
brI2qZD(T1A%f0gb_#GBW4py4!>{#l5dp;@?


From d5565530c1a157eb8ac2eb813e9e4ea49d947096 Mon Sep 17 00:00:00 2001
From: guille <guillermo.gutierrezmorote@concordia.ca>
Date: Tue, 26 Apr 2022 19:41:00 -0400
Subject: [PATCH 4/5] Merge initial version for Catalogs as factories data
 sources

---
 .../construction/construction_helpers.py       |  3 ++-
 catalog_factories/construction/nrel_catalog.py |  2 --
 .../data_models/construction/archetype.py      | 10 ----------
 data/construction/us_archetypes.xml            | 18 +++++++-----------
 data/construction/us_constructions.xml         |  4 ++--
 imports/geometry/helpers/geometry_helper.py    |  3 ++-
 unittests/test_doe_idf.py                      |  4 ++--
 unittests/test_schedules_factory.py            |  1 +
 8 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/catalog_factories/construction/construction_helpers.py b/catalog_factories/construction/construction_helpers.py
index 805772c8..b19cfc3d 100644
--- a/catalog_factories/construction/construction_helpers.py
+++ b/catalog_factories/construction/construction_helpers.py
@@ -18,7 +18,8 @@ nrel_to_function = {
   'quick service restaurant': cte.QUICK_SERVICE_RESTAURANT,
   'full service restaurant': cte.FULL_SERVICE_RESTAURANT,
   'small hotel': cte.SMALL_HOTEL,
-  'large hotel': cte.LARGE_HOTEL
+  'large hotel': cte.LARGE_HOTEL,
+  'industry': cte.INDUSTRY
 }
 
 nrcan_to_function = {
diff --git a/catalog_factories/construction/nrel_catalog.py b/catalog_factories/construction/nrel_catalog.py
index 72939b4f..99752162 100644
--- a/catalog_factories/construction/nrel_catalog.py
+++ b/catalog_factories/construction/nrel_catalog.py
@@ -116,7 +116,6 @@ class NrelCatalog(Catalog):
       climate_zone = archetype['@climate_zone']
       construction_period = reference_standard_to_construction_period[archetype['@reference_standard']]
       average_storey_height = archetype['average_storey_height']['#text']
-      number_of_storeys = archetype['number_of_storeys']['#text']
       thermal_capacity = archetype['thermal_capacity']['#text']
       extra_loses_due_to_thermal_bridges = archetype['extra_loses_due_to_thermal_bridges']['#text']
       indirect_heated_ratio = archetype['indirect_heated_ratio']['#text']
@@ -151,7 +150,6 @@ class NrelCatalog(Catalog):
                                            construction_period,
                                            archetype_constructions,
                                            average_storey_height,
-                                           number_of_storeys,
                                            thermal_capacity,
                                            extra_loses_due_to_thermal_bridges,
                                            indirect_heated_ratio,
diff --git a/catalog_factories/data_models/construction/archetype.py b/catalog_factories/data_models/construction/archetype.py
index 3468864c..7249c075 100644
--- a/catalog_factories/data_models/construction/archetype.py
+++ b/catalog_factories/data_models/construction/archetype.py
@@ -16,7 +16,6 @@ class Archetype:
                construction_period,
                constructions,
                average_storey_height,
-               number_of_storeys,
                thermal_capacity,
                extra_loses_due_to_thermal_bridges,
                indirect_heated_ratio,
@@ -29,7 +28,6 @@ class Archetype:
     self._construction_period = construction_period
     self._constructions = constructions
     self._average_storey_height = average_storey_height
-    self._number_of_storeys = number_of_storeys
     self._thermal_capacity = thermal_capacity
     self._extra_loses_due_to_thermal_bridges = extra_loses_due_to_thermal_bridges
     self._indirect_heated_ratio = indirect_heated_ratio
@@ -92,14 +90,6 @@ class Archetype:
     """
     return self._average_storey_height
 
-  @property
-  def number_of_storeys(self):
-    """
-    Get archetype number of storeys
-    :return: int
-    """
-    return self._number_of_storeys
-
   @property
   def thermal_capacity(self):
     """
diff --git a/data/construction/us_archetypes.xml b/data/construction/us_archetypes.xml
index abaf0e9e..629feb8c 100644
--- a/data/construction/us_archetypes.xml
+++ b/data/construction/us_archetypes.xml
@@ -16,7 +16,6 @@
             </construction>
         </constructions>
         <average_storey_height units="m">3.05</average_storey_height>
-        <number_of_storeys units="-">2</number_of_storeys>
         <thermal_capacity units="kJ/K m2">130</thermal_capacity>
         <extra_loses_due_to_thermal_bridges units="W/K m2">0.15</extra_loses_due_to_thermal_bridges>
         <indirect_heated_ratio units="-">0.15</indirect_heated_ratio>
@@ -173,7 +172,6 @@
             </construction>
         </constructions>
         <average_storey_height units="m">6.1</average_storey_height>
-        <number_of_storeys units="-">1</number_of_storeys>
         <thermal_capacity units="kJ/K m2">130</thermal_capacity>
         <extra_loses_due_to_thermal_bridges units="W/K m2">0.15</extra_loses_due_to_thermal_bridges>
         <indirect_heated_ratio units="-">0.15</indirect_heated_ratio>
@@ -394,7 +392,6 @@
             </construction>
         </constructions>
         <average_storey_height units="m">3.05</average_storey_height>
-        <number_of_storeys units="-">2</number_of_storeys>
         <thermal_capacity units="kJ/K m2">130</thermal_capacity>
         <extra_loses_due_to_thermal_bridges units="W/K m2">0.05</extra_loses_due_to_thermal_bridges>
         <indirect_heated_ratio units="-">0.15</indirect_heated_ratio>
@@ -549,7 +546,6 @@
             </construction>
         </constructions>
         <average_storey_height units="m">6.1</average_storey_height>
-        <number_of_storeys units="-">1</number_of_storeys>
         <thermal_capacity units="kJ/K m2">130</thermal_capacity>
         <extra_loses_due_to_thermal_bridges units="W/K m2">0.05</extra_loses_due_to_thermal_bridges>
         <indirect_heated_ratio units="-">0.15</indirect_heated_ratio>
@@ -798,7 +794,7 @@
         <infiltration_rate_for_ventilation_system_off units="ACH">0.50</infiltration_rate_for_ventilation_system_off>
         <infiltration_rate_for_ventilation_system_on units="ACH">0</infiltration_rate_for_ventilation_system_on>
     </archetype>
-    <archetype id="37" building_type="industrial" reference_standard="non_standard_dompark" climate_zone="ASHRAE_2004:4A">
+    <archetype id="37" building_type="industry" reference_standard="non_standard_dompark" climate_zone="ASHRAE_2004:4A">
         <constructions>
             <construction id="106" type="exterior wall" >
        			<window_ratio units="-">0.15</window_ratio>
@@ -813,11 +809,11 @@
     			<window/>
             </construction>
         </constructions>
-        <average_storey_height units="m"></average_storey_height>
-        <thermal_capacity units="kJ/K m2"></thermal_capacity>
-        <extra_loses_due_to_thermal_bridges units="W/K m2"></extra_loses_due_to_thermal_bridges>
-        <indirect_heated_ratio units="-"></indirect_heated_ratio>
-        <infiltration_rate_for_ventilation_system_off units="ACH"></infiltration_rate_for_ventilation_system_off>
-        <infiltration_rate_for_ventilation_system_on units="ACH"></infiltration_rate_for_ventilation_system_on>
+         <average_storey_height units="m">3.05</average_storey_height>
+        <thermal_capacity units="kJ/K m2">90</thermal_capacity>
+        <extra_loses_due_to_thermal_bridges units="W/K m2">0.05</extra_loses_due_to_thermal_bridges>
+        <indirect_heated_ratio units="-">0.15</indirect_heated_ratio>
+        <infiltration_rate_for_ventilation_system_off units="ACH">0.10</infiltration_rate_for_ventilation_system_off>
+        <infiltration_rate_for_ventilation_system_on units="ACH">0</infiltration_rate_for_ventilation_system_on>
     </archetype>
 </archetypes>
diff --git a/data/construction/us_constructions.xml b/data/construction/us_constructions.xml
index d1c298b3..6873186c 100644
--- a/data/construction/us_constructions.xml
+++ b/data/construction/us_constructions.xml
@@ -716,7 +716,7 @@
 				</layer>
 			</layers>
 		</construction>
-		<construction id="102" type="ceiling" name="Project internal floor_Reversed">
+		<construction id="102" type="roof" name="Project internal floor_Reversed">
 			<layers>
 				<layer id="1" name="Layer 1">
 					<material>105</material>
@@ -797,7 +797,7 @@
 				</layer>
 			</layers>
 		</construction>
-		<construction id="109" type="ceiling" name="Project internal floor_Rev">
+		<construction id="109" type="roof" name="Project internal floor_Rev">
 			<layers>
 				<layer id="1" name="Layer 1">
 					<material>105</material>
diff --git a/imports/geometry/helpers/geometry_helper.py b/imports/geometry/helpers/geometry_helper.py
index 17504da5..79f36fc3 100644
--- a/imports/geometry/helpers/geometry_helper.py
+++ b/imports/geometry/helpers/geometry_helper.py
@@ -251,7 +251,8 @@ class GeometryHelper:
     cte.QUICK_SERVICE_RESTAURANT: cte.RESTAURANT,
     cte.FULL_SERVICE_RESTAURANT: cte.RESTAURANT,
     cte.SMALL_HOTEL: cte.HOTEL,
-    cte.LARGE_HOTEL: cte.HOTEL
+    cte.LARGE_HOTEL: cte.HOTEL,
+    cte.INDUSTRY:cte.INDUSTRY
   }
 
   @staticmethod
diff --git a/unittests/test_doe_idf.py b/unittests/test_doe_idf.py
index a771986e..b7eddcf7 100644
--- a/unittests/test_doe_idf.py
+++ b/unittests/test_doe_idf.py
@@ -25,7 +25,7 @@ class TestBuildings(TestCase):
     self._example_path = (Path(__file__).parent / 'tests_data').resolve()
 
   def test_doe_idf(self):
-    city_file = "../unittests/tests_data/C40_Final.gml"
+    city_file = "../unittests/tests_data/one_building_in_kelowna.gml"
     output_path = Path('../unittests/tests_outputs/').resolve()
     city = GeometryFactory('citygml', city_file).city
     for building in city.buildings:
@@ -34,7 +34,7 @@ class TestBuildings(TestCase):
     UsageFactory('comnet', city).enrich()
     ExportsFactory('idf', city, output_path).export()
 
-    self.assertEqual(10, len(city.buildings))
+    self.assertEqual(1, len(city.buildings))
     for building in city.buildings:
       for internal_zone in building.internal_zones:
         self.assertTrue(len(internal_zone.usage_zones) > 0)
diff --git a/unittests/test_schedules_factory.py b/unittests/test_schedules_factory.py
index da90168e..85a3c45d 100644
--- a/unittests/test_schedules_factory.py
+++ b/unittests/test_schedules_factory.py
@@ -35,6 +35,7 @@ class TestSchedulesFactory(TestCase):
     self.assertIsNotNone(_city, 'city is none')
     for building in _city.buildings:
       building.function = GeometryHelper.libs_function_from_hft(building.function)
+      building.year_of_construction = 2005
     UsageFactory('hft', _city).enrich()
     return _city
 

From d3a52c8bfc82c95515402ce8b3291d9c424fef4e Mon Sep 17 00:00:00 2001
From: Peter Yefi <peteryefi@gmail.com>
Date: Thu, 28 Apr 2022 10:58:45 -0400
Subject: [PATCH 5/5] Fixed pandas append deprecation warning

---
 imports/energy_systems/water_to_water_hp_parameters.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/imports/energy_systems/water_to_water_hp_parameters.py b/imports/energy_systems/water_to_water_hp_parameters.py
index 8df8563f..e1cdaf55 100644
--- a/imports/energy_systems/water_to_water_hp_parameters.py
+++ b/imports/energy_systems/water_to_water_hp_parameters.py
@@ -79,11 +79,13 @@ class WaterToWaterHPParameters:
     :param ranges: the range of values to extract
     :return: List
     """
-    data = df.iloc[ranges[0]:ranges[1], columns[0]].append(df.iloc[ranges[0]:ranges[1], columns[1]])\
-      .append(df.iloc[ranges[0]:ranges[1], columns[2]])
+    data = pd.concat([df.iloc[ranges[0]:ranges[1], columns[0]], df.iloc[ranges[0]:ranges[1], columns[1]]])
+    data = pd.concat([df.iloc[ranges[0]:ranges[1], columns[2]], data])
     for i in range(1, 5):
-      data = data.append(df.iloc[ranges[i]:ranges[i + 1], columns[0]]).append(
-        df.iloc[ranges[i]:ranges[i + 1], columns[1]]).append(df.iloc[ranges[i]:ranges[i + 1], columns[2]])
+      data = pd.concat([df.iloc[ranges[i]:ranges[i + 1], columns[0]], data])
+      data = pd.concat([df.iloc[ranges[i]:ranges[i + 1], columns[1]], data])
+      data = pd.concat([df.iloc[ranges[i]:ranges[i + 1], columns[2]], data])
+
     return data.dropna().values.tolist()
 
   def _extract_flow_and_ewt(self, df, ranges, columns, flow_rates):