From f90b9873749835b72bd321dccded539d55e2c355 Mon Sep 17 00:00:00 2001 From: Christian Langevin Date: Thu, 24 Oct 2019 10:14:30 -0500 Subject: [PATCH] tests(t004): fix small issue that only occurs on Windows t004 fails on Windows in comparing a data frame to a numpy array. The i, j, k columns from the data frame were upgraded to long ints. Apparently the default int on Windows is different from the default on mac/linux, so test failures don't show up there. Also stop versioning several shapefiles that are recreated with every test run. --- autotest/t004_test_utilarray.py | 7 +++++-- .../test003_gwfs_disv/test003_gwfs_disv.dbf | Bin 62125 -> 62125 bytes .../test003_gwfs_disv/test003_gwfs_disv.shp | Bin 13700 -> 12100 bytes .../test003_gwfs_disv/test003_gwfs_disv.shx | Bin 900 -> 900 bytes flopy/utils/util_list.py | 1 - 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/autotest/t004_test_utilarray.py b/autotest/t004_test_utilarray.py index b544824334..e98a1dc3d1 100644 --- a/autotest/t004_test_utilarray.py +++ b/autotest/t004_test_utilarray.py @@ -694,7 +694,10 @@ def test_mflist(): fluxcol = 'flux{}'.format(per) dfper = df.dropna(subset=[fluxcol], axis=0).copy() dfper.rename(columns={fluxcol: 'flux'}, inplace=True) - assert np.array_equal(dfper[['k', 'i', 'j', 'flux']].to_records(index=False), data) + dfdata = dfper[['k', 'i', 'j', 'flux']].to_records(index=False) + dfdata = dfdata.astype(data.dtype) + errmsg = 'data not equal:\n {}\n {}'.format(dfdata, data) + assert np.array_equal(dfdata, data), errmsg m4ds = ml.wel.stress_period_data.masked_4D_arrays sp_data = flopy.utils.MfList.masked4D_arrays_to_stress_period_data \ @@ -792,7 +795,7 @@ def test_util3d_reset(): # test_util2d_external_fixed_nomodelws() # test_util2d_external_fixed_path_nomodelws() # test_transient2d() - #test_transient3d() + # test_transient3d() # test_util2d() # test_util3d() # test_how() diff --git a/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.dbf b/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.dbf index 93a8091dfaa2744ad4d090f43b73057b1fb2eaa7..79311c15a40971947cd796dcfcb9b6ad1928f1c3 100644 GIT binary patch literal 62125 zcmeI&%Wl&^7>40+SRvRT7A$)ORcz;Y11!0Ps5FtN+9nl5;`aF)dn%Xw_E=0m*OFf^ z>M~<9Y25zsXL6-yXky`S|>T z(|jJ8FCz1^=J}iL;r{Ao|F{Kre_`IX&^m8hXq~q$xbw%uLwI2K`F|gO9os&i(|pV4 zbDD4Yd`|OipU?H~?(Si?$u<*re>c^99+@v9^RtHe+v?%%Lvq)@-INdCJYPP1^L+X6 zjq`aPcHpmX^VJR-=c^qw&R09|=Zm6!eVcDx-{xD_xB0g9f9|ffSAD@Uf6 z%lY)_2xGOOX&B3EgJJCHM*F55t9`9j_`i|t^8D|9>9MJ^M#|Vr?{DaTU+vBAulBV+ zRo~|2Sx77iT^}EB3McR0KK4AMHEO6_Vgdi{OuB}Qxpu@p|;y?wmaA*~T3 zHiwwUBxP(!ufLDI#E2~*mcq%qw~yC4q%~s1mJsupq>K&e_4l!t7_k+^QaE|{_VHSW zv__2B8e$%kl(8Yb{yz2+A(lNQRnlu2dBcy~dGhVbu8-F`q&4PFx~{RysQVXP>2$qr zNUy(-z0^2)={3{Wef|N--a#L)`nA@G5!2Uwh>e_>zV1V86{*Vq#*{eTa#PQTHJxCPv+dn3x!KA7WZ! z1$7@{iNqpxzo70zERmSq9u62(@>ORE8#Hjla6BDEELrhGJx(_ieu{m`gVu{2eb$?FX zhgc#pyFDCUdYx1EA!b0lYTtD%__DK0jJgjoF)`{s#Kgp?`w$ZoqwYgYOpLk@F)=af zKE%YtsQVDp5?fIBA(luiQui0seTXFzv)jYrrPl>@A7TciYsvSn3%=~^5~J=zOiYZr z4>2(@>ORE8#Hjla6BDEELrhGJx(_iiG3q|Vw8WOweTXFzi`4xkbsu7h#O(HPc$vrCM+4>2(@>ORE8#Hjla6BDEE zLrhGJx(_iiG3q|V#Kfrk5YrM{Q}-d3NGwwK*VKK8B@(mS!{MdZHFY0i2E?oOUB`ki zJG;cF`w$ZoqwYgYOpLk@F)=afKE%YtsQVBT6Qk}!OiYZr4>2jRY)ajSSR%3Kb^kB! CT``RS literal 62125 zcmeI(O-|cD7>Dt+bV)Z=55Ngf{FRRjblEFJltd~564XZO^*h8iGUc_W?aSY`@Z$y0 z8O%&PKeBjG&wibqZ)daFyARjz!>1S5{;=IugI^y%fBNG)z8#MDo8&b3tnbk2t@bk2t@nDfWOL;Zry*Z=eQwL8Xdp^s$*AMfZ>xcQy^}~GE`rmg~+oa?7^W(*fD=A0j zm&;=Qbos{`>r^ZJ-$-)#w5jk#`7>U7Y;LUK8GG&hjs52}PIiB_Z~UwJGA%y~iB&Kf zOaH@2ACK3=$-1|XJ&$RP#>tw*GKg7BJY!=z{yz2+BbGzV!^yh0k7FIv8Zlx8#4IMB zu`wNgAA5-rTR_ai$-1|XV;$2PF=9)ISxh`*V>7fIA7axc zmQwdgug+hANZn7X_Za?wRR14=@VvuiRr|jk8>+GowQl*uP9LqhpHlZ-oGf-j9raM_ z#)wh(Ar_2yc*clP_aP=GM%{;)m>6{*Vq#*{eTa#PQTHJxCPv+dn3h;Z-G`WySfuV} z)P0CKiG|zi%c}bsbsu5@h%mio)P0DFiBb03|&_aP=GM%{;)m>6{* zVq#*{eTa#PQTHJxCPv+dn3h;U-G`WySfuV3)P0CKiG|zi%c}bYbsu5@h_LP#)P0DF ziBb0zKhnSccbsu74V$^+ziHTA7Atok9-G`W%73|& z_aP=GM%{;)me`8A4>2dPNZnsi_aWva7H+REtM0F;`w$C2gmr&K-G`W%73|&_aP=GM%{;)m>6{*Vq#*{eTZp^t*QGEa}tZx{WWzTVoqY=_WH8w{+hZEu>eF^ z_t(^Yh>3|&_aP=GM%{;)m>6{*Vq#*{eTa#PQTHJxCPv+dn3PyDr|v_{N$h#u{|z#u BI>G<| diff --git a/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shp b/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shp index a8dfaf696523a577341c28cc741f46ec9ab039ef..a965338efa8f16098a052d168b4022ed5868f3a4 100644 GIT binary patch literal 12100 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

