From 7649cb49557ff2e2c5c196d149eb437b33cf97ea Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Thu, 11 Apr 2024 12:47:35 +0200
Subject: [PATCH] update: NVE path
---
.../setenvironment.cpython-311.pyc | Bin 4935 -> 4922 bytes
.../__pycache__/constants.cpython-311.pyc | Bin 2715 -> 2702 bytes
.../__pycache__/ice.cpython-311.pyc | Bin 40033 -> 39714 bytes
.../__pycache__/icethickness.cpython-311.pyc | Bin 18830 -> 18666 bytes
.../parameterization.cpython-311.pyc | Bin 20788 -> 20678 bytes
.../weatherelement.cpython-311.pyc | Bin 27999 -> 27816 bytes
.../getIceThicknessLakes.py | 2 +-
.../logs/icemodelling_2024-04-11.log | 8 +
.../output/plots/skumsjoen_sub_div.json | 658 ++++++++++++++++++
.../__pycache__/doconversions.cpython-311.pyc | Bin 4329 -> 4302 bytes
.../__pycache__/getfiledata.cpython-311.pyc | Bin 9036 -> 8956 bytes
.../__pycache__/getgts.cpython-311.pyc | Bin 5729 -> 5691 bytes
.../__pycache__/getmisc.cpython-311.pyc | Bin 8595 -> 8504 bytes
.../__pycache__/getregobsdata.cpython-311.pyc | Bin 53579 -> 53274 bytes
.../__pycache__/getwsklima.cpython-311.pyc | Bin 21450 -> 21356 bytes
.../__pycache__/makefiledata.cpython-311.pyc | Bin 12063 -> 12041 bytes
.../__pycache__/makelogs.cpython-311.pyc | Bin 1946 -> 1933 bytes
.../__pycache__/makepickle.cpython-311.pyc | Bin 1688 -> 1665 bytes
.../__pycache__/makeplots.cpython-311.pyc | Bin 68464 -> 68233 bytes
server/map_handler/get_measurements.py | 115 +++
server/map_handler/input_new_data.py | 13 +-
21 files changed, 789 insertions(+), 7 deletions(-)
create mode 100644 server/ModelFromNVE/logs/icemodelling_2024-04-11.log
create mode 100644 server/ModelFromNVE/output/plots/skumsjoen_sub_div.json
diff --git a/server/ModelFromNVE/__pycache__/setenvironment.cpython-311.pyc b/server/ModelFromNVE/__pycache__/setenvironment.cpython-311.pyc
index e02cd2606fe2db8b3cb4217eb48d0c11e7cd8e49..1fce7f7eb0501adbcb8e999f32d25cdd74eababf 100644
GIT binary patch
delta 51
zcmX@Ewo8p~IWI340}#C4BA%wlzmboFTg=7TDkiizwWv5IuOzQD#wE2lyClD0vn4kl
F2LOK}4|@Or
delta 64
zcmdm`c3h2bIWI340}y2Re@H#Yw~>#7TRG6#DkiizwWv5ID?d>;F~&bH)ukx2EH%a@
SKf5$HHLoPKXtNGC9|r)4BNWyE
diff --git a/server/ModelFromNVE/icemodelling/__pycache__/constants.cpython-311.pyc b/server/ModelFromNVE/icemodelling/__pycache__/constants.cpython-311.pyc
index b072973c04715d1c12f34d62689af90350e0ddeb..913972aefad8fad3dc909be26e7feaf98faa8ab4 100644
GIT binary patch
delta 51
zcmbO&+9%4loR^o20SI1f5l@Sh-^j<zA?D+36%$&VT2vg9SCUs6<C0pOU6Nn0*@PpV
F2>@?C4}<^!
delta 64
zcmeAZoh{0@oR^o20SJ~Fe@Hzjw~>#TLpjpfDkiizwWv5ID?d>;F~&bH)ukx2EH%a@
SKf5$HHLoPKXtO#;IuihK<rK>R
diff --git a/server/ModelFromNVE/icemodelling/__pycache__/ice.cpython-311.pyc b/server/ModelFromNVE/icemodelling/__pycache__/ice.cpython-311.pyc
index 7103796f4ffed34da8e4182787f746ba71106b0c..666c71f624fccdd01dc506c918a2d49173f82b60 100644
GIT binary patch
delta 2406
zcma)8Z%k8H6z^++7Ru{`zLrv`h0>OG<)0K;D@D4Zg*pGAb(1J$4776y!zqee7*q`(
z8q>|<HCwZZL$l30S0?7c!j=))!iOa@di(Y^yJSxMu*K}l__AbQG`sD4IIHMrZ}OVo
zIp^Nr`JHpm>zx_#g)ha5izJyP!k@cSnpe@;D~hi4yr%Va?JxEF5B0bA9qv2QzQNz$
zbNIj;3`oB$RsV%ukBJsDMA<o^wUI1VUV`K$U^iJ1KxFZ(_nXZyjkB&r$rUGaL%SlC
zENMlgb=J={_@IfixlnTPMhi<C5NW`HTOJE6V@We2&9h#veg#JF!)HEi+h<tPh)Cn3
z+hPbWFsdyCKWDnZf+7d}rjvn+EEBV!SSNn|=5mQoAK@GuVOlgB;xC_3DN7b(DW;E1
z4W}9e9Y9~MW*bf!I|Nc4gnScwzOYh@kSMs5t5K82lu$k)hEzJmfm2EH3v%ken!#FF
zo5C2Xp*p2vlj=zU5Ke)mu$1=@s6s#VKLJ<@F++2llqdQ?(4D!h`jZHRmm%bY&QwBq
zFfWymep1f^OS@a4HTC@caDOV$4ZBlAk~yd!A_QAtOI&S3YFo1SH<Ukuw*1k+=yLUj
zc4+6f6Uq#gP{{*Ac_)>V0<gr<01c^>x?tB6fQLeIc^5%6*a#azpr{y(=~}_NicD}r
zM}b9!49w_C!B|$}sbD$^ULyh*9~X9_Hd>EN4t_&{_k=pCLnT532-K(5Q#xc@$NLFX
zCd|<aWE5hBs!#Z%J;<^)C5I)<lDzWE1q+!>c%z$;*^x+w8Pi$Bf#`CCxiS|rxmLiK
ztM($BcLkKWN;k5&AK{Ea(*yJ=q?w~dn)HH7B02gBQbyl&EmyN1Ad^-qC=0Hc3^F|L
z5{Bl40pys|B>2LEcg(A#f`q_rF2R@?KlM`KU~D&F%!n~9bIrV%PK<-uGM_l;W>n>^
zVzrrX$ShGd6*irzK=LBIm=l$!)Aa4UNh!+C4b?~1ut`&#Qboik2ZMvaQB#lSb#cOd
zux2l5x+h5{lATDzg~#_N{cugx6|*=vi(|&XT3pED0#c7zg6K+6?Q!C#74&)XG_hrT
zW7zj2k4+MzJ>a@0KOf~c%)L0@hPM0WU*^0WXwN>@yAOHyfwabR8kAo*r<yPPe*3(h
z^R%M24%X9wJRRU_<2fAYp4&U$gM2&Y`?#h~<nLyix=~X%Gq`>mk)(h&=rCs^W{e5q
z#oXU;A%pk|oZqCy)QT1;Iy4xm4h?fu$@qSjT8*gH;HOPBIWekyfi4{LpY3I78=`HD
zZnKL}@QN(vh;k|rRi3!}%*YlyQB=h@WL|zy9>)XI6+Reh;N<%8QdVw7ax1vG^)BH8
zb1fwlqHOTZ=+K;$t!hS9&CK5|?}>@GK*+a7jVNoJE*`J`*cqeCU^h!U5ba=o@l7j;
zPr<3qJPDE)f=ivNC5S2lw>zt3xHxgO_Dmc2wQHyJApZ^lN4u^{Vq_8H+T+6tPzDC<
zt&kFbfNy&?N@DVIK=tm@A=)0-tqObpS(J(B!pQd1<)h`}wa{~+?tC2x^{&IpZ2{MN
zuVjTEz|5)FZDOJwe0{*8L6i}uUshaF#H>!v>YQn0tqsW9z}!F3mO;D?b`RL`!6q;|
zpq8NAQs(o4a~Xy@{vuS0w1q)3u2co33vv~b>*5s6Q5Hm1fxaO-6&#Awsx!_APTqoO
z3z!;uZh2V%Is6LN!^HFt-xCwRgM-I$$5GFMFOKUm`K=&!ycL`6OvQ;fLF@z>BQ;4a
z+#?ElM<Y)~C6Xz_K31whQq3*Bk<)vStnikhlruCVnI5lrCLKP+W@=HU_W$hQv-f*S
zjtzt@;i|Y&6O;y}i@59Ppd0_`$;m}38%x=6<w0X)xA<6qIUl)85I-;{Kak)ONwnbf
Rhu_IXX$AP_AuaBte*vXRWeorT
delta 2589
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
JunbO%e*rD2N!b7Z
diff --git a/server/ModelFromNVE/icemodelling/__pycache__/icethickness.cpython-311.pyc b/server/ModelFromNVE/icemodelling/__pycache__/icethickness.cpython-311.pyc
index aabd58f5f2d5ee9759931ed7653dc4286b9a19f8..140becda4e843539aa0433353569690d255c88b2 100644
GIT binary patch
delta 806
zcmZ{iOH30{6ozLyu@z=ohE8GnvJV_J1xp`D<CH!qAc)~%Y1EjI8ZeM3it-AY0CnMF
zAjGuZlFY`W7>qTk5vhsn+_ExvCX+bJE{rj1Orvpu8yyhc2zPVtIXCD3&f`7+=%);-
zd#cq|BFg#riXMGE@KP7VYx~=SgBPYoCZ`6+r^jaoJ4U9)rf=N_WB4$-0p8;C7}S`-
zdE!3Jg=Cw9>z5r)NF0%gYVJ%~gAhjWm1sH#ai&BVN_r>MyYkcPvBGR&ZZjoC6QU;p
zJqejKq~lplR-3a+&VWb;AQ|`@!}*kC_lu+-lKzsh4$Nw2Fjy4?-?UANbrtJ%{tDGk
z6-d&Fy;8j31MM>_NSV;4s~0=D7#AxO2x;Mc%L_^hsMocFJH`{0nfjbLKk?YUY6mZj
zRt!?D02)IWq&q;h$$AvpdrM5C#5Av8mzbEuoZa#XOb=fnTb#LW(c*>{H`p>o!HTI7
z`*XiooBk(RZbK2$%*U5fT&fs0`_#HeD1zKW$`0hP9%@Wr!SM!DiUe)WH5E5s{Oq*Q
zXb5Q7AfZfD#`Wppr7#x;3AWWJXv{y<2vNmNF5g{@EJygbh}$4;0~_q*>5MxUdrsvC
z3YVYR3bsvDaIqr83JhCTBQ<okn;**dyfe5&gG(?pNQQ>|gh+WI<po!Rb4sr#!TaD9
zRXPQ_TauVSdy0jY@93rUL89B`4i!R>>AEF$afd)z`JspIjQdG@UR9`A?OW?xkBdw|
zU;;8#lV$mMHY8C@UL#T-NO^!d;!~KXKsaK-pos;^UE2&&dwwp$EAL(qj*j-G_YvLR
z8LQ4DXc<{=*_R9tApeS9+f}~VI%@b&SxG8>X-yqc7I35Uxblzc0N=Tytj7wPx{hH`
KYcD3dysF<oS0d5?
delta 970
zcmaKpT}V@57{}jp)|or*9NTBx+4ua|SSGrH<(AHt&PqaCl3)yD(h3!erWJv;pe~kJ
zneT#g5wyZ+!2)A95<zs=WgZ5diwc7v=%#l>7fMjimUU6mx%%-x&-4EO&+~k~P2I#)
z-6Ni_Met2Hz9&B&ep(k&H^jR`@uO48)Kq-@Orj+bA2^-tNsXOP#(U08oSRIZo=&Fl
zh<cQIg<q;KF$7VJ4@bCb7J?M4PIkC51G3BgnzPHCHWMW^AmX>&t|5Z#tZ$Vwtm@nZ
z39K(ay%Z^2D9kLUOI?Ff>tI!sHHP_EwkFHxoF#Wa(gcVCN>?{jwU{nBcS@R_gaMVP
zkkEjK`EyEe=1)*~h2I5n6nrD*%-zMlx-Tl)s=#|pgBu}ln-UI!cC$X2<L9;4doz(t
zgm6e>75#IUe>aY6%E-xkbC&$s2hJ+uD`p$KVAp!_J#z<;+33aZ&9+*i03u4%)Vd&8
zKvxM~Y!@as=!P)lB!4|c_EAV<5o5Dyf@r?2xF-0OnnensD~Py|N>^EC8*X>KfH!n(
z3to3E0x^6`G3U0Ls5$(+Jp@Gx#wDwD^P{t!(7+y`Fdf_rS^H>aoc^Xn+}2EL?&9_E
zTv&`rY8ZJx#hUQ3V5+N(I(Snq@<g9MQW$>hC^(j>6<<(l3|4=@C`MEEpqR)WdSmcO
z2H%RIxnyY0pOy4&1O>G9cuQ!elE>)5S3}2P?UXS|;g6varVLB*6r+2-Qm4p&J=RDM
zjX2GG{VaHf*l`+6^)@lF&{9Tr-t(|KPZ!wx{fqreF{v?7)nvUf8x&*Nj*`AHUnA*T
z39@ND_*SRiOHi$`hkEDTQSydGPUK|4dRNH#@7hYj_WXn-1mP%9fIoCvA+554KdQK;
zg7&ajxfM*a96lL`3vcefR=HZ8P)6GzuB@~E3ak647*57}HVLbRuoGQlf2>B_O&cRu
qJN_EEsug2<(+m~GD^U;RHZr3$UXR`ZRIz{yy-k1&VDVXR8~qbZr8uJi
diff --git a/server/ModelFromNVE/icemodelling/__pycache__/parameterization.cpython-311.pyc b/server/ModelFromNVE/icemodelling/__pycache__/parameterization.cpython-311.pyc
index f28769d4304f34121d76e431c3c8c1fef83be0b9..1a50eab3931fde0055999076f6df42e4a69b9779 100644
GIT binary patch
delta 469
zcmdn8i1FA$M!w~|yj%=G@M4R28iVsjzURzh!Om7Op~b01#W8s$d8IKfsm0kP`2~|D
zSW+0LPOfE1V(PHm{Dfsbzo0r$UjxGj83qo435HFz4Yix6i`-^pbeUW%rpDAzxp|)0
z1AeAQ%#$0`Y?&JBHXl;sVdQG4o*}kCahB8!smb@$Pl`6w+~DQ!V7kF8(82V8op*v@
zQ*}f2<U<<zTpb=Wj28&avY25pnOU>Q9>`T*z%)x^hQ?hfxjE_!6lZF7xJ@wb^#1XH
zU3`Y=C3b}i><Tx;WvACps-0LrrM`owgXadP<P6tKoQfAX6*uqG4C7*4I9b%Bn)w2^
z(&T9-hRhdul_sAxF#*ylli5u*fV9qLQ`22sj75__*qcaSV3)ihDEfhcl~WB&bU5DN
z7ntDKRn}29*~P((`2xGt<a!5bCLnjdLmiN-I$7DVJ`CuL4{QuVVjmdTIPJg$M5B3E
zbw~9L0jcW(ikAcw7bsm6P`x6cdI5}X2ntU~ydbCqM3=zi408w#5d)Hw`JJ?xI?6ZO
hJH_xa_H3TxpTo#}fmw1gZ=e)61B(=pStJaM4FIY4o)-WB
delta 560
zcmX@Mka5c*M!w~|yj%=GkS+HoRnT!G-*aZ=1ZS(5(Bjmh;+U-bMBT&~|GZR}qRg_?
z7?=F)(%jU%lGLKf+$<@KGbR_XB(Z*AVCGcZe1&B`zlavloCbyuG7KC76AYVbfikR;
zn_EO~GcvkQP7qTADP>jP+#&XWpNW}ea+aDcP=t|HeDg{*9!7x=3~a1QGsG4s&XNK%
zC+}B3DgA+giB<3hFMkKq4PJo`rU&f269k*8!J?DrYUm4rEH7f5VZ1<SmIZ`8`I<(N
zF3?y`l^Mzlm}Y5!nRlh+=BO`FoT=I2Ho>^l`^N)z@foI<*cCo7u(Qfc&eaqLI)s%~
zW^=n{7#HK($@h$_**-AvafUKZjxjL=GPyy_2__~$CI^Ul+(ZM&WCb!ee=^y{#W-{F
zT6+_qX>6=&Hv~mNGHPI=!|?{czy!yxvJVU_ylRvG*qf<-VBlocz9A^w!3I{z!l?w5
z<5WUY$;_)XImn?7XaNhWJLBZb4)s7KoUC>q*cgPwfOc@&feDBX^Dba$F!NeX&Ucj2
z2l|!Q3QT;0vu2nh*a&$rYw`+5ZBPvG+HJn-7{kjrVY88c4kJ*6g^_FW!T>2=APwde
I2?HY*0G7L@5&!@I
diff --git a/server/ModelFromNVE/icemodelling/__pycache__/weatherelement.cpython-311.pyc b/server/ModelFromNVE/icemodelling/__pycache__/weatherelement.cpython-311.pyc
index 5f6e15b2d907a52ccc8ed1757d94a886084a4e48..2c25ae5432cf36b9db76f647f1943321adbd4730 100644
GIT binary patch
delta 984
zcmZuvO-vg{6rNc-?3%^i1v|tR#;lDOHIzCS+oiY)j)@Num?RKP+tkF75=f#1Ct#pe
zf!b<RX+b_znMidHiOB!YDQF{w1E(laI8^QPYE`+FqH?L!OI52<&+V+8+%o#4H}k&t
z-uGtS{Qet$_$#(Ouv!}tU4K5^H*@FArtK!zI(9gkPUWWObLs3tb}^lp&Rtx%e1-hX
zoyBGnw)A!b-}&0*DXo-UJ-Vw$Nfd{x4M=pA5}F`^AXV%g8-1Ex2D?nYxA<%z?627O
zU5{=s*J9tr$WIoZ2!glnngV+t1!-vPcc3Oetz4Cm=&SJtp=KI4%)NhOgbHYv7m88f
z+bgcNnkI*u#Nr^d$AC9b5$wgUN<-^;B~LyQBoTOD-Ib;dP>`%JFaUgb%dzd*32Ot#
zfMViPec}w9yQEEA0*bjseQvpm&>?1s`3IqSJjBqGVF-wO$z{>mJ@>>{_C|DXMB^jC
zN4EUift`dFJq{G9&-Bz;I6teUW+638;$rI_l*5PLCi|)Uhg;$8!JP^1<1wI^JgHAk
z!-cFinFWg67kX}$3Jx&|Lw*4#40*#)`F064_0s}Io{?%~ykXxM)!uxMbw8%lETDf|
z5XS@GQD!Bbl{VrUD+4R5zc}xjaE>gyWkxxu-g7_0_!Bba@tSC;dey@*_&g~}T{htN
zSA^!`m!;tPs<NuSls3&#XKf1aF8rEn)Hx@(mdo6V&aD8qQV}|V>)d7Sz_zJR<qU6)
zjhEsO8?Qr^f-MZ5C!x?fQ)bEYP#3edME(jLGZ|Blhh<DRgX+adn#WeMbLd;6-xKk1
z3;vqi9}b&<?IF9vE)&?i<iFt#69^&FIdZagzB+QB@*j``$vS^DNqHKVOTM7@Y$FFp
zyG_vIC$po}-{M!Vjn3P;Zkdf|tG1%OM{r?umlc6^Rvhm=Y}Os`>yBQ<Qeka{ym}x#
zLOWvvBtPZz0o(TnZ&Mc6qQ&S96S#ZJ&Y<oLmige5c>Q~jS5tW!-cORJHkq{mVKP*j
zmq{?w#wbhbSSE?7TfKey)E?=F+WXQDxaN0i6L}`jC;{?l##5{D<IJ*E2~^#PvncUz
NmI_Pi=jY4~{{y0%Ql|g_
delta 1179
zcmaJ<UuauZ96skZH@P?I&7UUC8k(eOn{2VoYMaDKBWsg1Ws+>o+?wKMl2PsLoNH2+
zY*p4s>tIkz9=07H0;1$$b7P7uTu>QBP<-f%aC^DnRTvib=z~|mCx?1YZre9^Ib6Q;
z`@Zx2zVqk7&+yk@p!q(>83Fz-d!O-{`Ih-pX0SLF%jc?mrJ8?ddH(2pK3nEfl}jsp
zKDB)LT8S@T<tylWW&sA#5q3190tY({pSZk@+KwwEyFweOdRo;3tE-WcEIt)<aB-;E
z`<h|N9#8>gi$nAQJJ7vP9Qr8Mr0z`aF)en$sRA80jh7InAlk!NX`6=VDf{vOX{9w(
zeMF>5Rf-5SnJ{8(>c*`U0PA4aWU0qg09m)<>TSnjK&Q1nA$lf76Yki-W}#xS*RMB{
zn`<}#mxbsbvkwR8U}yH2yl8oWP%{vXSjLZI$R7K~vE|*4O5@q~Oq_jPo_$NaxFpRk
zX@x7-<SVNx0C6fw{Ruz?CaE@ong<U4tN6g#ag$eojO3*y@)DOb`8l@+;C!wv~*
zia1o^)PciMG->VJ%Msn0*q)VMc}-h1cV3?3#Y<&ruB;WR@5<Hpu}hLl5tpklb>PxH
zB6bGxP-(oMw)*)$;XCU+gZB&kP}ad;U4Su(roJ76Pd50P3CTe2m39g@dhT|>6?DWM
zpve*Xg&FtP5S~MNZ$B>JM#7Mnp<oF`e248s5mPL-`g@JBO`MYAV!}mVOE=+$&uQX+
z!Wd<yM|7?3Fg2N}iA+tg42sO)t^qq*X}@qLaKXg&o^2$=-m}^ez8&qNU=8hrH|amX
z2}q+t<S<4raba{blEu+%wy5w^Bmgn&v4w?yqj?jwp?v(No}^rY!qfN}7JiJ5rK7lF
zp_eICO1m&LunCAhO!txPaUt}1`uu*8$$W;PkuFoHl_64!O+xfzrf(nqp80_YSS<MJ
z<j^oNNI}KwZ1mqY-O?+bu}A%n7F$EI=eX>dx@A;pVE1Sufj(6+4?otCV^W=<`&GDp
zYS&=J51k%U9Ki=R*)c3TMmJc+U?#;;;gdHqWN(o6qu=ra80qLBvKHJVHXB4Q7S?bS
z9sMTGT4>>uand2QP#nT^7aKyii@g}J+#%u1;z_8{!m|rSI`FW4RX77<`~U9fI=_b3
lchYwBH}A!WVeQDhxaw%vR5zY)ByOzWD0B`AcNcZ~{{X%qX3PKp
diff --git a/server/ModelFromNVE/icemodellingscripts/getIceThicknessLakes.py b/server/ModelFromNVE/icemodellingscripts/getIceThicknessLakes.py
index 42f05907..3848e097 100644
--- a/server/ModelFromNVE/icemodellingscripts/getIceThicknessLakes.py
+++ b/server/ModelFromNVE/icemodellingscripts/getIceThicknessLakes.py
@@ -272,7 +272,7 @@ if __name__ == "__main__":
'''
- sub_divs = get_subdiv_ids_n_cords('../../lake_relations/skumsjøen_centers.txt') # lokasjon for txt fil
+ sub_divs = get_subdiv_ids_n_cords('../../map_handler/lake_relations/skumsjøen_centers.txt') # lokasjon for txt fil
from_date = "2024-01-10"
to_date = "2024-01-20"
diff --git a/server/ModelFromNVE/logs/icemodelling_2024-04-11.log b/server/ModelFromNVE/logs/icemodelling_2024-04-11.log
new file mode 100644
index 00000000..bd2053dd
--- /dev/null
+++ b/server/ModelFromNVE/logs/icemodelling_2024-04-11.log
@@ -0,0 +1,8 @@
+12:42: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+12:42: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+12:42: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+12:42: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+12:42: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+12:42: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+12:42: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
+12:42: weatherelement.py -> patch_novalue_in_weather_element_list: Value missing on UTM33 X266707 Y6749365 2024-01-10 06:00:00 tm. Adding avg value -11.049999999999969.
diff --git a/server/ModelFromNVE/output/plots/skumsjoen_sub_div.json b/server/ModelFromNVE/output/plots/skumsjoen_sub_div.json
new file mode 100644
index 00000000..af3d2975
--- /dev/null
+++ b/server/ModelFromNVE/output/plots/skumsjoen_sub_div.json
@@ -0,0 +1,658 @@
+{
+ "0": [
+ {
+ "Date": "2024-04-08",
+ "Slush ice (m)": 0.246,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.669,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.795
+ },
+ {
+ "Date": "2024-04-09",
+ "Slush ice (m)": 0.198,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.621,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.12
+ },
+ {
+ "Date": "2024-04-10",
+ "Slush ice (m)": 0.155,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.578,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.22
+ },
+ {
+ "Date": "2024-04-11",
+ "Slush ice (m)": 0.112,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.535,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.07
+ },
+ {
+ "Date": "2024-04-12",
+ "Slush ice (m)": 0.07,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.493,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.395
+ },
+ {
+ "Date": "2024-04-13",
+ "Slush ice (m)": 0.017,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.44,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.195
+ },
+ {
+ "Date": "2024-04-14",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.406,
+ "Total ice (m)": 0.406,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 5.57
+ },
+ {
+ "Date": "2024-04-15",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.391,
+ "Total ice (m)": 0.391,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 3.645
+ }
+ ],
+ "1": [
+ {
+ "Date": "2024-04-08",
+ "Slush ice (m)": 0.246,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.669,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.795
+ },
+ {
+ "Date": "2024-04-09",
+ "Slush ice (m)": 0.198,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.621,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.12
+ },
+ {
+ "Date": "2024-04-10",
+ "Slush ice (m)": 0.155,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.578,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.22
+ },
+ {
+ "Date": "2024-04-11",
+ "Slush ice (m)": 0.112,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.535,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.07
+ },
+ {
+ "Date": "2024-04-12",
+ "Slush ice (m)": 0.07,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.493,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.395
+ },
+ {
+ "Date": "2024-04-13",
+ "Slush ice (m)": 0.017,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.44,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.195
+ },
+ {
+ "Date": "2024-04-14",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.406,
+ "Total ice (m)": 0.406,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 5.57
+ },
+ {
+ "Date": "2024-04-15",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.391,
+ "Total ice (m)": 0.391,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 3.645
+ }
+ ],
+ "2": [
+ {
+ "Date": "2024-04-08",
+ "Slush ice (m)": 0.246,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.669,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.795
+ },
+ {
+ "Date": "2024-04-09",
+ "Slush ice (m)": 0.198,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.621,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.12
+ },
+ {
+ "Date": "2024-04-10",
+ "Slush ice (m)": 0.155,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.578,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.22
+ },
+ {
+ "Date": "2024-04-11",
+ "Slush ice (m)": 0.112,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.535,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.07
+ },
+ {
+ "Date": "2024-04-12",
+ "Slush ice (m)": 0.07,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.493,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.395
+ },
+ {
+ "Date": "2024-04-13",
+ "Slush ice (m)": 0.017,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.44,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.195
+ },
+ {
+ "Date": "2024-04-14",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.406,
+ "Total ice (m)": 0.406,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 5.57
+ },
+ {
+ "Date": "2024-04-15",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.391,
+ "Total ice (m)": 0.391,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 3.645
+ }
+ ],
+ "3": [
+ {
+ "Date": "2024-04-08",
+ "Slush ice (m)": 0.246,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.669,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.795
+ },
+ {
+ "Date": "2024-04-09",
+ "Slush ice (m)": 0.198,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.621,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.12
+ },
+ {
+ "Date": "2024-04-10",
+ "Slush ice (m)": 0.155,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.578,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.22
+ },
+ {
+ "Date": "2024-04-11",
+ "Slush ice (m)": 0.112,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.535,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.07
+ },
+ {
+ "Date": "2024-04-12",
+ "Slush ice (m)": 0.07,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.493,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.395
+ },
+ {
+ "Date": "2024-04-13",
+ "Slush ice (m)": 0.017,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.44,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.195
+ },
+ {
+ "Date": "2024-04-14",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.406,
+ "Total ice (m)": 0.406,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 5.57
+ },
+ {
+ "Date": "2024-04-15",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.391,
+ "Total ice (m)": 0.391,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 3.645
+ }
+ ],
+ "4": [
+ {
+ "Date": "2024-04-08",
+ "Slush ice (m)": 0.246,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.669,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.795
+ },
+ {
+ "Date": "2024-04-09",
+ "Slush ice (m)": 0.198,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.621,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.12
+ },
+ {
+ "Date": "2024-04-10",
+ "Slush ice (m)": 0.155,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.578,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.22
+ },
+ {
+ "Date": "2024-04-11",
+ "Slush ice (m)": 0.112,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.535,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.07
+ },
+ {
+ "Date": "2024-04-12",
+ "Slush ice (m)": 0.07,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.493,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.395
+ },
+ {
+ "Date": "2024-04-13",
+ "Slush ice (m)": 0.017,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.44,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.195
+ },
+ {
+ "Date": "2024-04-14",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.406,
+ "Total ice (m)": 0.406,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 5.57
+ },
+ {
+ "Date": "2024-04-15",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.391,
+ "Total ice (m)": 0.391,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 3.645
+ }
+ ],
+ "5": [
+ {
+ "Date": "2024-04-08",
+ "Slush ice (m)": 0.246,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.669,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.795
+ },
+ {
+ "Date": "2024-04-09",
+ "Slush ice (m)": 0.198,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.621,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.12
+ },
+ {
+ "Date": "2024-04-10",
+ "Slush ice (m)": 0.155,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.578,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.22
+ },
+ {
+ "Date": "2024-04-11",
+ "Slush ice (m)": 0.112,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.535,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.07
+ },
+ {
+ "Date": "2024-04-12",
+ "Slush ice (m)": 0.07,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.493,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.395
+ },
+ {
+ "Date": "2024-04-13",
+ "Slush ice (m)": 0.017,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.44,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.195
+ },
+ {
+ "Date": "2024-04-14",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.406,
+ "Total ice (m)": 0.406,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 5.57
+ },
+ {
+ "Date": "2024-04-15",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.391,
+ "Total ice (m)": 0.391,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 3.645
+ }
+ ],
+ "6": [
+ {
+ "Date": "2024-04-08",
+ "Slush ice (m)": 0.246,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.669,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.795
+ },
+ {
+ "Date": "2024-04-09",
+ "Slush ice (m)": 0.198,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.621,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.12
+ },
+ {
+ "Date": "2024-04-10",
+ "Slush ice (m)": 0.155,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.578,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.22
+ },
+ {
+ "Date": "2024-04-11",
+ "Slush ice (m)": 0.112,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.535,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.07
+ },
+ {
+ "Date": "2024-04-12",
+ "Slush ice (m)": 0.07,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.493,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.395
+ },
+ {
+ "Date": "2024-04-13",
+ "Slush ice (m)": 0.017,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.44,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.195
+ },
+ {
+ "Date": "2024-04-14",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.406,
+ "Total ice (m)": 0.406,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 5.57
+ },
+ {
+ "Date": "2024-04-15",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.391,
+ "Total ice (m)": 0.391,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 3.645
+ }
+ ],
+ "7": [
+ {
+ "Date": "2024-04-08",
+ "Slush ice (m)": 0.246,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.669,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.795
+ },
+ {
+ "Date": "2024-04-09",
+ "Slush ice (m)": 0.198,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.621,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.12
+ },
+ {
+ "Date": "2024-04-10",
+ "Slush ice (m)": 0.155,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.578,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.22
+ },
+ {
+ "Date": "2024-04-11",
+ "Slush ice (m)": 0.112,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.535,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 7.07
+ },
+ {
+ "Date": "2024-04-12",
+ "Slush ice (m)": 0.07,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.493,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.395
+ },
+ {
+ "Date": "2024-04-13",
+ "Slush ice (m)": 0.017,
+ "Black ice (m)": 0.423,
+ "Total ice (m)": 0.44,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 8.195
+ },
+ {
+ "Date": "2024-04-14",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.406,
+ "Total ice (m)": 0.406,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 5.57
+ },
+ {
+ "Date": "2024-04-15",
+ "Slush ice (m)": 0,
+ "Black ice (m)": 0.391,
+ "Total ice (m)": 0.391,
+ "Snow depth (m)": 0.0,
+ "Total snow (m)": 0.0,
+ "Cloud cover": 0.1,
+ "Temperature (c)": 3.645
+ }
+ ]
+}
\ No newline at end of file
diff --git a/server/ModelFromNVE/utilities/__pycache__/doconversions.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/doconversions.cpython-311.pyc
index 25c612269213096cf39c735595b08c74124d4dfa..62bce09243373230e73e50fa9e5f9bed55c10d6d 100644
GIT binary patch
delta 180
zcmaE<cutXbIWI340}#C4BA&K=Bd<8Kn6I-{OlWaxQE^OONnUA;OKNd;Nq)g(cjhqR
zV4%VVh7V#49DEbxF0ji3(dJFeXV@8+Zm#D}VRpH|E`EbwXoB+$@dX+e__Z!@Xgy%(
zogjIMUFrh6)D3>I85|e*6)tcnpojw1cT{xne_&?dkOnH7tk3_L@zi8tfpX>x%#xG)
Q1$?;~Sfqf=A~B%t08hF%tpET3
delta 193
zcmX@7_)?K~IWI340}#wN{*W5Akyo5qIm+28CbT%Us5mAoKT$U^#y>CBr6{v3HO3`B
zyEHd7uOzi-vK4cfXedxu1H%U~1`fUnau?X;KQJ(|8gE|Ae1@HI?dAgR6lO(`i1rPB
zp$X12#208>;Mcmqq4j{BcY@?4b}5jY;^dEf!V(~s1Xxu^MF;-}W*`qNG+BcGG2^+(
afB4H;KQQnxa!xK2@Z|;4U`~-3&~^aE(>XW*
diff --git a/server/ModelFromNVE/utilities/__pycache__/getfiledata.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/getfiledata.cpython-311.pyc
index 881db0aaaae20ffcb5f1913da03670fc2c0694e0..893fe62ec1045139a8ede88f8d521ff43874a358 100644
GIT binary patch
delta 274
zcmX@(_Q#cPIWI340}#C4BA#X|vyqRNOU&EZDkiizwWv5IuOzQD#wE2lyClD0vK^Nn
z<EPENT*i#N7q}G{WNt9Oq-J$N&1&*RZY|~u{OX%{mT)pYn!HrBo3GP$M(_f`IbjQm
zXT{Epo$My&4pbmNd9qj-^94cm$?wJbm@jZEZEh0RV`qBIIC+ztn&bs`iMt|VQ`~1b
z&PZIqIMHv4UkB$6cD{!C$=~D-Gj&)^-Y4&-dV$*-h%SN272)e+R>iE0TN4N2L*#(u
zWETZ}@eAxSH{^{kaL54B4Ni#}j+Z!PFL26ko}jRhk&$n*k<v`&3(S&}FDT`6Gq6Yj
KnME4FKmY((vR~T(
delta 355
zcmez4dd7`!IWI340}y1({YkBq-pI$xr5xdG6%$&VT2vg9m7l1a7~`Lp>Qa<hmKx)d
zpIw@pnpcuqG}(~LkMYOm1}<Yp!4C}VocaqgH<({ivjVdxAK=zv{lLJ?E5G?I_YzLV
zPm?E!c8h&v;N}cwoDsZ0a8B5Q;#si}{$y=2cQ&9d-eAVbrD9<~CNqe6POJ}T0wbsT
z=6G>Eb|xOC$^CL_azGJQ<+~zcQ`~1b&PZIqIMHv4UkB$6c0Q1V_T+PNhrybJCQp`k
za{y_NVuX;Nkk~82*T<}iSsAw`4p|ggHH1C+pS-^82L?7)7sea%#uqqbfanIN#0<wv
ooIqg~pzvlFg@ufaLX)2<&IH=a&d4>nNhzNfNP{^=8o*Em0LpM`UjP6A
diff --git a/server/ModelFromNVE/utilities/__pycache__/getgts.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/getgts.cpython-311.pyc
index f566b56b32f049c44044ed0e2b5146d8915068fd..3a9a15321c2b05de22e541efe4b1c331e9584968 100644
GIT binary patch
delta 175
zcmaE;vs;I6IWI340}#C4BA#X<wvkU#NX*UIDkiizwWv5IuOzQD#wE2lyClD0vX_uE
zWB%kmAu;9)?6Q+r2^j%t>B*0T3cz%@a1ZkZe$~k@gwL2<;FepUwSnc5lF0=nlO0?K
z(l1%~Ua;`JtE_rO+4_P_z(wW2E6RZvcoZIROU+2U#4Ue;TYmCqktd9`lW&OTiC<ur
X{2;`@%Gu!ZL70I>3dk*T1iBCac5*x^
delta 213
zcmdn3^H7IxIWI340}y1({Yl*;x{*&(NIBTqDkiizwWv5ID?d>;F~&bH)ukx2EH%a@
zKf5$HHLoPKXtJ%4Gh@r-Mj<h_4-Cw#u8fms2^oQzj*OGf3l*?_U{GaMnd~Io17tDs
z%1*v0e8wKg;tXP3ptXVJl9CC8vxDnE`Xvir2<NV{>J??{3pN24l>@IR2VUS&c)%?+
wBk>Zq{09aWPL0VIMV>G=PTnS(C;fqelacd-5Cbb`gUbhD5E~>=<OuW!09*z_k^lez
diff --git a/server/ModelFromNVE/utilities/__pycache__/getmisc.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/getmisc.cpython-311.pyc
index 7fdff3bb2c7d44ce9913cb4a9ddd220e3e78be9e..05af15e65a8fcb0cb60913f5e850434518672a38 100644
GIT binary patch
delta 490
zcmbR2yu*oaIWI340}#C4BA!+!xslI@NzC2ZDkiizwWv5IuOzQD#wE2lyClD0b1hRN
zC!^Zr|J<_D7ueNSSZqz&lD;G5fa8I}i)Nlz%sek?dtT7?ocxhTTKWQ~#)^o&OncZ5
zupCG{A$ZZk`-+A4C0*|ey51vQesd(>9#+Pj$zmcQ%oo_DC+CZ}NM2x9y1_3oL;V83
z;sp-H8=U+TtS@lN0ny|OB9Y7&IF*33=w@e8cUH!0le?vYIWKTa-{6<Oz^^^|wNwi8
l1#b1tA<}-Vj87&nR@ldUfmw2LnxX<X1B(=pStJ0ATmbM4yBYuh
delta 461
zcmdntG})PNIWI340}y1({YgC{v60V*Njb#XDkiizwWv5ID?d>;F~&bH)ukx2EH%a@
zKf5$HHLoPKXmbHmBd2{569Yp7!v{VF4uPpgQ_N?WED&7acu`pGim=)xcC`--qO6XL
zD=fAqZAssea=`IG;YBmgD`uXTv^^nGlM{HP**-7`1655{;1z{2A)<l^Q7{uC%8w8Q
zGa;h92vIN-BFc>r1v4R{oCr}c6C%ov5Ct<KqO1r}FcTumj1UDeHw*CXVP!0td{#Jw
z^#cPdtI1>)5f|AH3_PqlH~1xHs9)e$yuhJ&gOh)P^#xA34-8zaI+GhkB7thzz%0?t
zpG4eQ8ShNCk_zViz`(&Nb%S620|N`M%;afODL`e+oD!S=O8K!ezL@Nzun#D}&d52L
QS5bi%NP{^=0>JnK0FK6ag#Z8m
diff --git a/server/ModelFromNVE/utilities/__pycache__/getregobsdata.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/getregobsdata.cpython-311.pyc
index f54173dddd295adbf4a8f0fb880917e35f45edca..5ab6e9e79da8792dee82004f7c05892ce5e61233 100644
GIT binary patch
delta 1659
zcmb_cZERCj7{2$G(ROXuj*hmspX(QF-Db-^*t(Cl>k16$25uQ)IF$_tsBEkqn|w@|
z3b7_&t~vfF@?jwmE0Hj~{wM@vBmSr#F>g<9;*D`;Kg2)Ar2Zhxn4qVOsDb!{#CzYo
z=f3AX=RMDPpZC3AUzEI;l9YX*Qk7EV`Q;P+?w+5om%Sv@^>nok4NQ*4Cx^xlj86?k
zMkilBuzv!bkqyvQ=r@^Dl9#f`D0fIeVdBH`Z8Vc;L+49_4A+cqOon-vV!4L)p&HZ7
zN>G?Dm!w|ISNeoX-&`lIY=X)rK5M$i>^eveouvvoN~Yz8u~ZLIy{I-Oj)?M#B#q@P
z$l1qjUE-CZpTTk?$c=yd|HI~2*)$B@g_`YtCegu9*&}j->!znm0@6yJskuZ;K;6WD
zRJ%)}J+}m>f|6;tR*+hVAh&Nbxucn%@?B;0?>ty=w~Uf05{<7NI(~@jeEsO`QNFz)
zUP_11wT>XUty9$Mxkj#0R9R9hu*wN4Cz1zNONygCSp9^f6^#cK5BK~(-={-MSWbs*
z{GHH#1^pF25FH?CP}tG69*=}lI?xY2eqvjZsdtQ-okpj6Ig%v@a&E~Nllc1<zuY)X
zQ`90M&qFCSvk_6Mf|U&*Eeh%#TwMWDgJ|`D%(Ng?aV9J^gVc;p4eldx{OJCmOGUU&
zu1!6IO+GOBP}7cP{{!~53B|v5%&TpwWqGw*P`g3qE;{sBYAD85lZ6EdC1Z)fU)}Mm
zoc@?U^TG<60V%pZT1U7erK3-%7vySg?NTWvx20yVr2#Arh~8b{A(bm?t)R4uigIoU
zE9@iz^I9EuB(HS}S|=!-B)-x?X8Coy>r3ewbZ}y887NjmZF?q$YeP^QLf=npugFWA
z=M`m%>9^WWwk7RYVJh~-=9r85rziLuleZcAZS?B&s16iWci5)6;XK<Suq}yAqM8M@
zo4-FDQql|xzHygi-h*0?|D*$T?YzaGvF9!Af~B1+6}1-7R-@Jvmvx}^&D%RN!+Cp1
zu!p!!qTUYrI{uFnGdlV(I(YVg3e+{}*ql}HhQJ#|f1b5UKpREQb6<Et>s>Ig$vVMM
z1=a0>p(9(44Ph{Zb9Amw=-v*4`-JW>h{bVt9J=Gke4af9hW4yI+arYgpns<j9){69
zIJ^hKdkUqL#hM%w%(YM#63m_1r?GiGnAhhzb7Mku2%en~qA{47#?fhrPKyp_sz-3t
zL&JK(u_0HF9X&v#e}rf;&<W<2OnKhiwqUj=*DWp<mQ$;$K;{sQD0}`(Z~n<}^Pj!H
ziw<x{)9l>H6<gXykXF_gs1kOq=x)lCV|ObM3G_l=KMwRmpkMT~W=60l1fEd#d7?z~
zDiph5UGX5q@D*#?n(^nDo54&FUA@q5B4sPOo`N+I?23RZk~6}#y?EnZ*tl0jWf!|1
zqiA7?qOpr>jLba>rEcv!21<9jUZ@FX*Wj86)I>z9Be8|xRH;w)CWo=o21;A1@6vN~
zaqRYk+h0&p<yt}GO4C?V4Vvn7T<~^fW7yjb-fmH65OkjO2-f*P=bPJ4l&EJpdGTGm
zyPWKNSMi<3g*C3!_VnSrrd8m%PdAj%KO*t-Q_)9G5?NDX(}J?>5gak>ZUJ{oX5`j5
zZ0*B=J_z&`t5W$;NXG>GY5wNzZ%XM5|K_(JGJ24(1uIn|pN$l3)G{M6<BjAu`WL3<
BU(o;n
delta 2003
zcmb7FNo*5W7@lXxvB&nrG2?h&VmpRn5}bV_BzEFJ60*>2N<ye`sKuIuI3yH^fKn>C
z6{#!@2dkURrUu$dsfL5qqAFcf1$EK*btHyEBp*QSrP6SS%Atq8H%2vxQ*BG{`@i}B
z|NZOu!<78z8}g#hC`wJB&k5&0(I?rjijJ$i6CKTyBlFSN{N(Z3NJV6FU?v)l9b1e}
zhG$PKOh;!<M`O$fsu57fJXU!NpAuUYGk{T(o<flTWFKGy<S0N`P0j-5L99(75;DD=
zQO~!tYE5A=sAcrFC5uRCN%w6<>R6_<k}s`X4Z+eniDPfr{+3<5f<n4Ph(<z1Cn8X3
z5(!FCA?U2}^8#r|0!ShUnpYSSGsgHCtRsV@RV0)z=;Rp1D~$X(lhv6Y>ReFgN@;Ft
zT{5tTq1;U<dO(`kE_awj2`~FQa5@SD`@8=ZPO^a72iSAvhvmi_xrhyfsyNZiDIKT)
zicY|YfqmG5tYlj&zm!?8Nm`plgh~^yef#W{vx(5<3s{wAWi>H1m}eGtx7kF(OLofy
z+LWkG)C!a%wFOdMk#HlD2?XtWP8-UzF3h@Gx1(qrd1%W+OCFl?up|#@3@^4}5BfaR
z<sp@anmi=)P??7c3<JS!$eBC`UF=)ISq%`_KlhCQsTd|E*yoqaNE0*N*Mt;x<X*ts
z>6^~gmNEAyFo{abeBPfyq@47!7Y3S0`x!tG&(K`>32pJEu%M*4k{V7~BejIdjBPWc
zZYg#MPCuuzWtCLI29<V9`55i^N#qDnF6R7r8I27NgJgZ`0JK%+1m=tJh7i^@2s%2h
zdC_|72AYY2jLygFe4NUMADN(1x+|wF%8{95%i1UYBEcG~esc>bzzpMzR$LSbBX(<w
z>$0RSQ7=s|tuQ1<Q%lf+qDNRTn&TSLK$u){jiAvdMxh3c0U%uh?c}shOie<K8&hQ)
zv@vl$LwkAJ%W1vna<WX~H&q0w;Z<hNGL%sb^QvJ^HH?#Czl~be;41TIcK;SUi$1Qr
zB|QhrgOb2BoEoz{C7Kk54NXye@x5JFcO~7@?J{x_us2VY$xt_5-ey)k|AP!%V}4tR
zqWTt)A@Iafw;IV<8hJ}&yhqTX^#oK1u-%J6EzmRXU*1GM6l6PKF2C~_naHV5u;FM*
zyEBd!-qDg!3pCmophp|CbmcZy(D#82_wIBg;|}ufV4_Db;p9uu`=#OCB_nvi-23Qs
zLv8_A=2o420A+)>QJ@WpgQzm80iLc+Qx6+^U}I0Fv6pY`<>+4Q7>(8F$3LQ`==Gkg
z*^;c_&98CWTX^&CH9a)9<68pjV7-Fx8so-K@?F#1Tnu)_Bwq0EOzK26VX;bPD-Pb=
zkgkH}7Lg!JJZtW?KE8dB8#=_dN4V$_*nULfk%7aRoaXK2Tt$$#ht^()_O?AJUW;cv
zv_8%EPI3oN@x620!XoTllz748P4)4fYOZDv@7cRv4LyCL9O(-~Q_`7be){BbJ!%^&
z+5b&~ee~&JFo1emQomwZox1CiAPTay8a2sMFZk-xdgyBw<ydI#=LUyh>yRX6{mtnq
z=nskt^eEdoES+K@;n>EUOF5m`Q4k=fk-N`vx@leZbz6>S?xtFNXyz<IAe8Oos=}}=
zEXpOZdx#r73cHWy#4H1@ci_R&cfULY+1wCx19swil~tw!%<?yfP$vQDU8&}Gw5?Ua
z9brinoSygqN{P~4?N3Ia7UifSt*OCVZ>+|kuSt?bEup9R;<6P0i?^e=DC<g$4|J@}
z!9bTJqNU`G{*@_ctVDrPR-wLAI<qEAg2dlvn}vj)J#c?a0sdg_eYZS<@3y~i3z7tj
zE#8yW7X23oAf1xN9P~9}eP?>={tUN&5Vj6VB3cDb`}~KO+sQ6}|BD*jXD5EWBSS9*
V9Uw&~TBb{3(S<Q4Vzuax<zL^nhs^*0
diff --git a/server/ModelFromNVE/utilities/__pycache__/getwsklima.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/getwsklima.cpython-311.pyc
index 0586179afe47585f718995951616628a89c2ab45..ad346e676bc0e6b5944e57c8cef4f3b4b21d20cd 100644
GIT binary patch
delta 414
zcmX@Lobk;vM!w~|yj%=G@Oq1QT7myYzVEDJUd~oAp~b01#W8s$d8IKfsm0kP`2~|T
z*uof#H`lY7FmhkuR#@P=B5aZW0{_iN*{h@(l_onVZ(wSupS<5xZnLn;5=N#D+sS)X
zSIS;sSGXar{DFao(;Q56xZmIxn^1X$U-1IJ=HzxYTjmSmx|2_-8HrpFH@%^zJ%jtl
z4Pm(jDi?&+fM~Lax|YxdcJUiP<s6DPIQb`-cFA|hPYzXAVrAfx?2zAFuYQ1+QD?G)
zX%*1+&HGK+8JRC|%T7LHR)D0Bop*w0Q$5giV0|3oK$W%TmcmlgnHd-w7(T=?GVt;@
zxZYqFy&$P`fgOY<U-pU@y}+(|LstF*hZGPY?Dp|q&IELVkGH~P37>Z6i`-h1m-_r+
zz94KkdAY9=&^zjr&-ofMO^Bb&>SqcH5_>;s!3&(~5I=liX5i8Q@;2xDePw2h+?*OD
X4|FlJ<mAp^6K)0;DIl|`02mzr9iNBg
delta 486
zcmaE}jPcZRM!w~|yj%=GkS+Hob))Y_zVEEc;m%eup~b01#W7j=iMoj~{&}e`MVV!(
zF)sPprManjC8<S|rP;z5t2P(0nJ@}{U|{6*U|it3B5aXAguQtqdzCb!&14<r4Xhs+
zm{>(N-%~!s$Oe)OVVt~3btO=gpH*wJpPD$3#m#FzIYZ4BBrWQ~IC+JdkpzgTb3;vg
z2KSE}!g32#E(ogug#^tfzf;o^|G>b)DsqEg@dAh94Nm?Erd{%2J0@$XD{%nrf>;=+
zet?(JYO;`N71RZNrtA<Gcr#9(VO9V%g^^VWY6?5=1kt8?ET%Y`TMEl=WoBS#VE7Qn
z$iU0r;Ch2y^n#?$1$Lbe49u(njFYE$#Y=r);9=FiAuE4@LkfuCj^bj~p1jdpVX}sI
zJJ1oVVBT`Jj|^g*C5)4!ef|J_%q9qAM)@iM<rzh7CfEBKf`S1gxXITPD9FO9H2I~k
tv?!8mKQIFw4(4wb_4~@q7`vG}NS+a>R*{i&vTm>mFOUXviVA?y3ILG&jF12T
diff --git a/server/ModelFromNVE/utilities/__pycache__/makefiledata.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/makefiledata.cpython-311.pyc
index 8ebda778d5a1c234ffaab5d783c8102128337ed3..9f02b39a7d84d86fc7b482c8c73b558802b9ed87 100644
GIT binary patch
delta 101
zcmbOq*BQsRoR^o20SI1i5l_pNTgb;D=HqM?6Iz^FR2-96l2;nzl3JWyl3%ddkb|F-
zQF^kYpd|AJcFE20f?*uudl?xR8W_F`F>r8qm^4<lR8DYgs%xm5d|on$sl$G=y3`L5
E02JvT*#H0l
delta 143
zcmeB-n;*xwoR^o20SL0?{-n;6UC76w9O-No6Iz^FR2-9)pQxJ{<DZx6Qj}Si8sn0m
zU7DMkSCU$^S%rh2Q(l&dfuVung9rmF-vr5vEK&`g57-4JxL#tH{J_A^Dz`a6FpNX$
t2qQ?*S0M%t?hcd2%9hFrj!ktR7^GN*ChwIDV*9|r!WqZ7Sy1YS2mnC4D?0!H
diff --git a/server/ModelFromNVE/utilities/__pycache__/makelogs.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/makelogs.cpython-311.pyc
index cc919acd18a39993e9384048fe2963d414fc4028..fa2ce0ed63056fa22020536111271c57befa76e3 100644
GIT binary patch
delta 50
zcmbQm-^<UtoR^o20SI1i5l`E(k@pyjn1{1fOlWaxQE^OONnUA;OKNd;Nq)iRZ!Alg
E0Ey2LZ2$lO
delta 63
zcmeC>pT*C+oR^o20SL0?{-jRd$a{=MIn>!ICbT%Us5mAoKT$U^#y>CBr6{v3HO3`B
RyEHd7uOzi-^GlW`OaO8573Kf{
diff --git a/server/ModelFromNVE/utilities/__pycache__/makepickle.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/makepickle.cpython-311.pyc
index 4f46bd87fb279391e80bd93918d53331260bb4f5..777f7160c68de582f078dec0ccb4b3548950fea1 100644
GIT binary patch
delta 90
zcmbQi+sMnioR^o20SI1i5l{2n$lK2(=H+Y^6Iz^FR2-96l2;nzl3JWyl3y@+KT`l>
q%wz#(UFHkyGLxN|HQ5+AWP!}hWz5eQ83QNBvTA{3Huth}GXem;3>p^z
delta 113
zcmZqVox#hyoR^o20SL0?{-i2z<n3ot4tKVS2`x@7Dvrs@Pt;9}@y|<jDatHMjd97(
zF3nBND@iSyyoo7*F?ljGvo6~Q21eFg#>vLanp_|Tgu6M3`57Z)$Yf7eEwF+@#?57{
G+>8Kkmmlc>
diff --git a/server/ModelFromNVE/utilities/__pycache__/makeplots.cpython-311.pyc b/server/ModelFromNVE/utilities/__pycache__/makeplots.cpython-311.pyc
index d79b8396c677f11cc5a4f615fbfabe29379b77c5..94dcb504eb83b2ed49419acd1bb27261b7d0a8f0 100644
GIT binary patch
delta 1361
zcmb_cNlX)A6z<Hl78#}^4qydKJ5wmyXo(9UR7+Ki32})WJfKAop~j%NfG9Df)u0wF
zSn~vnMgs(wUI_Rb4<3xsAR4#71I9UM!a?H!54a>Mn&{usgBXKRnf#gezn7QyEi-we
zZR)00weAYX#jD6Oa($Nj@~u8ylRBla!0y^uQ@O9kRb5-X-?gf;rmA-L9=NG4mFh^R
zS2fHUJ4Bf^W7e#gGjM`QVGSLW%!-&5kyEpVP7X%<6qfhr`JKU?n6;7vo!V3eb93Q#
zG-i>QqMe303pqdEks+>*_I!##jgQzWvqsDs6(J?CSm6@=#r{%)$cdN}C)8+}lQ1X!
zQ*FXL&m<rd8mG8#IHGW$q(UL~OaiqM^7ZWuo|TJU=;Mu4GkTMIlwz=U4(!eAXE2)v
z3qFeAveyfk7ZsxvNEqg421;aJ!n_1;?Q0m!TOfR@7_}|+Qnc5D(j0vh?OO)n{6X5=
zfI`kL6V(W7%R0%lbkuip5e0?K=>#GbyycRBryDMrJ9c#1x^2CSWGM$rIg`|r;Boo9
zC_Ph)9)xYH$UO~Q+YbIjbv{@s*8P_5iHd?4-9xaxa&d$Z9Iw1DU?Ed6TLNo|H9><c
zSg>FLx7)&CVFjFaSCeQ(n(d*eygs-PlXsDSt&R6BIb7dZA6R&#!P@{Krxj&ai6+Ve
zMJG4M^xlZr`M+AP{iVL1n6^@Q71%MA`XIYXL7KC9HmU@i{dZ!t&JkNhc=T}{yuT+!
zp;HHXiEWwibYR@Zv4OkeKSejVADlOawOL96=c5$eoM6$A&N!sY=%~HAqWgfXvxRjw
zu#UZg(l2dr@nLcr$w#d!-Y}}l(iq-FUOrl3Ie$)*Bi84Kp08oZ{x$<b-@0J>U?O_{
zB$Hx%j+fxU4p@$LYRs7;i5~63t(2Oq5e4k>LX;<OAYaoCErWL2w+THSoKMnx_&&6f
z>=6@*vr*YIO?q4xSz%t)sOfArL+N2le-gBRIQ5J8V}BN24%0s8|4BTujx|y+^2NwR
PoZ!b&=q3lLtxo&_`*8*=
delta 1588
zcmb`H-*3}a6vus&xT)(nndhV_5oyx6m@@SjEx#H@Bi0THF@|_prD{P<2YJXk+EIR#
z9}koVBnp9MIx6Z0Xld1{K>67#O+rjO0F^pAsj10>g|t!r0|ymt(>Anwora1M5J>pJ
zI{ut{&pF?(uiZCb(a&1!qk>SxkgKEg-zb0UroGQ1w=@OAU+j%`?+t(5)n3&e-qsmy
z?v5RZhMT)O_V12%?u&NARZE+4m~881W_e$-Oyy;rLEJJ;E>GF~8t+Xal`o@6#?|Z=
zlY7`$tMQI_Lp(J2O^W|WXL!y7XRIDpXE+j#Sv^fUW92-W<W5V=lCiW@o3hnvf*5a&
zw<QZwf}%6*o6}~_gH448Oh+9kJ6g6~yUP1?W(nukq~b(<t|C$eGNF4BHK{^CXIy!y
zl$VN&D5-mt6n4Cd2^I2EJ}>3+QfpqyzC`&p;y+bq=G-{O57|&N@Fm|9r;)1>kCqhq
z&=4M9dmK^1DiCa#pb=LK?Gt72<IYOh7ToG4M36OKAYq$ze3;mwI*2hyD2MC8Ed`{s
z5Js?PS1WE=-%IOQSQ%>{-=rbSDIiXcKuxHIJek?GI1(E6qj4}thKxRCc-^Tw1XBZc
z_#^%SK~}aNGVuUu$+Go7$;sGI^+@%NIyJD`AoDr%D>*_)&Iw(oR~VfX82KtpTd*!L
z?>uNU%ZWPlT0#GvX<86;jf4R%f?%${4UR=)beFhXla<70vr_S(SCz;)L}CR@Clp#=
ztb)H1opiq#K{)o^rJNZ~xR5jBNo>p*Zw-zNm=I2MZ1$lscy#hhV?gT0&vfbgbK%_S
zaijD*YCi&Z`s;}lIjev2eQRG|gHFQv`*&Z=_5+Os8J<sck+vT0a|FlcZcr#LhgHvV
z2Jd)wk1%qqus9h)a)xoSl4cW5AkDsXaC_SBOWVtn`z~%A=~3;~8AjqHm{py)YKk1u
z#}9mL7NMzP5-FT_KIyVpY0(z+JKUMx;L-#su`%9yA#h$%1wZ|EvY8TmWqJUS@koCS
zdS+I_FO5aGcV-iPWrbV-Ce@%ZT>x7iR?>xLZZm?q^d}@lB*Z=G($d0P<Tu;P=zjQi
zNeSG(?}T5U_EVw8N4Ma^R`_(T;cdMrKv3~#Bk`m7jea<@en8b!3PKMqgY>t{pJ52q
lD;bAZXI8M@485H&X}l0$onb1n9?fq^Lf>yQc<`T${eJ|`AD93D
diff --git a/server/map_handler/get_measurements.py b/server/map_handler/get_measurements.py
index bef629b7..61c48dcd 100644
--- a/server/map_handler/get_measurements.py
+++ b/server/map_handler/get_measurements.py
@@ -1,6 +1,7 @@
import json
import random
from datetime import datetime
+from server.consts import PLOT_PATH
# get_markers requests all marker data or valid markers, converts the data to json, and writes
@@ -115,6 +116,118 @@ def get_measurements(self, cursor, lake_name):
self.wfile.write(marker_data.encode('utf-8'))
+def get_measurements(self, cursor, lake_name):
+ try:
+ print("Lake name in get_measurements: ", lake_name)
+ sql_query = '''
+ SELECT m.MeasurementID, m.SensorID, m.TimeMeasured, m.CenterLat, m.CenterLon,
+ s.SensorType, s.Active,
+ b.Name,
+ d.SubDivisionID, d.GroupID, d.MinimumThickness,
+ d.AverageThickness, d.CenterLatitude, d.CenterLongitude,
+ d.Accuracy
+ FROM Measurement m
+ INNER JOIN Sensor s ON m.SensorID = s.SensorID
+ INNER JOIN BodyOfWater b ON m.WaterBodyName = b.Name
+ LEFT JOIN SubDivision d ON m.MeasurementID = d.MeasurementID
+ WHERE b.Name = ?
+ '''
+
+ cursor.execute(sql_query, (lake_name,))
+
+ rows = cursor.fetchall()
+
+ # List of all fetched measurement objects
+ measurement_data = {}
+
+ '''
+ f = open('server/?')
+ data = json.load(f)
+
+ '''
+ # Iterate over all fetched rows
+ for row in rows:
+ measurement_id = row[0]
+ sub_div_id = row[8]
+ center_lat = row[12]
+ center_lng = row[13]
+
+ '''
+ curr_stat = []
+
+ # Find matching ice stat
+ for stat in data['stats']
+ if ice_stats.sub_div_id == sub_div_id
+ curr_stat = stat
+ break
+ '''
+
+ # Create subdivision new object
+ sub_division = {
+ 'SubdivID': sub_div_id,
+ 'GroupID': row[9],
+ 'MinThickness': row[10],
+ 'AvgThickness': row[11],
+ 'CenLatitude': center_lat,
+ 'CenLongitude': center_lng,
+ 'Accuracy': row[14],
+ 'Color': calculateColor(row[11]), # NB color calculated based on average thickness, should be minimum
+ 'IceStats': () # NB temp empty, add ice stats later
+ }
+
+ # Check if measurement ID already exists in measurement_data
+ if measurement_id in measurement_data:
+ # Create new subdivision within measurement if it does not already exist
+ if sub_division not in measurement_data[measurement_id]['Subdivisions']:
+ measurement_data[measurement_id]['Subdivisions'].append(sub_division)
+
+ else:
+ # Create a new entry for measurement_id if it does not already exist in the list
+ measurement_data[measurement_id] = {
+ 'MeasurementID': measurement_id,
+ 'TimeMeasured': row[2],
+ 'CenterLat': row[3],
+ 'CenterLon': row[4],
+ 'Sensor': { # Each measurement only has one related sensor
+ 'SensorID': row[1],
+ 'SensorType': row[5],
+ 'Active': bool(row[6])
+ },
+ 'Subdivisions': [sub_division], # Array of sub_division objects
+ }
+
+ # Add ice stats
+
+ # NB remember to clos file after implementation
+ # f.close()
+
+ # Convert dictionary values to list of measurements
+ data = list(measurement_data.values())
+
+ if len(data) == 0:
+ marker_data = json.dumps(['no measurements'])
+ else:
+ # Convert list of dictionaries to JSON
+ marker_data = json.dumps(data, indent=4)
+
+ except Exception as e:
+ print(f"Error in querying database: {e}")
+ marker_data = '[]'
+
+ # Set headers
+ self.send_response(500)
+ self.send_header("Content-type", "application/json")
+ self.end_headers()
+
+ # Set headers
+ self.send_response(200)
+ self.send_header("Content-type", "application/json")
+ self.end_headers()
+
+ # Write marker data to response object
+ self.wfile.write(marker_data.encode('utf-8'))
+
+
def calculateColor(thickness: float): # NB neither final colors nor ranges
if 0 < thickness <= 4:
return 0xFFff0000 # Red
@@ -126,3 +239,5 @@ def calculateColor(thickness: float): # NB neither final colors nor ranges
return 0xFF00d6ff # Blue
else:
return 0xFF939393 # Gray
+
+#def addIceStats(lake: str, measurements: list):
diff --git a/server/map_handler/input_new_data.py b/server/map_handler/input_new_data.py
index 516c4fb8..57026232 100644
--- a/server/map_handler/input_new_data.py
+++ b/server/map_handler/input_new_data.py
@@ -2,6 +2,7 @@ import json
from datetime import datetime
from server.data_processing.process_lidar_data import calculate_area_data
+
# input_new_Lidar_data send new data gathered from the lidar and send it to the database (from the drone, most likely)
def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater):
try:
@@ -25,12 +26,11 @@ def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater):
# calculate the area of to be calculated based on the coordinates given to the calculation model
areas_data = calculate_area_data((latitude, longitude))
-
- if(areas_data):
+ if (areas_data):
# calculate data for each zone within the area
for area in areas_data:
- if(len(area[2]) != 0):
- average = sum(area[2])/len(area[2])
+ if (len(area[2]) != 0):
+ average = sum(area[2]) / len(area[2])
minimum_thickness = min(area[2])
else:
average = 0
@@ -42,7 +42,8 @@ def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater):
cursor.execute('''
INSERT INTO SubDivision(MeasurementID, SubDivisionID, GroupID, MinimumThickness, AverageThickness, CenterLatitude, CenterLongitude, Accuracy) VALUES
(?,?,?,?,?,?,?,?);
- ''',(measurement_id, area[0], area[1], float(minimum_thickness), float(average), float(latitude), float(longitude), float(1)))
+ ''', (measurement_id, area[0], area[1], float(minimum_thickness), float(average), float(latitude),
+ float(longitude), float(1)))
total_measurement_average = total_measurement_average / len(areas_data)
@@ -65,4 +66,4 @@ def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater):
except Exception as e:
print("An error occurred", e)
# rollback in case of error
- cursor.connection.rollback()
\ No newline at end of file
+ cursor.connection.rollback()
--
GitLab