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 93a8091dfa..79311c15a4 100644 Binary files a/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.dbf and b/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.dbf differ 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 a8dfaf6965..a965338efa 100644 Binary files a/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shp and b/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shp differ 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 60dea1d612..6940f2cd81 100644 Binary files a/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shx and b/examples/data/mf6/test003_gwfs_disv/test003_gwfs_disv.shx differ 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():