G z9Mpo<>{)ZbW}PS_HpHN*1@F4`fZrRhAqTZ!HG9?^uvsU{hz&7lYQej1J>d7nYsf(@ zSk~S56gKNb8L=S-%|5*A)&qVrUPBHT)?@N;=UA0LJsc@S^hL(QHw2P}QW)(M(g@UGMUfjAv9uV&Ah12*eK8L^cE zO%8b1>HpB2!@Zh4YYtd)h^-uG`ogLl>^NR?>haD<{U7r^w{NCnd&dkJ`X3Lu}-63D&6bs~Oq)sjl<&x%e>T$b)#}JEhsP=76P- z*g8Q|3*L45KNY7#j>X%{{ctnaVaaja*z%z13-3DppAOHE!@Zh4oBLsX#a0e9eZ4k1 zb9`pb;a<(2H3uyBLu}hZooO8Ih z^{Tnc0ZR_Ct4;o_4fix4zW=)E;M~xKX)}FTR+uxzJ57A3_0>3 z-uP~7_N+Nz=_9sI(A0u=o&K-H>5yab_HsXXoq0-*@?tgR6;a<(2_4@%!eX*4TO<#D|>HpT8!@ZYYHFx&|mK-2wn&f(tHtL82TEIGuM2Tfmi*XjRGc!uAtdo>f+=K@O(u~9QFG<{n?cQqqh zKh<@D1Z?r-K8EPce*37T5)uG9a$I302<-d^rq4p?#=H?}-z`ogV96mi zYQ}}8Z|mo-W@PK9y3W@h$A=+D9-MEzK56!>If_tSv9p(2@UAoGPvUgQL9H9x%YAP% z*J1g4@wjFm-gWXnopZpjQgfGMWyn0QaCfcQ<7aaY`r_f)?{dJhime=IYQeeA{h!Y{ z+^gBMem`KTFSc@^=?m{V{lA!VxL31h%>hdev6TZ&UwGH)|K*&+y_!914p?%CtsH3j z!n;oYOLGqQUV7EseLrByA+|hd`og>iK@O>ze*w#omykh~r@9upXN^21{MBb%JJvcb)!U$LWv* zhLs+>94m9})aMoMt~Go7X3jxhJlykL4p>&Pl><#JIM=!V+c}4OHG9_Y2Q2l)Rt_|M z;a#Wy)j5ZIHG9?^u;dV1IneZlcb)#<%{knw*|X+=C5PC`fu=9K>-7JA&f#9oo;3$7 zImA{DG=1S+r~eOg4)hbeh~43SxL31h%>hde zvDFDpUwGH)|L2^;y_!914p?%CtxjnA!n;oYzvdk7z4UVJelM`(5L+H}Dg9rN>-7IS zc8BNU-qy>t%K=LcvE@ORI&S|<>N@@ZiQOTGdo>f+=K@O(vDFD(YMA@i4f+2M_~~Vi diff --git a/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shx b/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shx index 60dea1d612b8fc08eb1e5baf77dfa1df09300f7e..6940f2cd816f1a37da73a4638db0a8efbaab3f3c 100644 GIT binary patch literal 900 zcmZ|EAxuJX6vg2`4?%tC6Q7Ekfxw(@1OmY^0&@lffnYEY2nGUyU?30(1_HrgAP@`& z0)apv7z{5E3^czmwvPksN~ z*(QJ QM$%Zp9!}+99E(eT0jj}HrvLx| literal 900 zcmZ|LAxuJX5XbR9AWwZNDk|y=1m|QU5C{eWdm|VO1cJdpAQ%h;0>MBa5DW$a!C)W| z3C`D~oj;%2fyR z*u=41i(?VnIF;)utYA;t7GB~5zRQgWUgHyf%FQ#p#TWdMTjzL(uQKGv3%tiSxgEwU ze8dmAbAmVcjNfuMiDm5KT!u4P!-3ojVGbKOlKW9CU<)VmAb}<9;7mr+SjE0Pv@wfy X9LggH^Vr0(JdR@#+c=d@3M-z!kXBO> diff --git a/flopy/utils/util_list.py b/flopy/utils/util_list.py index 4de979cceb..3caec93c33 100644 --- a/flopy/utils/util_list.py +++ b/flopy/utils/util_list.py @@ -463,7 +463,6 @@ def get_dataframe(self, squeeze=True): dfi = dfi.set_index(names) else: dfi = pd.DataFrame.from_records(recs) - # dfi = dfi.set_index(names) dfg = dfi.groupby(names) count = dfg[varnames[0]].count().rename('n') if (count > 1).values.any():