From 0cccc4fa6d6f76a2ead150fba70f1d6081aed024 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Tue, 24 May 2022 17:13:04 -0600 Subject: [PATCH 1/3] add the missing RYF DROF stream entries in xml files --- .../__pycache__/buildnmlcpython-37.pyc | Bin 0 -> 4420 bytes .../__pycache__/buildnmlcpython-39.pyc | Bin 0 -> 4463 bytes drof/cime_config/namelist_definition_drof.xml | 3 + drof/cime_config/stream_definition_drof.xml | 96 ++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 drof/cime_config/__pycache__/buildnmlcpython-37.pyc create mode 100644 drof/cime_config/__pycache__/buildnmlcpython-39.pyc diff --git a/drof/cime_config/__pycache__/buildnmlcpython-37.pyc b/drof/cime_config/__pycache__/buildnmlcpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c397f5576ab588c7e57b9d3766460968c37f20d5 GIT binary patch literal 4420 zcmZu!OLODK5ypTZ2!c;h&$ZWHc;lCxnA&oDu(w<(dv~=PrFJDptHdr=rLYiZNMQv6 z^Z?wIWUwj~CAYZjU*Hmtx#gUbe?d+;%{7FNHuai`I6 z4g6mD;jf4MRm1opo-Jlfvh+dDXWcYA+-Z~wM8nm}ACGH>z56Y;Z9Ch-_d`V7L4=V$Um>=2r2<3OeYv+*QTtHfN4Q$I_5If;2Fp{MpZg9%3Z?0uU~ieCp$ z4bNRX>8J3e+_=C^&e+t}BNL;F9+fb1GL}2sIxfLOOlD-}MTy%NR<1pZ8KE()=9Rq4 zD<2hdoEejcSy`{g_?%7M*y7cxt0^wt{&D^mW4x{Dx3%2m)niM3o7Z@a`i${9Z;-~^ zy0G(7UY(Kl%2Vf}nls*5Vm=v#b+JZ)BN#4wymEnUM@WE@rhcN4BGR%aROfoM!65iqhwKHZ%Ve0jh(Kw0WKV8@L@OzZN z#{xN=kWZx;3B54I&3i$LagqwX`pN%!&y%iqa3r*pCt;jsewxWJ9zMAg=Rw~j6`TYG zUOE{J!V@n`JdQ8{<0MRvJo2lQ6lgg-91Mgc?QH3@4!4`s-ey}} zjoLP|K(CjYtOJe?vr22M$=2|;&Ll1Gmq-SFt9TqdIw$-Zey7ozazZILFW3yZl^cIC zuNhOT$PBp!#ADMk(APi(aa&VSQ%uVl)eIIex}2Nb23KinYg#$CXDsE&AU2ICm&`dU z+|dYHnpU#PoEQ0pS1%mOGdk~7xyx%`As^)qvK4YeZiZ}T4%xIims8#nA{ zIc1!G@Cu(E&lSkVRccAXx z_WhmRor9gdUH|^h!);Z)3_rDU2?$q!cn;Aw7Ma%j{Lw?5u}D9u9wex-UOQ`dbp_^M zB9k%{^Uv%rZ{K>KPtU4y3;@M;x@YFio61?h_1SBW!j!U%C&d>Nq)ATMStB{Y3@K5q z%Y79vxVbDh$bjX^cr2vE*MT8#P~&N8n8G^B83o4zgH*%5e3{-;Tmwr}k}Ruwq79cS zTZ&QgOsKL9Vq^y@3T2%d!Uowyv$-nYrg0aIa>!`3D=gF%rmAYV)}(SwW4TF;^{Y3A zBtwOTYF#m}#?qGN`jJ{N`tlc~@LerOi|@nKFrj=$?_pt4wR9y__)%~uqPbqALw(er zlbqjBLr`5bA8Hv3WIe8@9n_AwhLH`(yk2t4E8ua9?w>7w84d&o4bxP8Q+&=j{{V0{wqXCv|OdoASbINjtASs=FyDzedjHx=) zpDxMZ(jzD_yfZJCVj(!31+`RBLLvd`lIeg7%E2V=QyD>JPakCo7!ObN7YmhoDB^}i zMY(XbtAe#elspT8@S&o1D@w9nai#N0L$2ch+Mt`J_KzPePn&mv8N_J6pXBtqnQ7?Gi4dlOAZSXBoWN~*4Q^bFW|=9 zm1|hFS(XiSC`wLI%b=)!Ch7B8-wF0if(yrf!8Kfe6oj!)miz~JQvJINWOF>9xE`Qj*Cigm=@KFuiX;-ZxZVpB(5_5ic}?-NLBsC*CkN! zG|j|l`y@nJ;y>KE1N>BWfXI)zTBUlNqq6dg&rKg6rjxO%((10RiRi4VspkN$t`5Kg z2WpyF6jTKmxSBG_!e|Z}1Ouv}sf$1^iPvyX=3Yp#QS~ literal 0 HcmV?d00001 diff --git a/drof/cime_config/__pycache__/buildnmlcpython-39.pyc b/drof/cime_config/__pycache__/buildnmlcpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a9178f7e88fc7bd9a2e80a917b5f3acc4d0c91cc GIT binary patch literal 4463 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 literal 0 HcmV?d00001 diff --git a/drof/cime_config/namelist_definition_drof.xml b/drof/cime_config/namelist_definition_drof.xml index 1428a93389..ead6e92098 100644 --- a/drof/cime_config/namelist_definition_drof.xml +++ b/drof/cime_config/namelist_definition_drof.xml @@ -21,6 +21,9 @@ rof.diatren_iaf_ais55_rx1 rof.iaf_jra_1p4_2018 rof.iaf_jra + rof.ryf8485_jra + rof.ryf9091_jra + rof.ryf0304_jra diff --git a/drof/cime_config/stream_definition_drof.xml b/drof/cime_config/stream_definition_drof.xml index 8c3362a9d6..d14e5cbbe2 100644 --- a/drof/cime_config/stream_definition_drof.xml +++ b/drof/cime_config/stream_definition_drof.xml @@ -475,6 +475,102 @@ single + + + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc + + + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/RAF_8485.JRA.v1.3.runoff.180404.nc + + + rofl Forr_rofl + rofi Forr_rofi + + null + + bilinear + + null + 1 + 1984 + 1984 + 0 + + upper + + + cycle + + + 3.0 + + single + + + + + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc + + + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/RAF_9091.JRA.v1.3.runoff.180404.nc + + + rofl Forr_rofl + rofi Forr_rofi + + null + + bilinear + + null + 1 + 1990 + 1990 + 0 + + upper + + + cycle + + + 3.0 + + single + + + + + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc + + + $DIN_LOC_ROOT/lnd/dlnd7/JRA55/RAF_0304.JRA.v1.3.runoff.180404.nc + + + rofl Forr_rofl + rofi Forr_rofi + + null + + bilinear + + null + 1 + 2003 + 2003 + 0 + + upper + + + cycle + + + 3.0 + + single + + $ROF_DOMAIN_MESH From 66a979a05d75756c87f6944d8fbac366ede820b0 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Tue, 24 May 2022 17:17:32 -0600 Subject: [PATCH 2/3] remove inadvertently added pychache --- .../__pycache__/buildnmlcpython-37.pyc | Bin 4420 -> 0 bytes .../__pycache__/buildnmlcpython-39.pyc | Bin 4463 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 drof/cime_config/__pycache__/buildnmlcpython-37.pyc delete mode 100644 drof/cime_config/__pycache__/buildnmlcpython-39.pyc diff --git a/drof/cime_config/__pycache__/buildnmlcpython-37.pyc b/drof/cime_config/__pycache__/buildnmlcpython-37.pyc deleted file mode 100644 index c397f5576ab588c7e57b9d3766460968c37f20d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4420 zcmZu!OLODK5ypTZ2!c;h&$ZWHc;lCxnA&oDu(w<(dv~=PrFJDptHdr=rLYiZNMQv6 z^Z?wIWUwj~CAYZjU*Hmtx#gUbe?d+;%{7FNHuai`I6 z4g6mD;jf4MRm1opo-Jlfvh+dDXWcYA+-Z~wM8nm}ACGH>z56Y;Z9Ch-_d`V7L4=V$Um>=2r2<3OeYv+*QTtHfN4Q$I_5If;2Fp{MpZg9%3Z?0uU~ieCp$ z4bNRX>8J3e+_=C^&e+t}BNL;F9+fb1GL}2sIxfLOOlD-}MTy%NR<1pZ8KE()=9Rq4 zD<2hdoEejcSy`{g_?%7M*y7cxt0^wt{&D^mW4x{Dx3%2m)niM3o7Z@a`i${9Z;-~^ zy0G(7UY(Kl%2Vf}nls*5Vm=v#b+JZ)BN#4wymEnUM@WE@rhcN4BGR%aROfoM!65iqhwKHZ%Ve0jh(Kw0WKV8@L@OzZN z#{xN=kWZx;3B54I&3i$LagqwX`pN%!&y%iqa3r*pCt;jsewxWJ9zMAg=Rw~j6`TYG zUOE{J!V@n`JdQ8{<0MRvJo2lQ6lgg-91Mgc?QH3@4!4`s-ey}} zjoLP|K(CjYtOJe?vr22M$=2|;&Ll1Gmq-SFt9TqdIw$-Zey7ozazZILFW3yZl^cIC zuNhOT$PBp!#ADMk(APi(aa&VSQ%uVl)eIIex}2Nb23KinYg#$CXDsE&AU2ICm&`dU z+|dYHnpU#PoEQ0pS1%mOGdk~7xyx%`As^)qvK4YeZiZ}T4%xIims8#nA{ zIc1!G@Cu(E&lSkVRccAXx z_WhmRor9gdUH|^h!);Z)3_rDU2?$q!cn;Aw7Ma%j{Lw?5u}D9u9wex-UOQ`dbp_^M zB9k%{^Uv%rZ{K>KPtU4y3;@M;x@YFio61?h_1SBW!j!U%C&d>Nq)ATMStB{Y3@K5q z%Y79vxVbDh$bjX^cr2vE*MT8#P~&N8n8G^B83o4zgH*%5e3{-;Tmwr}k}Ruwq79cS zTZ&QgOsKL9Vq^y@3T2%d!Uowyv$-nYrg0aIa>!`3D=gF%rmAYV)}(SwW4TF;^{Y3A zBtwOTYF#m}#?qGN`jJ{N`tlc~@LerOi|@nKFrj=$?_pt4wR9y__)%~uqPbqALw(er zlbqjBLr`5bA8Hv3WIe8@9n_AwhLH`(yk2t4E8ua9?w>7w84d&o4bxP8Q+&=j{{V0{wqXCv|OdoASbINjtASs=FyDzedjHx=) zpDxMZ(jzD_yfZJCVj(!31+`RBLLvd`lIeg7%E2V=QyD>JPakCo7!ObN7YmhoDB^}i zMY(XbtAe#elspT8@S&o1D@w9nai#N0L$2ch+Mt`J_KzPePn&mv8N_J6pXBtqnQ7?Gi4dlOAZSXBoWN~*4Q^bFW|=9 zm1|hFS(XiSC`wLI%b=)!Ch7B8-wF0if(yrf!8Kfe6oj!)miz~JQvJINWOF>9xE`Qj*Cigm=@KFuiX;-ZxZVpB(5_5ic}?-NLBsC*CkN! zG|j|l`y@nJ;y>KE1N>BWfXI)zTBUlNqq6dg&rKg6rjxO%((10RiRi4VspkN$t`5Kg z2WpyF6jTKmxSBG_!e|Z}1Ouv}sf$1^iPvyX=3Yp#QS~ diff --git a/drof/cime_config/__pycache__/buildnmlcpython-39.pyc b/drof/cime_config/__pycache__/buildnmlcpython-39.pyc deleted file mode 100644 index a9178f7e88fc7bd9a2e80a917b5f3acc4d0c91cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4463 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 From eb569de778a6f051c44c412426fc697516657f93 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Tue, 24 May 2022 17:18:50 -0600 Subject: [PATCH 3/3] add pycache to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 259148fa18..34b286f3e9 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ *.exe *.out *.app + +# ignore pycache +__pycache__