From 8927db1339f2f6f7df4ff5bde1e241423629de87 Mon Sep 17 00:00:00 2001
From: Matthew Partridge <m.partridge@me.com>
Date: Tue, 27 Mar 2018 10:19:14 +0100
Subject: [PATCH] Optimised the python scripts to remove some unnecessary
 packages

---
 GasFill_GUI.py                           |   7 +++----
 GasFill_times.py                         |  21 ++++++++++-----------
 __pycache__/GasFill_times.cpython-36.pyc | Bin 1739 -> 1673 bytes
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/GasFill_GUI.py b/GasFill_GUI.py
index 8eefb08..7d0da7d 100644
--- a/GasFill_GUI.py
+++ b/GasFill_GUI.py
@@ -9,9 +9,7 @@ __version__ = "1.0"
 
 #Packages
 import numpy
-import math
-from scipy import constants
-from PyQt5.QtWidgets import (QWidget, QHBoxLayout, QPushButton, QLabel, QApplication, QGridLayout, QCheckBox, QRadioButton, QFileDialog, QLineEdit, QSlider, QGroupBox, QVBoxLayout)
+from PyQt5.QtWidgets import (QWidget, QHBoxLayout, QPushButton, QLabel, QApplication, QGridLayout, QFileDialog, QLineEdit, QGroupBox, QVBoxLayout)
 from PyQt5.QtGui import (QPixmap, QIntValidator, QDoubleValidator, QPalette)
 from PyQt5.QtCore import Qt
 import sys
@@ -19,8 +17,9 @@ import GasFill_times
 
 
 #fiber variables
-dia_tube = 0.02 #(mm) capillary diameter
+dia_tube = 0.20 #(mm) capillary diameter
 len_tube = 2.7 #(m)
+
 #gas variables
 P = 10 #(mbar) average pressure inside capillary
 mW = 28.97 #(g/mol)
diff --git a/GasFill_times.py b/GasFill_times.py
index be857ee..d62c282 100644
--- a/GasFill_times.py
+++ b/GasFill_times.py
@@ -11,12 +11,12 @@ __version__ = "0.1"
 
 #Pacakges
 import numpy
-import math
-import fluids
-from scipy import constants
 
+#Gas fill times function
 def filltime (dia_tube,len_tube,P,mW,temp,dia_mol):
 	
+	boltzmann = 1.38064852e-23
+
 	#varable scale fixing
 	rad_tube = dia_tube/2 #(mm)
 	P = P*100 #(PA) average pressure inside capillary
@@ -29,7 +29,7 @@ def filltime (dia_tube,len_tube,P,mW,temp,dia_mol):
 	mM = mW / 6.02214e23 #(kg)
 
 	#Knudsen number ---------------
-	lamda = constants.Boltzmann*temp / (numpy.sqrt(2)*numpy.pi*Pav*numpy.power(dia_mol,2)) #from "Analytical modeling of the gas-filling dynamics in photonic crystal fibers"
+	lamda = boltzmann*temp / (numpy.sqrt(2)*numpy.pi*Pav*numpy.power(dia_mol,2)) #from "Analytical modeling of the gas-filling dynamics in photonic crystal fibers"
 
 	#Kn = lamda/(Pav*dia_tube) #from "Flow of gases through tubes and orifices" where lamda = 0.066 for air at 20 deg
 	Kn = lamda/rad_tube #from others
@@ -37,7 +37,7 @@ def filltime (dia_tube,len_tube,P,mW,temp,dia_mol):
 
 
 	#Diffusion coefficent ---------------
-	mol_vel =  numpy.sqrt((8*constants.Boltzmann*temp)/(numpy.pi*mM)) #mean molecular velocity
+	mol_vel =  numpy.sqrt((8*boltzmann*temp)/(numpy.pi*mM)) #mean molecular velocity
 	viscosity = (mol_vel*mM)/(2*numpy.sqrt(2)*numpy.pi*numpy.power(dia_mol,2))
 	print ("Viscosity: "+ str(round(viscosity,3)))
 
