support list or tuple cell ids

Author: wpbonelli

autotest/test_cellbudgetfile.py

@@ -700,32 +700,33 @@ def test_cellbudgetfile_get_ts_aux_vars_mf6_readme_example(function_tmpdir):
         ModflowTdis,
     )
 
-    name = 'mymodel'
-    sim = MFSimulation(sim_name=name, sim_ws=function_tmpdir, exe_name='mf6')
+    name = "mymodel"
+    sim = MFSimulation(sim_name=name, sim_ws=function_tmpdir, exe_name="mf6")
     tdis = ModflowTdis(sim)
     ims = ModflowIms(sim)
     gwf = ModflowGwf(sim, modelname=name, save_flows=True)
     dis = ModflowGwfdis(gwf, nrow=10, ncol=10)
     ic = ModflowGwfic(gwf)
     npf = ModflowGwfnpf(gwf, save_specific_discharge=True)
-    chd = ModflowGwfchd(gwf, stress_period_data=[[(0, 0, 0), 1.],
-                                                        [(0, 9, 9), 0.]])
-    budget_file = name + '.bud'
-    head_file = name + '.hds'
-    oc = ModflowGwfoc(gwf,
-                            budget_filerecord=budget_file,
-                            head_filerecord=head_file,
-                            saverecord=[('HEAD', 'ALL'), ('BUDGET', 'ALL')])
+    chd = ModflowGwfchd(gwf, stress_period_data=[[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]])
+    budget_file = name + ".bud"
+    head_file = name + ".hds"
+    oc = ModflowGwfoc(
+        gwf,
+        budget_filerecord=budget_file,
+        head_filerecord=head_file,
+        saverecord=[("HEAD", "ALL"), ("BUDGET", "ALL")],
+    )
     sim.write_simulation(silent=True)
     sim.run_simulation(silent=True)
 
     hds = gwf.output.head().get_data()
     cbc = gwf.output.budget()
 
-    cellid = (0,5,5)
+    cellid = (0, 5, 5)
 
     head = hds.get_ts(idx=cellid)
-    spdis = cbc.get_ts(idx=cellid, text='DATA-SPDIS')
+    spdis = cbc.get_ts(idx=cellid, text="DATA-SPDIS")
 
 
 @pytest.fixture
@@ -802,7 +803,9 @@ def test_cellbudgetfile_get_ts_aux_vars_mf6_dis(dis_sim):
     spdis_qy = cbc.get_ts(idx=cellid, text=text, variable="qy")
     spdis_qz = cbc.get_ts(idx=cellid, text=text, variable="qz")
 
-    chd_q = cbc.get_ts(idx=cellid, )
+    chd_q = cbc.get_ts(
+        idx=cellid,
+    )
 
     assert spdis_q.shape == spdis_qx.shape == spdis_qy.shape == spdis_qz.shape
     assert spdis_q.shape[1] == 2  # time + 1 data column

flopy/pakbase.py

@@ -515,7 +515,7 @@ def __getitem__(self, item):
             # Oc88 but is not a MfList
             spd = getattr(self, "stress_period_data")
             if isinstance(item, MfList):
-                if not isinstance(item, list) and not isinstance(item, tuple):
+                if not isinstance(item, (list, tuple)):
                     msg = f"package.__getitem__() kper {item} not in data.keys()"
                     assert item in list(spd.data.keys()), msg
                     return spd[item]

flopy/utils/binaryfile/__init__.py

@@ -1747,7 +1747,7 @@ def _cellids(self, idx):
         cellid = []
         for item in idx_list:
             if grid_type == "structured":
-                if not isinstance(item, tuple) or len(item) != 3:
+                if not isinstance(item, (list, tuple)) or len(item) != 3:
                     raise ValueError(
                         f"Expected DIS cell index (layer, row, col), got: {item}"
                     )
@@ -1760,7 +1760,7 @@ def _cellids(self, idx):
                     raise ValueError(f"Column index {j} out of range [0, {self.ncol})")
                 cellid.append((k, i, j))
             elif grid_type == "vertex":
-                if not isinstance(item, tuple) or len(item) != 2:
+                if not isinstance(item, (list, tuple)) or len(item) != 2:
                     raise ValueError(
                         f"Expected DISV cell index (layer, cellid), got: {item}"
                     )