From 57a9d24f4c58f10cfefff3a64f604d0833725f1d Mon Sep 17 00:00:00 2001
From: Saeed Ranjbar <saeed.ranjbar@mail.concordia.ca>
Date: Tue, 13 Feb 2024 20:05:03 -0500
Subject: [PATCH] Title: Improvement of Energy System Parameters Importer >> To
 make life easier for people who want to work on energy systems in future, I
 tried to make my code as generic as possible.

---
 .../montreal_custom_catalog.cpython-39.pyc    | Bin 7584 -> 7618 bytes
 ...e_energy_systems_parameters.cpython-39.pyc | Bin 5647 -> 6733 bytes
 ...ntreal_future_energy_systems_parameters.py |  38 +++++++++++++++++-
 .../test_systems_factory.cpython-39.pyc       | Bin 6499 -> 6499 bytes
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/hub/catalog_factories/energy_systems/__pycache__/montreal_custom_catalog.cpython-39.pyc b/hub/catalog_factories/energy_systems/__pycache__/montreal_custom_catalog.cpython-39.pyc
index 29d54354bd9f290c52466af2ce07e9b63f3eb778..17e1be9410148ff08df63dddfb03bc4a7891f37c 100644
GIT binary patch
delta 1607
zcma)6O>7fK6!!Rcymr=J+qfhlV4Fg;Y0`#*C<V0;P-xSNw)|BzGzyD%lB}?IVP;e6
zY9k+d=qaa>dMXk<aBHb5t5PrRfgcHuJyb}0skm{Y=W^+Lvk()PR`qH=zkTn`d+&R1
zcCH_~bx5~{hO`*`x_j@it<yj1c9MiWk+cYzkiVyH=?2(_U>$=cD)L6ULH?BY(%;WL
zvh}rspAJ%XEGPst$OU=3u%2Eky4(DW($XLuWP)s<DO=Gt*0r@_K(5oE_$?u^E87Ed
zI%byS&zYNzF#pkt=X;-dE#GpQW{U5Dd|^&>gwNWGe&;fiZF=M&YWW)o`_Z0VT4gO|
z4GSyG@)z0ClGAjU+wAbY=yd?$O>~uy=?EE>TJ}J~;Nx;O`+oNz8db2@QQFurUl6{>
zt!1_tr5Ai3*yr`l+Nc6!nYoNxzT>%1z4-(NQ}7B(+W;nEiBADyBneN6P?9H7(<byJ
zi9dUuP}+N2TOedgev@nDUITAFjj%`F&wW+jV9n=H`5r)+Q>0s-5KM&fO1^Sx6m4%I
z>_CTv<N9ITu{lN6VE|L-<0v0Nm_aBZ97VtxM-4fSQj|wN$RC{u%eEtY?p$2`52iKP
zbfI@_XbdS>dVLdxb$zt@4n}<!z)U<hMER>;Yxe8TqLZpL`+q7u3GQKmwH+b;eFodX
z>C4_s;V_w;LjTOO!4@%@>a;p<8Jo2&*A~2t`Wg9Mad%f4O8*$M2rDmWi7+YeQyIf3
zClEeBs3RaVo&+%S5xt$LID?>ysi35e`B{+WEApf<MLv{WV}E7fU^T%0wY+aUfo|U|
z)sL$fxZO-gHK@q_^eVH4_NR^A1u{Q}U?8ZZXXIpg*I=fX!Tdvym8ar4mE=`)pOx3P
z3}5;L#pjgp`bFuid&%{#y0xa|vt^HWYUlqV3#P_*qqEwfYKan}P6bp4d=_5ARLi@{
zc&L4BwN}|I=N<=2<Fa1eG8twq-dtgLAw>OBr+0H_!jx;ZnfRr5u{uu9y`Vyfrb;=#
zQO{-uW;`0r0@?>+XP67$0TX}p9=;@q)u*J`sEGYweM;J#YqQTIE{P~QZU|Ett}~b<
zyUgG&L(60N({QJY_lLSjcnu{y&K$?jaWeb@f`wos^b1y!x`glsufh@)07{ZcYS4Xj
vCoR)qs%s6c$kD?b<}2_QCM@{Y;~?>^_&O$k8>#kgk6eov2V=|2W7B^Flc-%T

delta 1586
zcma)+?Q0xG9LI0&aqnsGE|;Xa#H(pyA{!H%My-_?jn!7u`hZllthDF$c9Je!?#`J#
z^x(=N2z`~laC|GYg5aAfaxV)N`pQ=df(Q$O2%=d014Li=`_5V~y@Ghld~SAr&ojT-
zTkBWXO(&nvMCkYNw>S8whrcl0II{;b?l5Ml?-IAnBFXYJo~0p8^+|G${ieQ3UN8UT
zCwmDu(ldJ5Ud}c55|;|<O6owR;1>5XmkK?0)#w$jF&26IV2_=NSS58c^;yb_i&gTZ
zt{9u=FcFUuf~@RHpYPWEZkq?`?GA6~sa?3p9lyr6x4pW@oAs_(gUMsSQGz|`cAQ2{
zcG~Smw^n!B&IPaG`CTh5rqz7<Sga@()%o=4{xMh}k~jkV>%}feza^X<UJDbD;t{wt
z?_RY_JG{w-<9n^<KZ?SFAB`o<W(dnP<XJ+5#pxMi2FuZ)N3CQQGEt_Vzl_x2t;{*b
zmetMdT=rp77l(mWbvt{xuakTn@6Q1z2zFNQLZc-mmv)iwdQuKEkyc7fL-h&ZAR&l(
zO+Scwt}w8)POwa|i20Mi1~3LZ1w0Mtu+Kyy#+|t8kKFMkyX<<>7v6==f0TYd*`FWq
ze3j*}19T?HudTjGP2|M>@;*0bCXXW+TFHuqF;S|mel%zM!y?j9(rKsvPug2>Q5e~l
z(F3ZI(t9-IECB~JJf1im(Rg&wFU+%LR1l=@Gy{4+ECH<=q+Gu1G+immSl>`z7Z)oK
z*kkwfhqP6`G_^IX={}g81fB<G0hB1>1S=QTIfsQ)fQ~$l83KsYs##iNFQ{v!qvIo;
zcZlR4s@tVMsiA%uJ9JW;!_rEIeW9HWBkQ2J@pMUaPdtDCF9Ib%$2+B7E-#EmnkVt~
z!R7KwG^>NGKz&nvIZ-LTgz5gpUni>l1uSZbju|?}nl{uOw@I%-qS1PXiy-s5)9COM
zLbL>>j?@C9?)ZGCCAvYf)^v8M`_qo7U*z~qgj=NB`0gDE5?b}f;Qh%5+1b&|$Srx-
zsl7t;Fu#47Lmmw`=2gf?e5ZJm?gN)U3}RD~Il~flb=u?5*|5aSR@3G0hPA~)?=T1w
zaMv9TlHTF;(Szi7^?jwg@emT30dUs@T3O)O1x`eq0bT>%0EP+c*^=6uo?2Qn=8dvZ
sG0e<drYQ2HXH~?T^cTb&y5Lb59w69Nb!298@bmOX(c(RhKB%t#4JC0?G5`Po

diff --git a/hub/imports/energy_systems/__pycache__/montreal_future_energy_systems_parameters.cpython-39.pyc b/hub/imports/energy_systems/__pycache__/montreal_future_energy_systems_parameters.cpython-39.pyc
index d3cc174cee07b46a372b3a4eacc00bf9018bbfbf..0b02f19a0048b07d61eb8603661e00dd9ab63f3e 100644
GIT binary patch
delta 1607
zcmaKrJ8aWH7{`51>a?kown-bB^hICL7cC$JBMSoqLd;0Ta_vj&)Q@mJw?uMeBnHGp
zr7TD+urPx<@tB!lVM3nSS(y<3xIRb=B~kqI{lCY3_kEYAYoD(a^+F*p;d49xiN0Td
zQ~a2}(vT%-TWXU~YDjH4luaoh2QsU7*EggCdGlsF6J{F3B)c;E#^py+JKNEQs*&98
z<H{qckqi5(Qkd09vg(KLKvilhp#p6Ht2~$o2f;y51y!&B7QiA{1c$&Oa2Om0N5B!V
z1eU-uST?104)3F;G#3!|m5-sEoS6x8S|!YF6S#~X5O<HCNy{9M;7$Hn={PLME3G2D
z3bh8-zzJ{yoCGJqDR2s$2B*Opa0WaJo&{&YS#S=V1LwhL9xn@cSpXNoMerPW4m=N@
z2baJla2Z?%SHKl;6<h_^z%@{`@B-EsuwDn(!3}T&Oj`Y?McqN(W4AEf?o>u^NSjyN
z1K~iUVrF(_%y^}@eXhzcCe6$y&Fp`1Da^ej1UKNm8ulNx7FpI1ch~Go3L-BqbxP{>
zYnRyu?o>SJw|q_=jklVVDNxvCSI#@0No~#59U7~S?gn+;-~pqoW2uj$n(H~1tJ@m2
zsll0LSiGfq0dEF8o)9+O*|Mn1HDpI>y&D~m3!_18`<P`!SeR~FI=4JGUh=u_nmRM#
z=yT2RT+`|rH1n_M#nW6J{ek5Kj@I<{DT^mh1|lh~*HJ$Tjr;a3lkddJ4z;#-c;~x%
zFDi?wcBsz92`fT0JkPe=ZK0RNX1&g3G%Bf}SF8xn6B#PPIn^VPy5xHSGw8974X2u;
z`@UAUz5Tf02hFD4(j019ffLV&U6QR+TkkaHgo7yKq)&vA&4`*#&yt?-v@A$6(sO#v
z2-qHtClaY1;Fe*se&95d*&Z3k5+jY$*%+-fXjJTRblFmMTBxUF8y9vl>)-h*W`J9q
z9^25H`j%zmE~Ar4zjJ9TJ62(%^SbaQdWQdoBxi|2@<hc?A^piWON#i4)sZHi*~CvF
zsx0ivf4oK1KiPR(ER*8l=i*O7ULAfK{y@mP&XdxQ+8vqX%Q9huC~vvK9s;b^ee4}R
HFLU`9H!lB4

delta 526
zcmZuuzfZzI6ux&YZ7D5KDnE5_aKMCwg|KQ2ab|TO#L$Ka0rgs<B-fC@;3!EGXIz|I
z42~`?I=Q&XpWx!^WPH~+nCM;ZefPch?tAa<UTT+><e_Qm1V@%Xy5-Hg<dZ(x2SU0e
z08V-&pqx5n1an|}f;Y$<T3dm{r5-rYr)=ue83|;E1~Ffnk)F(BMZ)DaL@b7RN|6K#
zSJ0;*QxR2%1S;+|q0G+xI4Y=)#MQRW)$Rl^MH}Ax2_Y;B{VQ$!kv8#M61^$J6k-}N
zjrgY|UZ#u})G($sNUIjadAz4PQlDZ(+x^|o(D1FOJ2~o3TV%L;4M0xcxz>#uMG+g1
z)twlYvpFm>Vcpy*tg$M->MG%lJ>MO){qc#*6!e6*=0%uKwKh!ec*Htxd*C`pqruAf
zp(4=>&#Y?Lv<l&k^;&I;@1Zg%po4)+0U44w70_@eI7X<jkvIIvtb?&k*k1tCrJj8N
exC)<hpQQ=~-KM}2D7T$s9RyYq=3x1j_vttCi+u+G

diff --git a/hub/imports/energy_systems/montreal_future_energy_systems_parameters.py b/hub/imports/energy_systems/montreal_future_energy_systems_parameters.py
index 8b585108..542608a0 100644
--- a/hub/imports/energy_systems/montreal_future_energy_systems_parameters.py
+++ b/hub/imports/energy_systems/montreal_future_energy_systems_parameters.py
@@ -90,11 +90,23 @@ class MontrealFutureEnergySystemParameters:
       for archetype_generation_system in archetype_system.generation_systems:
         if archetype_generation_system.system_type == 'Photovoltaic':
           _generation_system = PvGenerationSystem()
+          _generation_system.name = archetype_generation_system.name
+          _generation_system.model_name = archetype_generation_system.model_name
+          _generation_system.manufacturer = archetype_generation_system.manufacturer
           _type = 'PV system'
           _generation_system.system_type = Dictionaries().montreal_generation_system_to_hub_energy_generation_system[_type]
           _fuel_type = Dictionaries().montreal_custom_fuel_to_hub_fuel[archetype_generation_system.fuel_type]
           _generation_system.fuel_type = _fuel_type
           _generation_system.electricity_efficiency = archetype_generation_system.electricity_efficiency
+          _generation_system.nominal_electricity_output = archetype_generation_system.nominal_electricity_output
+          _generation_system.nominal_ambient_temperature = archetype_generation_system.nominal_ambient_temperature
+          _generation_system.nominal_cell_temperature = archetype_generation_system.nominal_cell_temperature
+          _generation_system.nominal_radiation = archetype_generation_system.nominal_radiation
+          _generation_system.standard_test_condition_cell_temperature = archetype_generation_system.standard_test_condition_cell_temperature
+          _generation_system.standard_test_condition_maximum_power = archetype_generation_system.standard_test_condition_maximum_power
+          _generation_system.cell_temperature_coefficient = archetype_generation_system.cell_temperature_coefficient
+          _generation_system.width = archetype_generation_system.width
+          _generation_system.height = archetype_generation_system.height
           _generic_storage_system = None
           if archetype_generation_system.energy_storage_systems is not None:
             _generic_storage_system = ElectricalStorageSystem()
@@ -102,11 +114,35 @@ class MontrealFutureEnergySystemParameters:
           _generation_system.energy_storage_systems = [_generic_storage_system]
         else:
           _generation_system = NonPvGenerationSystem()
+          _generation_system.name = archetype_generation_system.name
+          _generation_system.model_name = archetype_generation_system.model_name
+          _generation_system.manufacturer = archetype_generation_system.manufacturer
           _type = archetype_generation_system.system_type
           _generation_system.system_type = Dictionaries().montreal_generation_system_to_hub_energy_generation_system[_type]
           _fuel_type = Dictionaries().north_america_custom_fuel_to_hub_fuel[archetype_generation_system.fuel_type]
           _generation_system.fuel_type = _fuel_type
-          _generation_system.source_types = archetype_generation_system.source_medium
+          _generation_system.nominal_heat_output = archetype_generation_system.nominal_heat_output
+          _generation_system.nominal_cooling_output = archetype_generation_system.nominal_cooling_output
+          _generation_system.maximum_heat_output = archetype_generation_system.maximum_heat_output
+          _generation_system.minimum_heat_output = archetype_generation_system.minimum_heat_output
+          _generation_system.maximum_cooling_output = archetype_generation_system.maximum_cooling_output
+          _generation_system.minimum_cooling_output = archetype_generation_system.minimum_cooling_output
+          _generation_system.source_temperature = archetype_generation_system.source_temperature
+          _generation_system.source_mass_flow = archetype_generation_system.source_mass_flow
+          _generation_system.supply_medium = archetype_generation_system.supply_medium
+          _generation_system.maximum_heat_supply_temperature = archetype_generation_system.maximum_heat_supply_temperature
+          _generation_system.maximum_cooling_supply_temperature = archetype_generation_system.maximum_cooling_supply_temperature
+          _generation_system.minimum_heat_supply_temperature = archetype_generation_system.minimum_heat_supply_temperature
+          _generation_system.minimum_cooling_supply_temperature = archetype_generation_system.minimum_cooling_supply_temperature
+          _generation_system.heat_output_curve = archetype_generation_system.heat_output_curve
+          _generation_system.heat_fuel_consumption_curve = archetype_generation_system.heat_fuel_consumption_curve
+          _generation_system.heat_efficiency_curve = archetype_generation_system.heat_efficiency_curve
+          _generation_system.cooling_output_curve = archetype_generation_system.cooling_output_curve
+          _generation_system.cooling_fuel_consumption_curve = archetype_generation_system.cooling_fuel_consumption_curve
+          _generation_system.cooling_efficiency_curve = archetype_generation_system.cooling_efficiency_curve
+          _generation_system.dual_supply_capability = archetype_generation_system.dual_supply_capability
+          _generation_system.nominal_electricity_output = archetype_generation_system.nominal_electricity_output
+          _generation_system.source_medium = archetype_generation_system.source_medium
           _generation_system.heat_efficiency = archetype_generation_system.heat_efficiency
           _generation_system.cooling_efficiency = archetype_generation_system.cooling_efficiency
           _generation_system.electricity_efficiency = archetype_generation_system.electricity_efficiency
diff --git a/tests/__pycache__/test_systems_factory.cpython-39.pyc b/tests/__pycache__/test_systems_factory.cpython-39.pyc
index 455598d53829a5975be07f77c0f4b602d4a9b149..f6c71e1a7de00ebfb7059c1284c2e867cadac0c6 100644
GIT binary patch
delta 20
acmaEC^w@|yk(ZZ?0SGewo!-bDAqfCMbp{y#

delta 20
acmaEC^w@|yk(ZZ?0SML{KD?1TLJ|N$#|9bz