@@ -47,7 +47,7 @@ def filltime (dia_tube,len_tube,P,mW,temp,dia_mol):
 
 	#Fill time  ---------------
 	squigle = 2
-	Ppercent = 85 #percent ratio
+	Ppercent = 1 #percent ratio
 	Pred = P/100*Ppercent
 	Pratio = P/(P-Pred)
 	t_fill = (numpy.power((squigle*len_tube),2) / (numpy.power(numpy.pi,2)*diff_coeff))*numpy.log((numpy.power(numpy.pi,2)/8)*Pratio)
@@ -57,17 +57,16 @@ def filltime (dia_tube,len_tube,P,mW,temp,dia_mol):
 
 
 if __name__ == '__main__':
-#Variables ---------------
 
     #fiber variables
-    dia_tube = 0.02 #(mm) capillary diameter
-    len_tube = 2.7 #(m)
+    dia_tube = 0.0005 #(mm) capillary diameter
+    len_tube = 2 #(m)
+    
     #gas variables
-    P = 10 #(mbar) average pressure inside capillary
+    P = 3.5 #(mbar) average pressure inside capillary
     mW = 26.04 #(g/mol)
     temp = 21 #(degC) Temperature of system
     dia_mol = 359.99 #(pm) diameter of gas molecule
-    # execute only if run as the entry point into the program
     
     filltime(dia_tube,len_tube,P,mW,temp,dia_mol)
 
