Merge pull request #2619 from modflowpy/v3.9.4

Release 3.9.4

Author: wpbonelli

.docs/Notebooks/dis_voronoi_example.py

@@ -35,7 +35,7 @@
 
 import flopy
 from flopy.discretization import VertexGrid
-from flopy.utils.triangle import Triangle as Triangle
+from flopy.utils.triangle import Triangle
 from flopy.utils.voronoi import VoronoiGrid
 
 temp_dir = TemporaryDirectory()

.docs/Notebooks/export_vtk_tutorial.py

@@ -211,16 +211,16 @@
 # Create a vtk object
 vtkobj = vtk.Vtk(ml, vertical_exageration=10)
 
-## create some random array data
+# create some random array data
 r_array = np.random.random(ml.modelgrid.nnodes) * 100
 
-## add random data to the VTK object
+# add random data to the VTK object
 vtkobj.add_array(r_array, "random_data")
 
-## add the model botom data to the VTK object
+# add the model botom data to the VTK object
 vtkobj.add_array(ml.dis.botm.array, "botm")
 
-## write the vtk object to file
+# write the vtk object to file
 vtkobj.write(output_dir / "Array_example" / "model.vtu")
 # -
 
@@ -237,12 +237,12 @@
 # create a vtk object
 vtkobj = vtk.Vtk(ml, xml=True, pvd=True, vertical_exageration=10)
 
-## add recharge to the VTK object
+# add recharge to the VTK object
 subset = list(range(10))
 recharge = {k: v for k, v in ml.rch.rech.transient_2ds.items() if k in subset}
 vtkobj.add_transient_array(recharge, "recharge", masked_values=[0])
 
-## write vtk files
+# write vtk files
 vtkobj.write(output_dir / "tr_array_example" / "recharge.vtu")
 # -
 
@@ -258,11 +258,11 @@
 # create the vtk object
 vtkobj = vtk.Vtk(ml, xml=True, pvd=True, vertical_exageration=10)
 
-## add well fluxes to the VTK object
+# add well fluxes to the VTK object
 spd = ml.wel.stress_period_data
 vtkobj.add_transient_list(spd, masked_values=[0])
 
-## write vtk files (skipped, slow)
+# write vtk files (skipped, slow)
 # vtkobj.write(output_dir / "tr_list_example" / "wel_flux.vtu")
 # -
 

.docs/Notebooks/gridgen_example.py

@@ -426,7 +426,7 @@
     structured=False,
 )
 disu = flopy.mfusg.MfUsgDisU(m, **gridprops)
-bas = flopy.modflow.ModflowBas(m)
+bas = flopy.mfusg.MfUsgBas(m)
 lpf = flopy.mfusg.MfUsgLpf(m)
 chd = flopy.modflow.ModflowChd(m, stress_period_data=chdspd)
 sms = flopy.mfusg.MfUsgSms(m)

.docs/Notebooks/groundwater2023_watershed_example.py

@@ -22,22 +22,22 @@
 #
 
 import os
-import pathlib as pl
 import sys
+from pathlib import Path
 
 import git
 import matplotlib as mpl
-import matplotlib.gridspec as gridspec
 import matplotlib.pyplot as plt
 import numpy as np
 import pooch
 import shapely
 import yaml
+from matplotlib import gridspec
 from shapely.geometry import LineString, Polygon
 
 import flopy
-import flopy.plot.styles as styles
 from flopy.discretization import StructuredGrid, VertexGrid
+from flopy.plot import styles
 from flopy.utils.gridgen import Gridgen
 from flopy.utils.gridintersect import GridIntersect
 from flopy.utils.triangle import Triangle
@@ -101,7 +101,7 @@ def set_idomain(grid, boundary):
     nr = idx.shape[0]
     if idx.ndim == 1:
         idx = idx.reshape((nr, 1))
-    idx = tuple([idx[:, i] for i in range(idx.shape[1])])
+    idx = tuple(idx[:, i] for i in range(idx.shape[1]))
     idomain = np.zeros(grid.shape[1:], dtype=int)
     idomain[idx] = 1
     idomain = idomain.reshape(grid.shape)
@@ -111,11 +111,11 @@ def set_idomain(grid, boundary):
 # Check if we are in the repository and define the data path.
 
 try:
-    root = pl.Path(git.Repo(".", search_parent_directories=True).working_dir)
+    root = Path(git.Repo(".", search_parent_directories=True).working_dir)
 except:
     root = None
 
