From 8415fffb67a16d1073077b32faa7e108abfef66c Mon Sep 17 00:00:00 2001
From: weisse02 <andreas.weissenbrunner@ptb.de>
Date: Thu, 27 Oct 2022 17:53:14 +0200
Subject: [PATCH] reduced the distances that are evaluated in the flow meter
calculation
---
.../class_flowprofiles.cpython-38.pyc | Bin 16232 -> 16217 bytes
Flow_class.py | 18 ++++++++++--------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/FlowProfiles/__pycache__/class_flowprofiles.cpython-38.pyc b/FlowProfiles/__pycache__/class_flowprofiles.cpython-38.pyc
index b82d606b235e30a0f5c6aad6d8db96fefb09cd5c..1b7dd32d3779c0407169227fe8b3bf9f395edf13 100644
GIT binary patch
delta 2263
zcmaD+ce9Qsl$V!_0R&iuk~i|yvoS_Z?qO>)kK)ZM&5bX~&q*yx%u7x!5@lduC=vq^
z;tUK7Q9Q}{MMbH}CGlxFr4=g~imVtI7=Eef>2Ho;_h)A_0jV>Zyp~Ua(R}hbK4Sq(
zkN`*xSYeU%W<h>FMgbQz(aHJ(Gcg1=-w?=QWOSeGD&)gxIeC(h8aI+TlMf5+!O$_e
zU$_cGaI>U{BBPiO0|P_)yBd4bxLp_Ri#!<^7&O_6d?yEp%4>q17yxpSCWr_G5kVj#
z7(^i1xp{_Y45L9fNR$y|TzAg%-zz`<+y8u>`@<@cb-WHm5g<9RRiJQXVED1W$aAua
zco?Ja<Z5wsa|e*M>_w;+-eS!xNi8Za!fo&5o8r5<y+B4sfe81>^ChG(y?IiCkC8EI
z@(sy2#@NZ`QcBj&AjP0KD{=y{B0)qP0|Ub?=HklYTP&#+nI)P`5XXQ$j^xwHQ=}F-
zMT7hpv_r1-bs&p_CQA{*JV}sIOd!ud^ha@Jm!u|V#24h07DM70Y?k%p3h4?dUj_z-
zl@N8e7>kglH*?AC0!8pqS$S~}kddHJEdp7qDOd#3R+KjRw`^b}IJ{CpiI24?J~62{
zimeiCRTP^~W?rg+VH78rHi}1P8bM`YwDB$0QVjPkmHV&e4e|$bkvhl$Y#;(07#Jz^
zlzhG#C=N84i?Tqf5K2=(T(F11g!SZjg&f6Dkf}^X*&sOy5P_lUjY0~FDpjni3KbL7
zpl0QO6kt^ak}%u+T~U$I(;Z|lbCEDe2pohUU7Bp*XpUkn%_~XGi(<)7O3f<*rT8e8
z#LVQ3TTG>y$ngTwYdASk`HmteDQhwof&GdeA|O?co8weCnM6TRRs^!SC<7##4kA1z
z*QiM_`c9szrl}8(K#+a6n4AoYl)y0wO7s;-i5?twV8VLxTeU_-kRh5(MT#J^Kst)h
z?VsGQe#Ffdlt#gM&0)Snkv)R9-l5126cmi$h=r!}Tdc_$sma;sel^}aQ^S!-9_#@=
zkbPihphwu|pIWX=if~1mj73=EVspH%A|nUL$F~?mqb7IgDGPv&0~6Mu>?b?9z*2Ja
z6}`obY+%zeCf6DmL&B&WB+ry=aEmF~@D@|D(JiKA<6F$h85q%1y7|6AKVuYFKPdFm
z751C7YUzKl*JK8V=`Gf@oczR+TdYNidFiQ|9N_rB#aMBRF%KN1w-_^SF=pOks>qCD
zaf{E-M-P(f%_oc!8I{0BgM*jh!~P<0*nq6mWGrd|1ukom<z#OYDS;Mvph0}Oxzxmp
zQ4y5<paEahjHUv_4cvUebOoboC5UYXB0%{Hs^Jz>Q4q45HqSK=VifNMscHn-%nbHW
zQ4c67$$-L>zbrKwMT4HD93u<Jv6B-8L?@?OiRpl{5m<>PV-$B$VoGLdadLisQOZij
zTbyO7Ir;HvrFl>@tS2wG3gHI%z9<Z2r`u#UYb66vq!vvES;^v9l$uyH1r%Ex$*FlI
zMfsU2w^%?mBG`hWNgz$ulOwDT7|Z}M1wd|Qfw&oDK+$xNs5yuLhZvXuC5|G~$sRU4
z{gOfIIf_I;3P8bFWC~(|0|{glBzuER29+(EkkGirl$LUfDa{Dt1cZ?mll^V|7&|7<
zv(>7%0h!|pB2++x8i)u15e6Va4@7|LiC7Q|R9O^hfLK}}A`L`<;;2Xm!~z#>pwgu%
z7sLfS&Je_M1Q7)wq7XzFgNR}fQNrNLz)%E^?@|!I8box12yop8j@^C`7wj{zmn}eC
XuvZX-_2eGA4M>>^EMq;{$6f{iBJ$q3
delta 2271
zcmcav_o9v`l$V!_fq{YHn}bi%MxJ^$##@tn*xKA~@#dB0#+T&hq!uOSC8rjNGB7X{
ziGc`l1_p*(JjwY*MXAXp@o71w6)PEvY#A6Bei^%1#rUOGlqBcmm!`z$rIyBQ_GI^G
zXEOz9GoCz;Pl3^5@_s&J0V|LINDEkBk=<q{em+J4cQnz-3Ia1R1UH`)$YEsknrtTI
z!)P_RSxAi=$(+esg!W+QnA{*-g(0|^OGJ@T%%6dQA^lyAy=mO8i}po63=9mKY()W+
z9Yy6e!A=YYxkwX4gn)=p5D^9<knG&tDH_9Q5Csxt1R2+z^ZfV9kN@^RU+4a?N@N|c
zLs2wH4r~=DoEaE?>@V_}EGizx7%(|UT;1FmWG#CUs)e^$GfPs7ii>dDJNcCOZf;+Y
z(Xk-HYw`pMDNJwflHg-xyfyixWE^9{WDO}LYd4T$P!txqf><#iA`uj$%*B<(w^&ju
zGD|d>AdUfh9LcAXTcs8`#ew`7v_r1-bs&p_CQA{*JV}sIOd!ud^xxvjE=f(!h%d+~
zEr!H1*eturnbH+f0SpWbE1~Kbi;$%^|CZhbir{Us^5WhgBSE2B1hQ6Bun45BD0}i7
z*}zC}cx8cH&RP_om{fd=trBe2EjFLbyi^0jTby9pC?1(<1eJx+#<y5YG2Ayz?!THJ
z$REr_>L3TOfe3J5V5HF9^7(3@IM8G+Dg&uPD9r?M!5#(^c9R1Xaug##rZN?kgXAPY
z1cs`+3MnY6RI#c`QcO^TnpFW(fK?Sp!hG`!MMXwWFOa>=MZzE<a1erYX|jQ%`4($w
zUP)@+EtdSG)Vv~4ioeB@n3<e$i>WjdIbJ||jV1>v-%$i5WlhE+uwT(b1f<Gkv%d-_
zlPD<4ia<6O<$^?WK!o??Tr~;CfXQuYn)=`f1lz~tWLTsGj!96WuRu!l;IIP|c9ZX^
zH7bG((PS!81epcWQG{;)<OcO4ZVsR{3eIZ|^Bszu5WMvcMUJ4LU<5}jG@ajKP0mP7
z&PMmE$>uH%M<#i&2lzntft`UKVVhrRxiTrj6=^aSVU3H;0lJEe93UUxVhp`Cxl&JA
z0BjtXumgErc5<Sn<mRJ#iy7I#rsYn~GcbmPQ3pt#DcRr_Q?lVLrevdAOv%Q#n3FRw
zqNjE91%rOZD6oD|=%*{}H)++<|6s4l3=Y#<tZ6y<i6ysKixTtFQ#Cmt@y}Rsi!l!z
zq_-F|ZZT%wVyeiz#o`v9pN}3SJ)3tLB{C|3jRprV!-xGv;IIK%smWM085FpzMOKq-
zOr!*+!UGNB%gt#fR*Z_E<OdD-qA6%9K-`ec2TfNns&;|c<{$!;ub>)kF%<<NyJ>Tu
zc@U%ce2}V1Ae))N9x9p#3NIN@cup3uWI?VUHp^Sefyx#;D?J@h{s9}N$#{#qC^03o
zv^Y6GzbIuT<1Nmz)SUeIw9>p}u!17H$uq1%xIx}7iUe8aIr+Plk^v|-i<X1zVsR`=
zO)OdgVsa#>=9LuXXQtd@0o9BU{mVd_>?V6!A23)8VhVs9%K~vM$bh0XAW;ht0S+oK
z0ZJ7`W|J*#cKT(2)N>SxfE0kjugDC<0*4OBC`i5rn+z&cG$FxoizzMT7E_uL#0dx^
zEhjtJ`Z3O$+;6K@Zx1rZ14O8R2sIE94k8RdgdT_hR}cvx7O0je(g3lvKtwi(07Xub
z4u}OV(?G>aQ6-2AcAOE2<pLraKtv;mFaZ(GAfkoAm4TrM9MP>Heh-M43nIXk9ynST
gfw*9wfxT=A;)1<`AnYdB+HF9}O<)<j$+q?~09L*7z5oCK
diff --git a/Flow_class.py b/Flow_class.py
index de8c05a..175456e 100644
--- a/Flow_class.py
+++ b/Flow_class.py
@@ -234,23 +234,24 @@ class Elbow_profile():
self.regint_ux = []
self.regint_uy = []
self.regint_uz = []
+ methodstr = 'linear'
# the spline interpolation attention it can only evaluate ordered input arrays
if case=="SingleElbow":
for i in range(0,self.Nmodes):
# self.splineint_ux.append(interpol.RectBivariateSpline(self.dist,self.Rk,self.dl,pod_x["coeffs"][:,:,i].T,kx= polydeg,ky=polydeg ))
# self.splineint_uy.append(interpol.RectBivariateSpline(self.dist,self.Rk,self.dl,pod_y["coeffs"][:,:,i].T,kx= polydeg,ky=polydeg ))
# self.splineint_uz.append(interpol.RectBivariateSpline(self.dist,self.Rk,self.dl,pod_z["coeffs"][:,:,i].T,kx= polydeg,ky=polydeg ))
- self.regint_ux.append(interpol.RegularGridInterpolator((self.Rk,self.dist), coeffs_x[:,:,i],method = 'cubic',bounds_error = False,fill_value=None))#,bounds_error = False,fill_value=None ))
- self.regint_uy.append(interpol.RegularGridInterpolator((self.Rk,self.dist), coeffs_y[:,:,i],method = 'cubic',bounds_error = False,fill_value=None))#,bounds_error = True,fill_value=None ))
- self.regint_uz.append(interpol.RegularGridInterpolator((self.Rk,self.dist), coeffs_z[:,:,i],method = 'cubic',bounds_error = False,fill_value=None))#,bounds_error = True,fill_value=None ))
+ self.regint_ux.append(interpol.RegularGridInterpolator((self.Rk,self.dist), coeffs_x[:,:,i],method = methodstr, bounds_error = False,fill_value=None))#,bounds_error = False,fill_value=None ))
+ self.regint_uy.append(interpol.RegularGridInterpolator((self.Rk,self.dist), coeffs_y[:,:,i],method = methodstr, bounds_error = False,fill_value=None))#,bounds_error = True,fill_value=None ))
+ self.regint_uz.append(interpol.RegularGridInterpolator((self.Rk,self.dist), coeffs_z[:,:,i],method = methodstr, bounds_error = False,fill_value=None))#,bounds_error = True,fill_value=None ))
else:
for i in range(0,self.Nmodes):
# self.splineint_ux.append(interpol.RectBivariateSpline(self.dist,self.Rk,self.dl,pod_x["coeffs"][:,:,i].T,kx= polydeg,ky=polydeg ))
# self.splineint_uy.append(interpol.RectBivariateSpline(self.dist,self.Rk,self.dl,pod_y["coeffs"][:,:,i].T,kx= polydeg,ky=polydeg ))
# self.splineint_uz.append(interpol.RectBivariateSpline(self.dist,self.Rk,self.dl,pod_z["coeffs"][:,:,i].T,kx= polydeg,ky=polydeg ))
- self.regint_ux.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_x[:,:,:,i],method = 'cubic',bounds_error = False,fill_value=None ))
- self.regint_uy.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_y[:,:,:,i],method = 'cubic',bounds_error = False,fill_value=None ))
- self.regint_uz.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_z[:,:,:,i],method = 'cubic',bounds_error = False,fill_value=None ))
+ self.regint_ux.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_x[:,:,:,i],method = methodstr ,bounds_error = False,fill_value=None ))
+ self.regint_uy.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_y[:,:,:,i],method = methodstr ,bounds_error = False,fill_value=None ))
+ self.regint_uz.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_z[:,:,:,i],method = methodstr ,bounds_error = False,fill_value=None ))
#self.coeffs_z = coeffs_z
del coeffs_x
del coeffs_y
@@ -632,7 +633,7 @@ class Elbow_profile():
#
# if no distnces and Rcs given it will calculate them for all
# the sampled distances and Rc
- if dists == None: dists = self.dist
+ if dists == None: dists = np.concatenate((self.dist[0:1],self.dist[1:-1:5],self.dist[-1:]))
if Rcs == None: Rcs = self.Rk
if dls == None: dls = self.dl
# get the distances and length of the us-paths
@@ -656,8 +657,9 @@ class Elbow_profile():
print("Rc")
print(rci)
for k,dlk in enumerate(dls):
- print(dls)
+ print(dlk)
for j,distj in enumerate(dists):
+ #print(distj)
#run through all the path reflections and integrate them for all angles
Int[i,k,j] = self.get_pathint_allphi_de(dz + distj,dL,weights,rci,dlk,L,makeplot=makeplot)
regInt = interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist,self.phi[:,0]),Int,bounds_error = False,fill_value=None)
--
GitLab