From 8a3ad6ba96c6c1c74a8f419772fdf7350b19ba3c Mon Sep 17 00:00:00 2001 From: jlarsen Date: Wed, 9 Oct 2024 09:57:12 -0700 Subject: [PATCH 1/4] Fix(ZoneFile6.load): Add split statement to input read --- flopy/utils/zonbud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flopy/utils/zonbud.py b/flopy/utils/zonbud.py index 39949a1b0a..2d34934ac3 100644 --- a/flopy/utils/zonbud.py +++ b/flopy/utils/zonbud.py @@ -2289,7 +2289,7 @@ def load(f: Union[str, os.PathLike], model): if method == "open/close": fobj = open(os.path.join(pkg_ws, t[1])) while i < ncells: - t = multi_line_strip(fobj) + t = multi_line_strip(fobj).split() if t[0] == "open/close": if fobj != foo: fobj.close() From 4624de8e7d1698acb776f0c67af5c5757fc91295 Mon Sep 17 00:00:00 2001 From: jlarsen Date: Wed, 9 Oct 2024 10:54:26 -0700 Subject: [PATCH 2/4] test downgrade setup-micromamba to v1 Based on mamba issue discussion #3475 --- .github/workflows/commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index 07d002f5d1..07e7b73bcc 100644 --- a/.github/workflows/commit.yml +++ b/.github/workflows/commit.yml @@ -144,7 +144,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Micromamba - uses: mamba-org/setup-micromamba@v2 + uses: mamba-org/setup-micromamba@v1 with: environment-file: etc/environment.yml cache-environment: true From 571096034855d0810f0c1e58708d70cea818a141 Mon Sep 17 00:00:00 2001 From: jlarsen Date: Wed, 9 Oct 2024 11:41:58 -0700 Subject: [PATCH 3/4] roll back setup-micromamba to v1 --- .github/workflows/rtd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rtd.yml b/.github/workflows/rtd.yml index a342ebcb62..b129889128 100644 --- a/.github/workflows/rtd.yml +++ b/.github/workflows/rtd.yml @@ -80,7 +80,7 @@ jobs: echo $GITHUB_EVENT_NAME - name: Setup Micromamba - uses: mamba-org/setup-micromamba@v2 + uses: mamba-org/setup-micromamba@v1 with: environment-file: etc/environment.yml cache-environment: true From 2485ce6c42661fb90f22a117467f76ac45edc33a Mon Sep 17 00:00:00 2001 From: jlarsen Date: Wed, 9 Oct 2024 14:06:32 -0700 Subject: [PATCH 4/4] fix(resample_to_grid): fix unintended resampling bug introduced by nan masking * remove nan masking from standard scipy resampling methods * allow extrapolate_edges kwarg to be applied to nearest neighbor resampling --- flopy/utils/rasters.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/flopy/utils/rasters.py b/flopy/utils/rasters.py index 4fabf0482b..39697f97cf 100644 --- a/flopy/utils/rasters.py +++ b/flopy/utils/rasters.py @@ -537,13 +537,6 @@ def resample_to_grid( arr = self.get_array(band, masked=True) arr = arr.flatten() - # filter out nan values from the original dataset - if np.isnan(np.sum(arr)): - idx = np.isfinite(arr) - rxc = rxc[idx] - ryc = ryc[idx] - arr = arr[idx] - # step 3: use griddata interpolation to snap to grid data = griddata( (rxc, ryc), @@ -574,7 +567,7 @@ def resample_to_grid( else: raise TypeError(f"{method} method not supported") - if extrapolate_edges and method != "nearest": + if extrapolate_edges: xc = modelgrid.xcellcenters yc = modelgrid.ycellcenters