-data_path = root / "examples" / "data" if root else pl.Path.cwd()
+data_path = root / "examples" / "data" if root else Path.cwd()
 folder_name = "groundwater2023"
 fname = "geometries.yml"
 pooch.retrieve(
@@ -482,7 +482,7 @@ def set_idomain(grid, boundary):
 
 # +
 sim = flopy.mf6.MFSimulation()
-gwf = gwf = flopy.mf6.ModflowGwf(sim)
+gwf = flopy.mf6.ModflowGwf(sim)
 dx = dy = 5000.0
 nr = int(Ly / dy)
 nc = int(Lx / dx)
@@ -737,15 +737,15 @@ def set_idomain(grid, boundary):
 
             ax.set_xlim(extent[0], extent[1])
             ax.set_xticks(np.arange(0, 200000, 50000))
-            if idx in (4, 5):
+            if idx in {4, 5}:
                 ax.set_xticklabels(np.arange(0, 200, 50))
                 ax.set_xlabel("x position (km)")
             else:
                 ax.set_xticklabels([])
 
             ax.set_ylim(extent[2], extent[3])
             ax.set_yticks(np.arange(0, 150000, 50000))
-            if idx in (0, 2, 4):
+            if idx in {0, 2, 4}:
                 ax.set_yticklabels(np.arange(0, 150, 50))
                 ax.set_ylabel("y position (km)")
             else:
@@ -886,15 +886,15 @@ def set_idomain(grid, boundary):
 
             ax.set_xlim(extent[0], extent[1])
             ax.set_xticks(np.arange(50000, 120000, 10000))
-            if idx in (4, 5):
+            if idx in {4, 5}:
                 ax.set_xticklabels(np.arange(50, 120, 10))
                 ax.set_xlabel("x position (km)")
             else:
                 ax.set_xticklabels([])
 
             ax.set_ylim(extent[2], extent[3])
             ax.set_yticks(np.arange(35000, 70000, 10000))
-            if idx in (0, 2, 4):
+            if idx in {0, 2, 4}:
                 ax.set_yticklabels(np.arange(35, 75, 10))
                 ax.set_ylabel("y position (km)")
             else:

.docs/Notebooks/mf6_support_example.py

@@ -46,7 +46,7 @@
 # - `sim_ws`: `os.curdir` ('.')
 # - `sim_tdis_file`: 'modflow6.tdis'
 #
-# The `sim_ws` parameter accepts `str` or `os.PathLike` arguments.
+# The `sim_ws` parameter accepts `str` or `PathLike` arguments.
 
 # +
 import os
@@ -495,7 +495,7 @@
 model.dis.export(pth / "dis.nc")
 
 # export the botm array to a shapefile
-model.dis.botm.export(str(pth / "botm.shp"))  # supports os.PathLike or str
+model.dis.botm.export(pth / "botm.shp")  # supports PathLike or str
 # -
 
 # ## Loading an Existing MF6 Simulation
@@ -521,7 +521,7 @@
 
 # +
 # get hydraulic conductivity data object from the data dictionary
-hk = sim.simulation_data.mfdata[(model_name, "npf", "griddata", "k")]
+hk = sim.simulation_data.mfdata[model_name, "npf", "griddata", "k"]
 
 # get specific yield data object from the storage package
 sy = sto_package.sy

.docs/Notebooks/lake_example.py renamed to .docs/Notebooks/mf_boundaries_example.py

@@ -14,7 +14,7 @@
 #     section: mf2005
 # ---
 
-# # Lake Package Example
+# # MODFLOW Boundaries Example
 #
 # First set the path and import the required packages. The flopy path doesn't have to be set if you install flopy from a binary installer. If you want to run this notebook, you have to set the path to your own flopy path.
 

.docs/Notebooks/mf6_mnw2_tutorial01.py renamed to .docs/Notebooks/mf_mnw2_tutorial01.py

@@ -11,7 +11,7 @@
 #     language: python
 #     name: python3
 #   metadata:
-#     section: mf6
+#     section: mf2005
 # ---
 
 # # Working with the Multi-node Well (MNW2) Package

.docs/Notebooks/mf6_sfr_tutorial01.py renamed to .docs/Notebooks/mf_sfr_tutorial01.py

@@ -11,7 +11,7 @@
 #     language: python
 #     name: python3
 #   metadata:
-#     section: mf6
+#     section: mf2005
 # ---
 
 # # SFR2 package loading and querying

.docs/Notebooks/mf_tutorial02.py

@@ -176,7 +176,7 @@
 stress_period_data = {}
 for kper in range(nper):
     for kstp in range(nstp[kper]):
-        stress_period_data[(kper, kstp)] = [
+        stress_period_data[kper, kstp] = [
             "save head",
             "save drawdown",
             "save budget",

.docs/Notebooks/mfusg_conduit_examples.py

@@ -85,7 +85,7 @@
 spd = {}
 for i in range(mf.nper):
     for j in range(mf.dis.nstp[i]):
-        spd[(i, j)] = ["save head", "save budget"]
+        spd[i, j] = ["save head", "save budget"]
 
 oc = flopy.modflow.ModflowOc(mf, stress_period_data=spd, unitnumber=[22, 30, 31, 50])
 
@@ -240,7 +240,7 @@
 spd = {}
 for i in range(mf.nper):
     for j in range(mf.dis.nstp[i]):
-        spd[(i, j)] = ["save head", "save budget"]
+        spd[i, j] = ["save head", "save budget"]
 
 oc = flopy.modflow.ModflowOc(mf, stress_period_data=spd)