diff --git a/__pycache__/GasFill_times.cpython-36.pyc b/__pycache__/GasFill_times.cpython-36.pyc
index e22bd5df34e4a4b0fd67e037d219eeccfb8c4f07..91e0f44e6f00e5c75fd02f0b6f15e040f8c7e491 100644
GIT binary patch
delta 1120
zcmX@j+sRvR%*)GV!nP|aos)s#F#{4{XJBA(U|?V<j$&Y7NMVR#NMVd(Oks**N@0#-
zPGN~+NnuT4%VCXTO<_;rXkmzAOJz^t%w{SIOW}&*Na2p+OyP;*O5u&-PT`B<N#T#;
zO=U~vNaalBO65-FN#$*3V`NBS3ub1}6qq<Ku|Am%YPBc>0|SWd46^zSBLhPUV=Y?^
zLkg2LLoIs^Qwp;PLoHJcQwoy^Lkf#DLoG)QLkg=jLoGuMJD6s#VM$>VXQ*XKk*j4*
zk*{U0VNT(aW~k+?VXI*gVJKn9VoYIbW-MXIViIAf;Q)&;*VMD7Ff}uYFi11ha@BCv
zuuC)4a+k2AaF?)_u+?y<urxC@Gm0~$@Q5?iaHsHQvlPur;mhNz;ZEVtW+_^hB9O<F
zA}G#~A|%ex%*Y6_M7V}cgaK+LQw=A`>}JMVo*EtyJB1165U>N7>cJFq4Z<0`B`hf-
zVC#8d)`N^r5ls=R;g)6)XGjrE5r?p(8EW}T7_yja*g>8E`6)%Xh8JXE4IeC=YS={>
zYIsB##2IS&OIT7Qz$WvjNP<GKnW?!R<U1*d>r<F&1yV$71wnx=%}^sK!cZ$z!&Jjm
zBP78f%}^^0wo0IeQG@|x9f$`COc1+<A7p6>Ll!%-Xo|2jLyfQqLo=fYL#;>&ONunu
za*-4nX@+J-aJb64L#(b531-k#@JpA9V=j5N!NB?@69WUo%M=j7%)r2q`GT2&Aw3NQ
zgbE$fmlW7?U9T^5$N|YQ2zY5OW}fWEyi>o5+buIEN1-G$H`Pkvr40iELlwJ%Ms8+a
zv1a<S=E5sXdw<xbzf<kKXtipVy(Y(GXBI<7(aEJO+FYDT`8g$3xrupsljpPKvq>;8
zF#JlJEW&D3ADmxWl98BOP?Ddg;GS8c?~$LAlV6^kUz8f3o>&~8mYI{I@19r;vN#@O
zaj{-O<t+}7Fo-7rO3Wsp6wbuL%)!XP$ioOCIT%?OSr|E(HJCXVtyp9jH5kR1Bp7uV
z<(NU@Jd8Yyc1$viMN$k5)(p2e;^T7@GxOr()Bmjec*!@(!M+IO?{tu<3=BLD>0H+r
z7ua%HIlKgAA$Z_u@=gB1YG1;|z`y`92y9MXVs2`De31}HOc+FnfC!MbA~6t497KRT
xUxXke85kIDaoFVMr<CTT+JS5?mSJFEU||9|m4%Uom4lf>n*-!<5C(aS2>?Z9>`(vz

delta 1122
zcmeC=J<VHh%*)H=ex@SoBqsyIV+JI^&cMLnz`(#zT*kn_kirnfkir<nn8Fmrl)@av
zoWc^tlERw8mctsw3Z~hj*uXS<6nhG53VRMmE@u=cBSQ*D3TF#L6jv&D3RgB$QBewa
z6i*6I6mJS|6kiHo6n~05f0RIqK$KuAS1L~`Zz^9Zf2u&LU^5#dLke3kgQnobro?(p
z##@}p`FX`9iFqZ($!t(JiZC!RfY{C;H@;zHV5nh8VU%X5WvgLIVG?1eWvXFHVH9CV
zVU}j7Wv^jKVUcF2WvF2T(`+>?DXiiQwJa%ewX7-fwahilDV)*_wHzf3S&TI-A`B%=
zS<ESn&5R{XSuFJ;3^nXvA=Vn!6vk#I5e8|7TFx5I8a8Q$TCNhd6s{8X5{??K6y|28
zW=3&_6mD^b8m<(cY?h)KDZF`nHC!ot*(^m%Quy<jQUt^qQUt{rni&}(mI#5Y6k&i`
z%2LAtGQF9xmb-=<#7<!>sfW4+>;#D0kR8HP!j>Wob^s5|0U*OuL{da+xTG1x8B#=2
z#2_qbhFabdrYzPPHjp<!o=Op_;Q?7#!wU<m8a5Gz8g3B=afVvH61Eia688EMjvBrc
z2~bc%{U-@=e+pwQe~MJC04Ttv8EOPX7-|J;m};161SLQrBm}mKzXlWujLl3S9w<1$
zR`Y=@En&*yL>5gEl4ht85@Bd&6k(_pE@4ZN27Aj}I7LR9p_vgJw6YMZYlMRtG!^__
zGBGePyi5TR%nS?+nJ<_b7}C=~K&a3meTQ7@>%bjc4mlt>h7@rPPKL>9%sW|MhB7cP
zOuo-7qnz}-)9uvfZ?@_0RC_O4t(s-8$yEeWe2dd5Kc}QBH!&}7G9QZ}qsU|j7VXJp
zEO~6w3=9mv5+=W5F_I0aEXl~vQwUBj$}A`;)^|@VR!Gat$x$fD%uOwxY|kpKA_PjB
zMxgY{%)!XP$ioOCIT%?OSr|E(wU{{=tyttHH?T_B$ucl7+~SCj&rQtCi;qvQ7Fp;1
zuxg5Z`mC8C!0Pali-Cb5o$LDI0$VOChnJ!t9?W-|LX)qt+Sl`fj9|%4EXjysOUo(E
zOewy_TAZ9&Pzm->5zL0X#N5>Q_#%)AMPdvL3`OD~LIOlcf(R)P0rF%Kf{+0j&0&+9
qpHiBWY6l9RVkHI!1{NleM_3qHSUDIuL_z*z;?U$^VPS+zFarSHF7KZJ

-- 
GitLab