From e6453b3141b538880834b087dad0281d77cd373d Mon Sep 17 00:00:00 2001 From: Joshua Larsen Date: Tue, 18 Jan 2022 12:45:21 -0800 Subject: [PATCH 1/2] fix(Raster): resample_to_grid failure no data masking failure with int raster dtype. --- flopy/utils/rasters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flopy/utils/rasters.py b/flopy/utils/rasters.py index 3aa6a64559..6d4e856a66 100644 --- a/flopy/utils/rasters.py +++ b/flopy/utils/rasters.py @@ -454,7 +454,7 @@ def resample_to_grid( else: for node in range(ncpl): verts = modelgrid.get_cell_vertices(node) - rstr_data = self.sample_polygon(verts, band) + rstr_data = self.sample_polygon(verts, band).astype(float) msk = np.in1d(rstr_data, self.nodatavals) rstr_data[msk] = np.nan @@ -539,7 +539,7 @@ def __threaded_resampling( """ container.acquire() verts = modelgrid.get_cell_vertices(node) - rstr_data = self.sample_polygon(verts, band) + rstr_data = self.sample_polygon(verts, band).astype(float) msk = np.in1d(rstr_data, self.nodatavals) rstr_data[msk] = np.nan From 541583e37a32d589ae7f5f7d799c0d2e68a3eec6 Mon Sep 17 00:00:00 2001 From: Joshua Larsen Date: Tue, 18 Jan 2022 13:58:29 -0800 Subject: [PATCH 2/2] update(test_raster_sampling_methods): update for mean resampling --- autotest/t065_test_gridintersect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autotest/t065_test_gridintersect.py b/autotest/t065_test_gridintersect.py index f37a7f2466..768955b9e7 100644 --- a/autotest/t065_test_gridintersect.py +++ b/autotest/t065_test_gridintersect.py @@ -1398,7 +1398,7 @@ def test_raster_sampling_methods(): methods = { "min": 2088.52343, "max": 2103.54882, - "mean": 2097.05053, + "mean": 2097.05035, "median": 2097.36254, "nearest": 2097.81079, "linear": 2097.81079,