From 31f83e1d3747d5c3945e050e5f83c10c7086331b Mon Sep 17 00:00:00 2001 From: Kelly Thorp Date: Tue, 9 Jan 2024 17:02:54 -0600 Subject: [PATCH 1/2] Edits to allow running on Linux --- DSSAT_WTH.py | 4 ++-- __init__.py | 0 __main__.py | 6 +++--- __pycache__/CHIRPS.cpython-39.pyc | Bin 0 -> 5533 bytes __pycache__/DSSAT_WTH.cpython-39.pyc | Bin 0 -> 1730 bytes __pycache__/__init__.cpython-39.pyc | Bin 0 -> 177 bytes __pycache__/__main__.cpython-39.pyc | Bin 0 -> 1248 bytes __pycache__/getnasap.cpython-39.pyc | Bin 0 -> 6746 bytes __pycache__/main.cpython-39.pyc | Bin 0 -> 1194 bytes __pycache__/update_wth.cpython-39.pyc | Bin 0 -> 3686 bytes update_wth.py | 4 ++-- 11 files changed, 7 insertions(+), 7 deletions(-) create mode 100755 __init__.py create mode 100644 __pycache__/CHIRPS.cpython-39.pyc create mode 100644 __pycache__/DSSAT_WTH.cpython-39.pyc create mode 100644 __pycache__/__init__.cpython-39.pyc create mode 100644 __pycache__/__main__.cpython-39.pyc create mode 100644 __pycache__/getnasap.cpython-39.pyc create mode 100644 __pycache__/main.cpython-39.pyc create mode 100644 __pycache__/update_wth.cpython-39.pyc diff --git a/DSSAT_WTH.py b/DSSAT_WTH.py index 1cb3c5c..ee88373 100644 --- a/DSSAT_WTH.py +++ b/DSSAT_WTH.py @@ -11,9 +11,9 @@ import shutil import pandas as pd from datetime import datetime, date, timedelta -from chirps import * +from .CHIRPS import * import joblib -from getnasap import nasa, nasachirps +from .getnasap import nasa, nasachirps def dssat_wth(in_file, startDate, endDate, out_dir): s1 = datetime.now() diff --git a/__init__.py b/__init__.py new file mode 100755 index 0000000..e69de29 diff --git a/__main__.py b/__main__.py index 07d9d38..a4927cc 100644 --- a/__main__.py +++ b/__main__.py @@ -8,8 +8,8 @@ import sys import argparse -from dssat_wth import dssat_wth -from update_wth import update_wth +from .DSSAT_WTH import dssat_wth +from .update_wth import update_wth def main(): parser = argparse.ArgumentParser() @@ -34,4 +34,4 @@ def main(): update_wth(args.in_file, args.in_dir, args.out_dir) if __name__ == "__main__": - sys.exit(main()) \ No newline at end of file + sys.exit(main()) diff --git a/__pycache__/CHIRPS.cpython-39.pyc b/__pycache__/CHIRPS.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0035523c2c45e069fcf2cae33e9ae203eae811aa GIT binary patch literal 5533 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 C)m4rF literal 0 HcmV?d00001 diff --git a/__pycache__/getnasap.cpython-39.pyc b/__pycache__/getnasap.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..976ddfc4dd8203d0c60ca72ccaa5c6aeabfbcf27 GIT binary patch literal 6746 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 K*ah3N2mS|sI)Cs0 literal 0 HcmV?d00001 diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..bca12503abaa5ecb7f786e232a703207dd1f07c2 GIT binary patch literal 1194 zcma)5PjAyO6t|PKO|rI|1V|h>_(&vZ)Ug9d2vN0@nAoan86a}0LhZFF`G@Uj>eQX! zy6>(L6#R&>mUmRj;P%|-7Gc+**ZY5S~g%#9NOXZO(HUBzxj~`sIX=Tnd|^`a5}z5GS-{MtF}G+< zLVemehh1rH%Q|(|vh9*-^>urF(A&24IaH262^0C&MQ zz?xvK&(M+V0Wh0d5OF2jz*WSi_Nv|?=+oA)YE1GpjWX)t(4tJp%A7J;)mKfb8gVv0 zjuUn|?+0&*V&o*2Ga_e<6nUIUK{)$V#+=a(*^?wKg(Qy5fw4j-r-2Qh9gKz$}|%l&!{Z9C|G69SW;AukP(*yxUy3}P?V_aTW#Yw=V>I# zdl&}?g8_NSI@1p6K6|>;-QM2uss_ub&V0O^(f`bQ(uKUdlw%t6Q-2h}Y4c+O6GaK7 z;iMCp^96y@x(gXQA@7b}>E4J=RfmSD#Ewq94TmKrCFd-Yx6wrAWYy=6w^i8@pB51p zENu7qv`is%q$Cg95v5~Me$ZYnLRaaP2%CySrjD;nA$euOwS=zrE05snRdZ8;tzbhz zQ$b6CrJxPq)x!GCs?OhPVI7_W{8d6{wNs##rB?ll_#H_4b?B#=^r6X7*MAcXdXIbi zy~DmA#A%tp-RBuO$SF(WZ0Zk!pm*f=g8nWoqvZ9(hrapxElg%HFNB}MtLYSr%2Gsa zNe}>pZQR5zc8x8pf2*%y8!o;N^ZXvfcy&1ZLhw!Cp`$B}Vfodu^$}H+-trpUg}KUp Tp60Yn*b4`gP%W}`#isEa7OO-Q literal 0 HcmV?d00001 diff --git a/__pycache__/update_wth.cpython-39.pyc b/__pycache__/update_wth.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..30597cd0430f31e09dd29e128e5888b29681a029 GIT binary patch literal 3686 zcmbtXUvJyU5$BQ=MNzUX+ln10zJR?pZRNX@Vz(#`Z4lIr?|MOdP7piDozR2IXz7>^ zMKa5E5)0Imua9lfFHp!Y1@5EtE9^sG`V^pVeJS$N{$?p9Zk+2&DR8)dW@l!1=QlG7 z=H@&DPv>uc9jq=J#^0%P{xQ+{Io|vQ2sb#3jb8a>J*N9+&(vS5XX&rqtKe(K&d}*O z!)mWObbBr{xW()^eO zH~%w;G$yPt&e+&0tRvcv@jH{V19Qz7+uY>V*G6GatTSWBIA!Asw`oM$lS;wPm>zSa zedJ84g?YyEFEHa$iy5+3R8GP1)yKav$JMc0xP|k~5Py)~q+T#ySv3k5uQ_X-nap_l zTiGaF?wsm2H?aNct}^fJ3}}P1hwjD3yN5Tw4D#40jIWwwCXIrf;$~KjKbcQ$EM~9l z&cprBa57dd1|`g(yBSBh9HhhS z)(SNJ6R$Dy^DricgD4L3&doR-1aW=~jT!5OUDCzrT{h9syL88_VCC-g9yDp2q5%eF zljJwUVgZAKmabA`5#$x?j%xnyUH{X&4|aFjbIQ!Pazz;M{vdy*EZC%~GVPN|%1m=r zr52Bbva>)QDkpq_ey%FRCp1_KljC71$Qhmd@K{E%stnTXWJ^^t5hb!+Q`IQxlUd3^ zgVxm3V-nau)G9Klxx;%kIvRa0y;=}Yo2n8eJbck}ab|k*t*xoX`2z)ljl2b7Fpn+a z*RmSSvzp9h*G%yPj95+rUJH zV_a+$c45J<|0M|n06%=%)_y&0kzY#}9zX4K>(uFjWEaqU@WQivmsWbkQwRNG>{B zhetgQfv0!zj@vT^|skFi?`$SosMJX+vuJhoMhS>5ne?&!af@lT`YT zLchd1@3b3&!jHH@wp7G91*+fRG|DNov6}8DCZvg8a z=9kV4%+1leIOfES(4U94uYXmM#~yqF&6ArI>4CZXR=sdai|C%oX!|X;q_H zUYe|wJ!n}d7LHcQrg2l-(|pUGMMztQv?WMuX=#^>MQB>mXX5couQe<|=E_vVS~0K3 zJ-$j`$hZs{%aF0A$FIO5uV@s@r?#HGg4q^kuj<*Wm|cdnbwschame+eQnU(F>nv~l z61d-!?-iE{>oRHr%GEk*T-zO0x-uMQqk5NudnzI%xY76b!Z;jABvBuj)_BVO1Cb7W z5oT!~f$yZ#>4*xPOZ<@B?pt#`p-X4M7G=R%xFI(@7jlpcH^7Iulf{wzR+xWI>NL!+ zolD*CNXjq&jYp78Bm4T7*N;$4p!_s)+9Q(hOaO$PlzDn=jvGL(A1=m=~* z>7v`iYU{o*)^Iqg#-#=iE8H|L=hU*AW8 z>!$~P_#zyjxTQ zh@li=SO#k!OLcW1ZcvM2x7Y+xF7j4J6}F(1qq_&X_^!wl_pjz2hmx+FE-yjVRMvr8 z$~j6O#nB^W$7#SZoW{q)Brn;^3)1X#>9|NyC504Nb;uQUwAw4;J2dbEMlx|o93CA^E z*05IC4YR>kkb;&_sJSTA8k#mON=Pf^2y?9_wRCS@(}69^`^*LhT`f%IWepozkVnHb#_-o7AQJxyzt>vAhvdb1s$Yih+s+<=z~o Y{5TG8Q5l(&7OFMr*U}VbFS#rK0SGRKPyhe` literal 0 HcmV?d00001 diff --git a/update_wth.py b/update_wth.py index b162931..c3a907d 100644 --- a/update_wth.py +++ b/update_wth.py @@ -11,9 +11,9 @@ import shutil import pandas as pd from datetime import datetime, date, timedelta -from chirps import * +from .CHIRPS import * import joblib -from getnasap import nasa, nasachirps +from .getnasap import nasa, nasachirps #Select requested (.WTH) files from historical repository and copy them to a new folder. def sel_wthfiles(in_file, in_dir, outdir_hist): From 62663477da2d5e6def5092510a5079e14a0c0f1f Mon Sep 17 00:00:00 2001 From: Kelly Thorp Date: Tue, 9 Jan 2024 17:43:24 -0600 Subject: [PATCH 2/2] Fixed issue with missing startDate in get_data2 --- __pycache__/DSSAT_WTH.cpython-39.pyc | Bin 1730 -> 1730 bytes __pycache__/__init__.cpython-39.pyc | Bin 177 -> 177 bytes __pycache__/__main__.cpython-39.pyc | Bin 1248 -> 1248 bytes __pycache__/getnasap.cpython-39.pyc | Bin 6746 -> 6752 bytes __pycache__/update_wth.cpython-39.pyc | Bin 3686 -> 3686 bytes getnasap.py | 4 ++-- 6 files changed, 2 insertions(+), 2 deletions(-) diff --git a/__pycache__/DSSAT_WTH.cpython-39.pyc b/__pycache__/DSSAT_WTH.cpython-39.pyc index 800ed0de88219e1d284047d6f91ecc957d5363f2..717179b3736a8971dff2b983b68077c772a85224 100644 GIT binary patch delta 21 bcmX@adx)1Ok(ZZ?0SI1Po}0RnXB!&;KrjYo delta 21 bcmX@adx)1Ok(ZZ?0SG+qolM@yvyBY^JbMNE diff --git a/__pycache__/__init__.cpython-39.pyc b/__pycache__/__init__.cpython-39.pyc index 6c6458ee1b8cff34cc7272a412908464887d8d26..268b294dfe76fb9201a8cbe0c9978b37e1256c15 100644 GIT binary patch delta 20 acmdnUxRH@3k(ZZ?0SI1Po|`(6XDI+RBL(#U delta 20 acmdnUxRH@3k(ZZ?0SH!JIhj0>XDI+QL9$Xmw6%L?K`0sG_$T+!aFCCphY3s`Fy7BZ%=i!;=+ z)v#u<)v%>-q;U2!F*1~}*Ra(v)iBqvG_x==`)7O>VZEM!b!7iXwt zu3^ezt6@&zNa5^dVq_>`uVF6XDB&#OYGz?%$kVA|OktE{0Fq3S4B0G2^GX;}xSAP( z>bMv1Og7`*$H+VRE4QJt573SxUl5@HB0NEa7m(0oDe?wVx0sUCHhc2uGIFs3dCovw poH4n9S54Hbgr$a|hP4@FGc%CI+{{$uwfP{gA|oT$=Er=s+yG*WE?fWr diff --git a/__pycache__/update_wth.cpython-39.pyc b/__pycache__/update_wth.cpython-39.pyc index 30597cd0430f31e09dd29e128e5888b29681a029..787fc9c9ca6c21b9c7ec5d867d58102476da2c05 100644 GIT binary patch delta 21 bcmaDR^Gt>(k(ZZ?0SI1Po}0RnCyEaMM_LAW delta 21 bcmaDR^Gt>(k(ZZ?0SNT&olM@y6U7GrLe&NH diff --git a/getnasap.py b/getnasap.py index b76a60f..cf88504 100644 --- a/getnasap.py +++ b/getnasap.py @@ -95,7 +95,7 @@ def check_files(user_input, nasa_outdir): return False #Function to check that all NASAPOWER files requested are downloaded. -def get_data2(user_input, cf): +def get_data2(user_input, cf, startDate, endDate, nasa_outdir): if cf[2] < cf[1]: print(cf[1] - cf[2], "missing file(s):", cf[0]) @@ -121,7 +121,7 @@ def nasa(user_input, startDate, endDate, nasa_outdir): get_data(user_input, startDate, endDate, nasa_outdir) cf = check_files(user_input, nasa_outdir) #To check that all files requested were downloaded. if cf: - get_data2(user_input, cf) + get_data2(user_input, cf, startDate, endDate, nasa_outdir) if check_files(user_input, nasa_outdir): print('Program terminated. Please check manually NASAPOWER server response.') sys.exit(1)