From 0e1747de179bb47ef5cb1fcebb888ff167cc8455 Mon Sep 17 00:00:00 2001 From: kgao <kenny.gao@ssec.wisc.edu> Date: Wed, 10 Aug 2016 14:53:16 +0000 Subject: [PATCH] Added pandas to requirements and fixed few errors setup.py now requires the pandas module Fixed bug where some files were missing a data entry Fixed bug where autoRun.bash pointed to wrong python file and python directory --- aosstower/level_a0/autoRun.bash | 6 ++-- aosstower/level_a0/bundle.py | 50 ++++++++++++++++++++------------ aosstower/level_a0/bundle.pyc | Bin 0 -> 3992 bytes aosstower/level_a0/nc.pyc | Bin 0 -> 8817 bytes 4 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 aosstower/level_a0/bundle.pyc create mode 100644 aosstower/level_a0/nc.pyc diff --git a/aosstower/level_a0/autoRun.bash b/aosstower/level_a0/autoRun.bash index fc7d48d..2987a7c 100755 --- a/aosstower/level_a0/autoRun.bash +++ b/aosstower/level_a0/autoRun.bash @@ -1,6 +1,6 @@ -!/usr/bin/env bash -PYENV=/home/kgao/env/ -SCRIPT=/home/kgao/Code/finished/Aoss_Tower_a1_Conversion/convertFromASCIIToNETCDF/autoRun.py +#!/usr/bin/env bash +PYENV=~/anaconda3/envs/env +SCRIPT=/home/kgao/Code/curr_projects/ncGenerate/AossTower/aosstower/level_a0/autoRun.py ( flock -x -n 200 || exit $? $PYENV/bin/python $SCRIPT diff --git a/aosstower/level_a0/bundle.py b/aosstower/level_a0/bundle.py index 918af3d..052b5e9 100644 --- a/aosstower/level_a0/bundle.py +++ b/aosstower/level_a0/bundle.py @@ -6,6 +6,26 @@ import time from netCDF4 import Dataset import os +def writeBack(frame, filename, cur_dt): + #get start + startString = str(frame.index[0]) + startObj = dt.strptime(startString.split(" ")[0], '%Y-%m-%d') + createDirectory(startObj) + + #get end + endObj = startObj.replace(hour=23, minute=59, second=59, microsecond=59) + + #input file + inputFiles = [] + inputFiles.append(filename) + inputFiles.append(createFilename(cur_dt - delta(days=1))) + + #output filename + outputFilename = 'aoss_tower.' + startString.split(" ")[0] + '.nc' + + #create file + createGiantNetCDF(startObj, endObj, inputFiles, outputFilename, True, None, False) + def createDirectory(stamp): if os.path.exists("/mnt/inst-data/regen_netcdf/aoss/tower/" + stamp.strftime('%Y/%m')): os.chdir("/mnt/inst-data/regen_netcdf/aoss/tower/" + stamp.strftime('%Y/%m')) @@ -79,26 +99,18 @@ def create_files(start_date, end_date): #get second frame frame = DFList[1] - - #get start - startString = str(frame.index[0]) - startObj = dt.strptime(startString.split(" ")[0], '%Y-%m-%d') - createDirectory(startObj) - - #get end - endObj = startObj.replace(hour=23, minute=59, second=59, microsecond=59) - - #input file - inputFiles = [] - inputFiles.append(filename) - inputFiles.append(createFilename(cur_dt - delta(days=1))) - - #output filename - outputFilename = 'aoss_tower.' + startString.split(" ")[0] + '.nc' - - #create file - createGiantNetCDF(startObj, endObj, inputFiles, outputFilename, True, None, False) + writeBack(frame, filename, cur_dt) + + else: + frame = DFList[1] + createNCFile(frame, filename) + + #get second frame + frame = DFList[0] + + writeBack(frame, filename, cur_dt) + else: print(len(DFList)) diff --git a/aosstower/level_a0/bundle.pyc b/aosstower/level_a0/bundle.pyc new file mode 100644 index 0000000000000000000000000000000000000000..99b5245907dca7496a03515d81c8f008c7504070 GIT binary patch literal 3992 zcmcgvO>Y~?5v`sfDUlW}tz}!@_3lPNR#_fa;vz8Oz%i2bO0gWk;Q}Kgh6xzLXr@IE zMb1z&tylsiB!F_wCBGr3{EFlr<dU3n%q2e{m)w%~s!2)fb&g(1Y<BfmRad=wT?+r* zZvCPC$LEPme;WAy0-x%iXj1$c8HtRI^o@)I=?5|nr60<;CjFX>>(Z}_;krOZ4H-A2 zKj-C8<$38hy<C$~OZwOJO!OC|zo7lPjM_53F8%8l>lUTIC}~4}E7D(*bWS_(Njk5c z8<IA)vn**#J2xf0rkz`2Z;G9h6i2ruy)Ne=#o=u^7qLxAaqJTM=FWKlZ8h2HyoYOM z|HV(Ij-H!CGq7$ecCq7BQrg(r?JUk+&$`X6$8Hg$uglEYt!!-bDl76z$Nb7)#$^`o zjcnzbvvnA%ItG%PN0Z_>hn;?eizuab<l>$mqY2bsS(k+9a~Icb;#2(<jT1Q)85+js z{c|H{p}0VXp`3;?tT7T8<XjpG?s--dSC`WoM-9G)4Z+RRIz0^E!mDiIoH=-=c2<{x z$XP>98#0`eQ{%U(fD4=kf}6qb@VNTX&%@zwDqleaR?g<cwW#|P7T`>XiU8M^bB~jq z&UIX=m!T0yFRfO*@Y;*@wek8|>S_>P6-Q;Z!UaU<ILnWm&3-(SE1MK~igP)Yl*Lr$ z#xy>uG9FrSHZH1a*A=gAxlz%v8+oG29fiu3@Di|)r}h}`#Ac@f!^DIk(%EV<%G{N3 zZ)K%TTv47Va7sHF#feob<H^LrDqhYb<8d~!c|1Kw;~gm|Xy>!?$m&gdMeY?njz^X4 z&=ab6zvNDe`?F){isY!=g_*ou<>J!qxH8KJQ?ns|wKr5_U<tb|tjqGrk)th@+EyI7 zsZ85CSRmR|U!m81Rg7)-U=SDG%_6m3s4I6TWiiB^t8Sib+uWAGbN3NE`;3n5(#PuJ z?#TYij&|eEyL(4@I<gy+lgpI&GENQ%>FNd*2FvC<rWJk?HcZ>BhIhk+j^T&CQP>0W zggr1n3<z!FKb#_c1-LFB>NH^e%{i0b(@6mSEt5R;?b}iTJrEkb>Ql7caqhYql6@U1 z9Cu4Qu=y^cm8AQ6>#o0cMG&pM=&p@BjF2L!s5H2f*uC=MIL<0p&Cs=ffv)6Lnw2^{ zjt?yQQ{Lc_i0^pvZsQXzL(fOlMW6|S@=^GK(O@tiE`sqR2yo>Yyy+bZQ90+n9|G+# zJ{VQbSpn6oOs96#DZT0g9Px%jiJbMR59vAeVYeb?%WN>qTUs{bhKkEJ;ws59WzL9U z>d;hmH<>p2kVE*qJ5)!var*c1nR=~Zmd)KDp&5)DZBz*V2^|k%U;>mw7pZ^XO0qaz z2(rc;s8Zc&=tvN|@-<edBT4q4Wq^Oi-sgcK#e<vmIQE-Lxj3rzHBC5UV93DdHNFbq z{2_Q-2Qh{1yKMn0kgjF=a-ct41k>x=ywhPcJXcqI9cPhPU3>Ci?H3Q$cD}*0UyB!$ z38bqu|5`I)zbMDCC)D20p5b}Dx4ZfD(az4#H!C{uv(?TLz9Ma?Fe0C7bVo>`h;Ol? zRzn~0<&3y5q9&zvaBg&m0?|7xvOM}O=P4<%CL_ET`t(P4IYGQAPwpf8z^6z$6+KV( z$ij?ho{&P{EwJ1I6#2KKw@G#DkUe9XwV)NO1h;~P;8V1V9&TjR3%LCY{D~+6Psjf- zz@1OkJHBclWp2Ivv+<RKM;ieVF!n3kPYBPNVg--_;fC@)>H@ss!@87*S_Jqa0<XWA z`%rTDvE-<nv~oD!(4{~rHq6Vg$r57g<%*yhU{!&F00oCfy*d1yJO?5%jzt(e0Ga=t zqAHyic;VDT8x>prAEI}<wk`*Ol)o_;K{+wq0ev_Jf0v_BbTN8Rlk%zgKc{mTi_f4G zNuWyUno!K)Uv$rO@~TBwj(THH{`At;?I*|gXyMk&&xFT&i{YA?wQxDEFdN|2x1SvT z-aJRC0Rh)Bums3s;da&M&-IaF(0jhlAqECzytjusU{#B%sEwhFS)sY4s4wGuV0A*- zE5f8i<Yb+-!2C(1^%gT~P!>m%y%S9~%_&q>(Jk)yoXro}blH3ljpms>&RmC<XzFNX zva5A3*#NbO3K3tL=m8r|I$D_SYj$ltev0f?TU5EG=C_t?yDYJ)FJMmf5RJ??f{)FD zX$H50Cb+#3G=dM!t?-6v1xvvV^8?c|?XVRrhqLc%LEGFkw@s^_a6f-8((*n8WFsgL zh0HlRAac+B_^0IUqewvhgEg&1d^lMgbx2~-BR1qmb(bp`9ER@FUD|sm^&IO3Pf#yV zPTCT>$y2|^u+q1f>~BC&rgb%ge8qT$7h|3$9)7&iC3!1DN8ISipAPhpWN#AZX<TV- zHSzx<XbnZQq9Wrn;@^T#xQnp#j|5+8k5~2DCdDt&d>g)+hn|PyB0U<}pYW<$0(Hz1 Wei!hIHfY{#Hk)(J<>pVDwf_M&n<xzc literal 0 HcmV?d00001 diff --git a/aosstower/level_a0/nc.pyc b/aosstower/level_a0/nc.pyc new file mode 100644 index 0000000000000000000000000000000000000000..55c6b53922aadd2cd6e5fd6b266f2e5839dbdea0 GIT binary patch literal 8817 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 Z)1$@F;y1-}#h(^GC{7iJif>Ok{{;%+j->zq literal 0 HcmV?d00001 -- GitLab