misc cleanup

Author: mjreno

docs/examples/array_example.py

@@ -62,12 +62,12 @@
 constant = data_path / "constant.txt"
 external = data_path / "external.txt"
 shape = (1000, 100)
-type = "double"
+dtype = "double"
 
 # Open and load a NumPy array representation
 
 fhandle = open(internal)
-imfa = MFArray.load(fhandle, data_path, shape, type=type, header=False)
+imfa = MFArray.load(fhandle, data_path, shape, type=dtype, header=False)
 
 # Get values
 
@@ -88,7 +88,7 @@
 plt.colorbar()
 
 fhandle = open(constant)
-cmfa = MFArray.load(fhandle, data_path, shape, type=type, header=False)
+cmfa = MFArray.load(fhandle, data_path, shape, type=dtype, header=False)
 cvals = cmfa.value
 plt.imshow(cvals[0:100])
 plt.colorbar()
@@ -111,7 +111,7 @@
 # External
 
 fhandle = open(external)
-emfa = MFArray.load(fhandle, data_path, shape, type=type, header=False)
+emfa = MFArray.load(fhandle, data_path, shape, type=dtype, header=False)
 evals = emfa.value
 evals
 
@@ -137,7 +137,7 @@
 fhandle = open(ilayered)
 shape = (3, 1000, 100)
 ilmfa = MFArray.load(
-    fhandle, data_path, shape, type=type, header=False, layered=True
+    fhandle, data_path, shape, type=dtype, header=False, layered=True
 )
 vals = ilmfa.value
 
@@ -186,7 +186,7 @@
 fhandle = open(clayered)
 shape = (3, 1000, 100)
 clmfa = MFArray.load(
-    fhandle, data_path, shape, type=type, header=False, layered=True
+    fhandle, data_path, shape, type=dtype, header=False, layered=True
 )
 
 clmfa._value
@@ -241,7 +241,7 @@
 fhandle = open(mlayered)
 shape = (3, 1000, 100)
 mlmfa = MFArray.load(
-    fhandle, data_path, shape, type=type, header=False, layered=True
+    fhandle, data_path, shape, type=dtype, header=False, layered=True
 )
 
 mlmfa.how

flopy4/compound.py

@@ -368,8 +368,8 @@ def load(cls, f, **kwargs) -> "MFList":
                 jidx = len(param_cols) - 1
             else:
                 raise ValueError(
-                    "MFList param {params[k].name} has "
-                    "unsupported shape {params[k].shape}"
+                    f"MFList param {params[k].name} has "
+                    f"unsupported shape {params[k].shape}"
                 )
             param_cols.append(pcols)
             param_types.append(params[k].type)
@@ -379,6 +379,7 @@ def load(cls, f, **kwargs) -> "MFList":
             maxsplit = sum(param_cols) - 1
         else:
             maxsplit = -1
+        assert not (jidx >= 0 and maxsplit >= 0)
 
         while True:
             pos = f.tell()

test/data/test_mf6model_0-disu01a_0/disu01a.disu.grb

@@ -183,7 +183,7 @@ def test_load_sim(tmp_path):
     assert s.tdis.params["start_date_time"] == "2041-01-01t00:00:00-05:00"
     assert s.tdis.params["nper"] == 31
     assert np.allclose(
-        s.tdis.params["perioddata"]["perlen"],
+        [float(f) for f in s.tdis.params["perioddata"]["perlen"]],
         np.array(
             [
                 1.0,
@@ -259,7 +259,7 @@ def test_load_sim(tmp_path):
         ),
     )
     assert np.allclose(
-        s.tdis.params["perioddata"]["tsmult"],
+        [float(f) for f in s.tdis.params["perioddata"]["tsmult"]],
         np.array(
             [
                 1.0,
@@ -310,11 +310,11 @@ def test_load_sim(tmp_path):
     assert "scaling_method" in s.solvers["ims_0"].params
     assert "reordering_method" in s.solvers["ims_0"].params
     assert s.solvers["ims_0"].params["print_option"] == "summary"
-    assert s.solvers["ims_0"].params["outer_dvclose"] == 1.00000000e-09
+    assert float(s.solvers["ims_0"].params["outer_dvclose"]) == 1.00000000e-09
     assert s.solvers["ims_0"].params["outer_maximum"] == 500
     assert s.solvers["ims_0"].params["under_relaxation"] == "none"
     assert s.solvers["ims_0"].params["inner_maximum"] == 300
-    assert s.solvers["ims_0"].params["inner_dvclose"] == 1.00000000e-09
+    assert float(s.solvers["ims_0"].params["inner_dvclose"]) == 1.00000000e-09
     assert s.solvers["ims_0"].params["linear_acceleration"] == "bicgstab"
     assert s.solvers["ims_0"].params["relaxation_factor"] == 1.00000000
     assert s.solvers["ims_0"].params["scaling_method"] == "none"
@@ -358,15 +358,15 @@ def test_gwf_chd01(tmp_path):
     if w.returncode == 0:
         os.chdir(tmp_path / "gwf_chd01")
         subprocess.run(["mf6"])
-        os.chdir(tmp_path / "write")
+        os.chdir(write_dir)
         subprocess.run(["mf6"])
         diff = subprocess.run(
             ["diff", f"./{name}.lst", f"../gwf_chd01/{name}.lst"]
         )
-        if diff.stdout:
-            print(f"\nGWF model list file difference: {diff.stdout}")
         if diff.stderr:
             print(diff.stderr)
+        else:
+            print(f"\nmodel lst file diffs: {diff.stdout}")
 
 
 def test_gwf_disv(tmp_path):
@@ -388,15 +388,15 @@ def test_gwf_disv(tmp_path):
     if w.returncode == 0:
         os.chdir(tmp_path / "disv01a")
         subprocess.run(["mf6"])
-        os.chdir(tmp_path / "write")
+        os.chdir(write_dir)
         subprocess.run(["mf6"])
         diff = subprocess.run(
             ["diff", f"./{name}.lst", f"../disv01a/{name}.lst"]
         )
-        if diff.stdout:
-            print(f"\nGWF model list file difference: {diff.stdout}")
         if diff.stderr:
             print(diff.stderr)
+        else:
+            print(f"\nmodel lst file diffs: {diff.stdout}")
 
 
 def test_gwf_disu(tmp_path):
@@ -418,12 +418,12 @@ def test_gwf_disu(tmp_path):
     if w.returncode == 0:
         os.chdir(tmp_path / "disu01a")
         subprocess.run(["mf6"])
-        os.chdir(tmp_path / "write")
+        os.chdir(write_dir)
         subprocess.run(["mf6"])
         diff = subprocess.run(
             ["diff", f"./{name}.lst", f"../disu01a/{name}.lst"]
         )
-        if diff.stdout:
-            print(f"\nGWF model list file difference: {diff.stdout}")
         if diff.stderr:
             print(diff.stderr)
+        else:
+            print(f"\nmodel lst file diffs: {diff.stdout}")