From 3a51d17c65d745abf456346ce0c39b790d04d639 Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Tue, 20 Jun 2023 18:46:51 -0600 Subject: [PATCH 1/3] select better subset for testing --- test/test_interpolation.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/test_interpolation.py b/test/test_interpolation.py index 21ecd07cc..c2db9e02c 100644 --- a/test/test_interpolation.py +++ b/test/test_interpolation.py @@ -120,12 +120,12 @@ class Test_interp_hybrid_to_pressure_extrapolate(TestCase): # Pull out inputs _hyam = ds_ccsm.hyam _hybm = ds_ccsm.hybm - temp_in = ds_ccsm.T[:, :, :3, :2] - t_bot = ds_ccsm.TS[:, :3, :2] - geopotential_in = ds_ccsm.Z3[:, :, :3, :2] - humidity_in = ds_ccsm.Q[:, :, :3, :2] * 1000 # g/kg - press_in = ds_ccsm.PS[:, :3, :2] - phis = ds_ccsm.PHIS[:, :3, :2] + temp_in = ds_ccsm.T[:, :, 10:15, 20:25] + t_bot = ds_ccsm.TS[:, 10:15, 20:25] + geopotential_in = ds_ccsm.Z3[:, :, 10:15, 20:25] + humidity_in = ds_ccsm.Q[:, :, 10:15, 20:25] * 1000 # g/kg + press_in = ds_ccsm.PS[:, 10:15, 20:25] + phis = ds_ccsm.PHIS[:, 10:15, 20:25] temp_interp_expected = ds_out.Tp.rename(lev_p='plev') temp_extrap_expected = ds_out.Tpx.rename(lev_p='plev') From 472709ed24d21e67e7392d00838284c31833131d Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Tue, 20 Jun 2023 19:41:49 -0600 Subject: [PATCH 2/3] fix the test data subset on the NCL side --- test/ncl_tests/vinth2p_ecmwf.ncl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/ncl_tests/vinth2p_ecmwf.ncl b/test/ncl_tests/vinth2p_ecmwf.ncl index 01ccf652e..cdbdc07b4 100644 --- a/test/ncl_tests/vinth2p_ecmwf.ncl +++ b/test/ncl_tests/vinth2p_ecmwf.ncl @@ -35,12 +35,12 @@ begin hyam = f->hyam hybm = f->hybm P0mb = 1000. ; reference pressure [mb] - PS = f->PS(:, :2, :1) - T = f->T(:, :, :2, :1) ; MODEL on hybrid levels - Q = f->Q(:, :, :2, :1) - TS = f->TS(:, :2, :1) - Z = f->Z3(:, :, :2, :1) - PHIS = f->PHIS(:, :2, :1) + PS = f->PS(:, 10:14, 20:24) + T = f->T(:, :, 10:14, 20:24) ; MODEL on hybrid levels + Q = f->Q(:, :, 10:14, 20:24) + TS = f->TS(:, 10:14, 20:24) + Z = f->Z3(:, :, 10:14, 20:24) + PHIS = f->PHIS(:, 10:14, 20:24) Q = Q*1000. ; make g/kg for nicer plot Q@units = "g/kg" From 797b92e899c4187a8909c80a49c9aefcb6b6f8ca Mon Sep 17 00:00:00 2001 From: Katelyn FitzGerald <7872563+kafitzgerald@users.noreply.github.com> Date: Tue, 20 Jun 2023 20:31:43 -0600 Subject: [PATCH 3/3] update the NCL output file for testing as well --- test/vinth2p_ecmwf_output.nc | Bin 1960 -> 3824 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/vinth2p_ecmwf_output.nc b/test/vinth2p_ecmwf_output.nc index 20759e2f6eaf36f5dd712b8decace1107e2a44cf..ae06d4356a3e9b87192afce31e165e0fa708da76 100644 GIT binary patch literal 3824 zcmcgse^3jAcY7#C zP;d7x3Kje{Mg?vUNs1M!%rtS5c%#RKsfnqgHfn0pQEN1`(VD0!+Q!=N_pUeNIQ(&u zjNjSsy!UuU!5s5Sg za{>O{kIFT-nA(jngJaKE%$6e8_t6ykfB> zqkFwZlQI_3`|BO+i&$+3dmFvzq}PNN1>5%LEI&#wKvAGY7t&F>aBY-67mCssB18iYX$LrJ-v`I`t>D;e0LQ5b zz`yq%@ZIkNA1VU=tB*mL=>%c@hafbUfN*F4giBLFe69?{+`Awa`9Z8$4C2;w5I++@ ze5(P(6YD{|F#xYVc?DiAYr*sBVK*pl3n)up0i|X*D0@gyj%@~|V;3j~-v;H+b3wVb z7Q87RKdgUj2i{S;!K>>A?0=}}*w zsiSVL$);|~3#e~;)2OS5U#2yuo2c*VyQq8fZFGXEkJk3D8q79c8J+C9PHWS2v}X24 zh|Zw396_gjvXoBC>!*j0yGK8^b}Bvk#gcga4MmStSAEHh1qx)qtqYJ#o==PZy-P|CP)FCm6!M`zyw^EtJ^COwW zok1pX;;^A$!0zK0puMFY+SM-D-Eh0j!@jA#~T>^RI;~>xeEyx-fJh%S?%A`9WUw42q`R|}?K{M*# zUGdH>ko}`TuDJnnNdV*-uYmmX9iY6i50qIBkiXafa_3J$Zr=dPr#}Xz`B_lT8Nf?k z1aHTu@y;z!`s+aH)q&Ew7?j%Mp!|ja?-!fEtC+z%bq^@tc7pQHWbln|0dN0A@MUiU z-^MEN4OD>7;|E{SHSkTz1mDbT@Rc&)o7Duqr#}MU^s(SumJdFE#iN*4j|1_zXw$P=Hpaj-mj^S(|#(vuq)nq zH580^=hcufMi_oY>#mj32_p*VVM$NWBNrLz%+;mzPY&*vN(;RDky=pA(xdXJ)A{UHPo2jNh*0*8;N5F*yY;hlS-Gi3wpZ~hj# z+g8HwSG2*N18ThUs;6Yqt)6kc7kYG8{~P*KS9a)N!9b6H(I0xYR!-=tVXyR*%O`ux z8E=Kl4D-Xe?Rr*%IE~bSb>0uQ|NEVP@E0+Zyh=*bwe~Dkt1E P?__xY$${`Y&vg6`(b>&P delta 594 zcmew$yMlj$IWIE<0|RqTejbowV4CQnBI8z+so#JXByi$ev&sF;))18^CSPFA z;|6JB(*VjchfIFR;s};v>zF)&#SOxIG5HRQTNp?cy9WaU;}@X9xj?)Ph+iBCYXE9w zU^o!QwrAmbjqC%Vy_L>!0XM;dK*E6q!g9_s2?FEHV>Zs2hccZr=i51F&iOI<0Go$` z!=A-pRd%e`e*^JXJI1}&>=@r2wf%kcmF;goHjp9-*ZDl=U_9^mCD(Z;ZC&TBIOsZW z?Pic-3NH3M;rbMt0n=jK&m&duR3otwSXakn>NI z5=4vR@|}z5A65Fh*ZG)3 jne*|W(+5q1_zs#J5jn7W)w~1q#P1%k&G@t5be#YI<_F+<