cleanup quickstart grid component test

Author: mjreno

test/test_mf6_codec.py

@@ -313,10 +313,14 @@ def test_dumps_rcha():
     gwf = Gwf(dis=dis)
 
     recharge = np.full((nrow, ncol), FILL_DNODATA, dtype=float)
+    irch = np.full((nrow, ncol), 1, dtype=int)
+    irch[0, 0] = 2
+    irch[9, 9] = 2
     recharge[0, 0] = 1.0
     recharge[9, 9] = 0.0
     rch = Rcha(
         parent=gwf,
+        irch=np.expand_dims(irch.ravel(), axis=0),
         recharge=np.expand_dims(recharge.ravel(), axis=0),
         save_flows=True,
         print_input=True,
@@ -333,10 +337,13 @@ def test_dumps_rcha():
     period_section = dumped.split("BEGIN PERIOD 1")[1].split("END PERIOD 1")[0].strip()
     lines = [line.strip() for line in period_section.split("\n") if line.strip()]
 
-    assert len(lines) == 3
+    assert len(lines) == 6
     assert "READASARRAYS" in dumped
-    dump_data = [float(x) for x in lines[2].split()]
-    dump_recharge = np.array(dump_data)
+    dump_irch = [int(x) for x in lines[2].split()]
+    dump_lidx = np.array(dump_irch)
+    assert np.allclose(irch, dump_lidx.reshape(nrow, ncol))
+    dump_rch = [float(x) for x in lines[5].split()]
+    dump_recharge = np.array(dump_rch)
     assert np.allclose(recharge, dump_recharge.reshape(nrow, ncol))
 
     loaded = loads(dumped)

test/test_mf6_component.py

@@ -435,15 +435,15 @@ def test_quickstart_grid(function_tmpdir):
     )
     npf = Npf(parent=gwf, icelltype=0, k=1.0)
 
-    # chd grid based input, step 1 data head array
-    head = np.full((nlay, nrow, ncol), FILL_DNODATA, dtype=float)
-    head[0, 0, 0] = 1.0
-    head[0, 9, 9] = 0.0
-    # TODO: support dict style input keyed on SP with separate grid arrays
-    chd = Chdg(parent=gwf, head=np.expand_dims(head.ravel(), axis=0))
-    # headnone = np.full((nlay, nrow, ncol), FILL_DNODATA, dtype=float)
-    # ts_head = np.stack((head.ravel(), headnone.ravel()), axis=0)
-    # chd = Chdg(parent=gwf, head=ts_head)
+    # Chdg
+    GRID_NODATA = np.full((nlay, nrow, ncol), FILL_DNODATA, dtype=float)
+    head = np.repeat(np.expand_dims(GRID_NODATA, axis=0), repeats=1, axis=0)
+    head[0, 0, 0, 0] = 1.0
+    head[0, 0, 9, 9] = 0.0
+    chd = Chdg(
+        parent=gwf,
+        head=head.reshape(1, -1),
+    )
 
     sim.write()
     sim.run()