diff --git a/benchmarks/profile/_ff.py b/benchmarks/profile/_ff.py index c8bda0e92..2e7e919e7 100644 --- a/benchmarks/profile/_ff.py +++ b/benchmarks/profile/_ff.py @@ -237,7 +237,7 @@ def build_flopy4(ws: Path, wel: str = "list") -> SimpleNamespace: wels = [ gwf.Wel( filename=f"{NAME}.{name}.wel", - period_data={p: list(cells.items()) for p, cells in data.items()}, + stress_period_data={p: list(cells.items()) for p, cells in data.items()}, print_input=True, print_flows=True, save_flows=True, @@ -272,7 +272,7 @@ def build_flopy4(ws: Path, wel: str = "list") -> SimpleNamespace: oc=gwf.Oc( budget_file=Path(f"{NAME}.cbc"), head_file=Path(f"{NAME}.hds"), - period_data={ + stress_period_data={ 0: [ ("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "STEPS", 1), diff --git a/benchmarks/profile/list_scaling.py b/benchmarks/profile/list_scaling.py index b3f64956b..d7ba194b8 100644 --- a/benchmarks/profile/list_scaling.py +++ b/benchmarks/profile/list_scaling.py @@ -61,7 +61,9 @@ def build_sim(n: int, ws: Path): idomain=np.ones((nlay, nrow, n), dtype=int), ) dims = {"nper": nper, **grid.dims} - rch = flopy4.mf6.gwf.Rch(period_data={0: [((0, 0, c), 0.001) for c in range(n)]}, dims=dims) + rch = flopy4.mf6.gwf.Rch( + stress_period_data={0: [((0, 0, c), 0.001) for c in range(n)]}, dims=dims + ) gwf = flopy4.mf6.gwf.Gwf( name="diag", dis=grid, diff --git a/benchmarks/profile/test_large_write.py b/benchmarks/profile/test_large_write.py index 78a6f0695..9c2a054cc 100644 --- a/benchmarks/profile/test_large_write.py +++ b/benchmarks/profile/test_large_write.py @@ -110,10 +110,12 @@ class Model1000(Model): def __init__(self, gwf3): super().__init__(gwf3.npf.k.array) self.chd = { - tuple(int(x) for x in rec[0]): float(rec[1]) for rec in gwf3.chd.period_data.data[0] + tuple(int(x) for x in rec[0]): float(rec[1]) + for rec in gwf3.chd.stress_period_data.data[0] } self.wel = { - tuple(int(x) for x in rec[0]): float(rec[1]) for rec in gwf3.wel.period_data.data[1] + tuple(int(x) for x in rec[0]): float(rec[1]) + for rec in gwf3.wel.stress_period_data.data[1] } self.rch = { "uniform": np.full((self.nper, self.ncpl), 0.001), @@ -174,7 +176,7 @@ def base4(self, dims) -> dict: oc=gwf.Oc( budget_file=Path(f"{self.name}.cbc"), head_file=Path(f"{self.name}.hds"), - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, dims=dims, ), ) @@ -248,10 +250,12 @@ def __init__(self, gwf3): # drop WEL's auxiliary iface column self.wel = { period: {tuple(int(x) for x in rec[0]): float(rec[1]) for rec in records} - for period, records in gwf3.wel.period_data.data.items() + for period, records in gwf3.wel.stress_period_data.data.items() } # constant head 0, with the time series stripped - self.chd = {tuple(int(x) for x in rec[0]): 0.0 for rec in gwf3.chd.period_data.data[0]} + self.chd = { + tuple(int(x) for x in rec[0]): 0.0 for rec in gwf3.chd.stress_period_data.data[0] + } def grid(self): import flopy4 @@ -295,7 +299,7 @@ def base4(self, dims) -> dict: oc=gwf.Oc( budget_file=Path(f"{self.name}.cbc"), head_file=Path(f"{self.name}.hds"), - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, dims=dims, ), rch=[gwf.Rcha(recharge=self.rcha, dims=dims)], @@ -393,8 +397,10 @@ def test_test1000_sparse(benchmark, quiet, tmp_path, test1000, variant): def lists(dims): return dict( - chd=gwf.Chd(period_data=spd({0: t.chd}), print_flows=True, save_flows=True, dims=dims), - wel=gwf.Wel(period_data=spd({1: t.wel}), save_flows=True, dims=dims), + chd=gwf.Chd( + stress_period_data=spd({0: t.chd}), print_flows=True, save_flows=True, dims=dims + ), + wel=gwf.Wel(stress_period_data=spd({1: t.wel}), save_flows=True, dims=dims), ) def grids(dims): @@ -445,7 +451,7 @@ def test_test1000_rch(benchmark, quiet, tmp_path, test1000, data, variant): rch_list = spd(t.rch_list(data)) def packages(dims): - return dict(rch=[gwf.Rch(period_data=rch_list, dims=dims)]) + return dict(rch=[gwf.Rch(stress_period_data=rch_list, dims=dims)]) else: def packages(dims): @@ -466,8 +472,10 @@ def test_test1005(benchmark, quiet, tmp_path, test1005, variant): def lists(dims): return dict( - chd=gwf.Chd(period_data=spd({0: t.chd}), print_flows=True, save_flows=True, dims=dims), - wel=gwf.Wel(period_data=spd(t.wel), save_flows=True, dims=dims), + chd=gwf.Chd( + stress_period_data=spd({0: t.chd}), print_flows=True, save_flows=True, dims=dims + ), + wel=gwf.Wel(stress_period_data=spd(t.wel), save_flows=True, dims=dims), ) def grids(dims): diff --git a/docs/examples/circle.ipynb b/docs/examples/circle.ipynb index 3ad35492a..08dd77247 100644 --- a/docs/examples/circle.ipynb +++ b/docs/examples/circle.ipynb @@ -581,7 +581,7 @@ "sto = flopy4.mf6.gwf.Sto(\n", " ss=1.0e-5,\n", " sy=0.15,\n", - " period_data={0: [(\"STEADY-STATE\",)]},\n", + " stress_period_data={0: [(\"STEADY-STATE\",)]},\n", " iconvert=0,\n", " dims=dims,\n", ")" @@ -610,7 +610,7 @@ "for i in np.where(chd_location)[0]:\n", " chd_head[(1, int(i))] = 1.0\n", "chd = flopy4.mf6.gwf.Chd(\n", - " period_data={0: [(cellid, head_val) for cellid, head_val in chd_head.items()]},\n", + " stress_period_data={0: [(cellid, head_val) for cellid, head_val in chd_head.items()]},\n", " print_input=True,\n", " print_flows=True,\n", " save_flows=True,\n", @@ -633,7 +633,7 @@ "outputs": [], "source": [ "# Recharge: uniform rate applied to every cell in the top layer.\n", - "rch = flopy4.mf6.gwf.Rch(period_data={0: [((0, j), 0.001) for j in range(ncpl)]}, dims=dims)" + "rch = flopy4.mf6.gwf.Rch(stress_period_data={0: [((0, j), 0.001) for j in range(ncpl)]}, dims=dims)" ] }, { @@ -654,7 +654,7 @@ "oc = flopy4.mf6.gwf.Oc(\n", " budget_file=\"gwf.bud\",\n", " head_file=\"gwf.hds\",\n", - " period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\"), (\"SAVE\", \"BUDGET\", \"ALL\")]},\n", + " stress_period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\"), (\"SAVE\", \"BUDGET\", \"ALL\")]},\n", " dims=dims,\n", ")" ] diff --git a/docs/examples/circle.py b/docs/examples/circle.py index efbf088a7..824b887a6 100644 --- a/docs/examples/circle.py +++ b/docs/examples/circle.py @@ -172,7 +172,7 @@ def plot_head_ugrid(head, cbc, workspace): sto = flopy4.mf6.gwf.Sto( ss=1.0e-5, sy=0.15, - period_data={0: [("STEADY-STATE",)]}, + stress_period_data={0: [("STEADY-STATE",)]}, iconvert=0, dims=dims, ) @@ -186,7 +186,7 @@ def plot_head_ugrid(head, cbc, workspace): for i in np.where(chd_location)[0]: chd_head[(1, int(i))] = 1.0 chd = flopy4.mf6.gwf.Chd( - period_data={0: [(cellid, head_val) for cellid, head_val in chd_head.items()]}, + stress_period_data={0: [(cellid, head_val) for cellid, head_val in chd_head.items()]}, print_input=True, print_flows=True, save_flows=True, @@ -194,13 +194,13 @@ def plot_head_ugrid(head, cbc, workspace): ) # Recharge: uniform rate applied to every cell in the top layer. -rch = flopy4.mf6.gwf.Rch(period_data={0: [((0, j), 0.001) for j in range(ncpl)]}, dims=dims) +rch = flopy4.mf6.gwf.Rch(stress_period_data={0: [((0, j), 0.001) for j in range(ncpl)]}, dims=dims) # Output control: write heads and budget to binary files. oc = flopy4.mf6.gwf.Oc( budget_file="gwf.bud", head_file="gwf.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, dims=dims, ) diff --git a/docs/examples/frenchman-flat.ipynb b/docs/examples/frenchman-flat.ipynb index 1777a6ac6..c1270e26f 100644 --- a/docs/examples/frenchman-flat.ipynb +++ b/docs/examples/frenchman-flat.ipynb @@ -815,7 +815,7 @@ "# Constant-rate pumping well: alternates between extraction and shut-in.\n", "wel_crt = flopy4.mf6.gwf.Wel(\n", " filename=\"ff.crt.wel\",\n", - " period_data={\n", + " stress_period_data={\n", " 0: [((1, 43, 43), -30992.50)],\n", " 1: [((1, 43, 43), -00000.0)],\n", " 2: [((1, 43, 43), -30992.50)],\n", @@ -847,7 +847,7 @@ "# Leakage well: injects contaminated water at rates that vary by period.\n", "wel_leak = flopy4.mf6.gwf.Wel(\n", " filename=\"ff.leak.wel\",\n", - " period_data={\n", + " stress_period_data={\n", " 0: [((1, 43, 43), 1.0000000e-05)],\n", " 7: [((1, 43, 43), 1.5000000e03)],\n", " 8: [((1, 43, 43), 2.6500000e03)],\n", @@ -888,7 +888,7 @@ "# Sampling well: extracts water for monitoring at scheduled intervals.\n", "wel_sampleQ = flopy4.mf6.gwf.Wel(\n", " filename=\"ff.sampleQ.wel\",\n", - " period_data={\n", + " stress_period_data={\n", " 0: [((1, 43, 43), -00000.0)],\n", " 22: [((1, 43, 43), -04981.90)],\n", " 23: [((1, 43, 43), -00000.0)],\n", @@ -926,7 +926,7 @@ "oc = flopy4.mf6.gwf.Oc(\n", " budget_file=Path(\"ff.cbc\"),\n", " head_file=Path(\"ff.hds\"),\n", - " period_data={\n", + " stress_period_data={\n", " 0: [\n", " (\"SAVE\", \"HEAD\", \"ALL\"),\n", " (\"SAVE\", \"BUDGET\", \"STEPS\", 1),\n", diff --git a/docs/examples/frenchman-flat.py b/docs/examples/frenchman-flat.py index 10fabd017..39d1d7d45 100644 --- a/docs/examples/frenchman-flat.py +++ b/docs/examples/frenchman-flat.py @@ -533,7 +533,7 @@ def plot_head_ugrid(head, cbc, grid, workspace): # Constant-rate pumping well: alternates between extraction and shut-in. wel_crt = flopy4.mf6.gwf.Wel( filename="ff.crt.wel", - period_data={ + stress_period_data={ 0: [((1, 43, 43), -30992.50)], 1: [((1, 43, 43), -00000.0)], 2: [((1, 43, 43), -30992.50)], @@ -550,7 +550,7 @@ def plot_head_ugrid(head, cbc, grid, workspace): # Leakage well: injects contaminated water at rates that vary by period. wel_leak = flopy4.mf6.gwf.Wel( filename="ff.leak.wel", - period_data={ + stress_period_data={ 0: [((1, 43, 43), 1.0000000e-05)], 7: [((1, 43, 43), 1.5000000e03)], 8: [((1, 43, 43), 2.6500000e03)], @@ -576,7 +576,7 @@ def plot_head_ugrid(head, cbc, grid, workspace): # Sampling well: extracts water for monitoring at scheduled intervals. wel_sampleQ = flopy4.mf6.gwf.Wel( filename="ff.sampleQ.wel", - period_data={ + stress_period_data={ 0: [((1, 43, 43), -00000.0)], 22: [((1, 43, 43), -04981.90)], 23: [((1, 43, 43), -00000.0)], @@ -599,7 +599,7 @@ def plot_head_ugrid(head, cbc, grid, workspace): oc = flopy4.mf6.gwf.Oc( budget_file=Path("ff.cbc"), head_file=Path("ff.hds"), - period_data={ + stress_period_data={ 0: [ ("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "STEPS", 1), diff --git a/docs/examples/period-data.ipynb b/docs/examples/period-data.ipynb index 0e8742f23..fe11252b5 100644 --- a/docs/examples/period-data.ipynb +++ b/docs/examples/period-data.ipynb @@ -153,7 +153,7 @@ " auxiliary=[\"conc\"],\n", " boundnames=True,\n", " ts=[pumping],\n", - " period_data={\n", + " stress_period_data={\n", " 0: [\n", " ((0, 0, 0), -1.0, (5.0,), \"north\"),\n", " ((0, 2, 3), \"pumping\", (0.0,), None),\n", @@ -171,7 +171,7 @@ "id": "824dbac9", "metadata": {}, "source": [ - "Rows come back as `Wel.PeriodData` objects, which can also be built\n", + "Rows come back as `Wel.StressPeriodData` objects, which can also be built\n", "by name." ] }, @@ -185,17 +185,17 @@ "name": "stdout", "output_type": "stream", "text": [ - "Wel.PeriodData(cellid=(0, 0, 0), q=-1.0, aux=(5.0,), boundname='north')\n" + "Wel.StressPeriodData(cellid=(0, 0, 0), q=-1.0, aux=(5.0,), boundname='north')\n" ] } ], "source": [ - "row = wel.period_data[0][0]\n", + "row = wel.stress_period_data[0][0]\n", "print(row)\n", "assert row.q == -1.0 and row.aux == (5.0,) and row.boundname == \"north\"\n", - "assert row == Wel.PeriodData(cellid=(0, 0, 0), q=-1.0, aux=(5.0,), boundname=\"north\")\n", - "assert str(wel.period_data[0][1].q) == \"pumping\"\n", - "assert list(wel.period_data) == [0, 2]" + "assert row == Wel.StressPeriodData(cellid=(0, 0, 0), q=-1.0, aux=(5.0,), boundname=\"north\")\n", + "assert str(wel.stress_period_data[0][1].q) == \"pumping\"\n", + "assert list(wel.stress_period_data) == [0, 2]" ] }, { @@ -844,18 +844,18 @@ "name": "stdout", "output_type": "stream", "text": [ - "0 [Wel.PeriodData(cellid=(0, 0, 0), q=-1.0, aux=(5.0,), boundname='north'), Wel.PeriodData(cellid=(0, 2, 3), q=TimeSeriesRef(name='pumping'), aux=(0.0,), boundname=None)]\n", - "1 [Wel.PeriodData(cellid=(0, 0, 0), q=-2.0, aux=(5.0,), boundname='north'), Wel.PeriodData(cellid=(0, 2, 3), q=TimeSeriesRef(name='pumping'), aux=(0.0,), boundname=None)]\n", - "2 [Wel.PeriodData(cellid=(0, 1, 1), q=-2.5, aux=(3.0,), boundname='east-2')]\n" + "0 [Wel.StressPeriodData(cellid=(0, 0, 0), q=-1.0, aux=(5.0,), boundname='north'), Wel.StressPeriodData(cellid=(0, 2, 3), q=TimeSeriesRef(name='pumping'), aux=(0.0,), boundname=None)]\n", + "1 [Wel.StressPeriodData(cellid=(0, 0, 0), q=-2.0, aux=(5.0,), boundname='north'), Wel.StressPeriodData(cellid=(0, 2, 3), q=TimeSeriesRef(name='pumping'), aux=(0.0,), boundname=None)]\n", + "2 [Wel.StressPeriodData(cellid=(0, 1, 1), q=-2.5, aux=(3.0,), boundname='east-2')]\n" ] } ], "source": [ - "for kper, rows in wel.period_data.items():\n", + "for kper, rows in wel.stress_period_data.items():\n", " print(kper, rows)\n", - "assert list(wel.period_data) == [0, 1, 2]\n", - "assert wel.period_data[1][0].q == -2.0\n", - "assert len(wel.period_data[2]) == 1" + "assert list(wel.stress_period_data) == [0, 1, 2]\n", + "assert wel.stress_period_data[1][0].q == -2.0\n", + "assert len(wel.stress_period_data[2]) == 1" ] }, { @@ -873,8 +873,8 @@ "metadata": {}, "outputs": [], "source": [ - "assert wel.period_data[2][0].aux == (3.0,)\n", - "assert wel.period_data[2][0].boundname == \"east-2\"" + "assert wel.stress_period_data[2][0].aux == (3.0,)\n", + "assert wel.stress_period_data[2][0].boundname == \"east-2\"" ] }, { @@ -909,7 +909,7 @@ " print(e)\n", "edited[\"conc\"][0, 0, 2, 0] = 1.0\n", "wel.from_xarray(edited)\n", - "assert len(wel.period_data[0]) == 3" + "assert len(wel.stress_period_data[0]) == 3" ] }, { @@ -944,7 +944,7 @@ "source": [ "wel = Wel(\n", " parent=gwf,\n", - " period_data={0: [((0, 1, 1), -2.0), ((0, 1, 1), -0.5)]},\n", + " stress_period_data={0: [((0, 1, 1), -2.0), ((0, 1, 1), -0.5)]},\n", ")\n", "try:\n", " wel.to_xarray()\n", @@ -1489,9 +1489,9 @@ "assert list(sparse[\"q\"].values) == [-2.0, -0.5]\n", "assert list(sparse[\"cellid_row\"].values) == [1, 1]\n", "\n", - "expected = wel.period_data\n", + "expected = wel.stress_period_data\n", "wel.from_xarray(sparse)\n", - "assert wel.period_data == expected" + "assert wel.stress_period_data == expected" ] }, { @@ -1515,7 +1515,7 @@ "evt = Evt(\n", " parent=gwf,\n", " nseg=3,\n", - " period_data={\n", + " stress_period_data={\n", " 0: [\n", " # cell, surface, rate, depth, pxdp, petm\n", " ((0, 0, 0), 1.0, 0.1, 2.0, (0.3, 0.6), (0.5, 0.2)),\n", @@ -1523,7 +1523,7 @@ " ]\n", " },\n", ")\n", - "assert evt.period_data[0][0].pxdp == (0.3, 0.6)" + "assert evt.stress_period_data[0][0].pxdp == (0.3, 0.6)" ] }, { @@ -2071,9 +2071,9 @@ "source": [ "np.testing.assert_array_equal(pxdp[0, :, 0, 0, 0], [0.3, 0.6])\n", "\n", - "expected = evt.period_data\n", + "expected = evt.stress_period_data\n", "evt.from_xarray(ds)\n", - "assert evt.period_data == expected" + "assert evt.stress_period_data == expected" ] }, { @@ -2097,8 +2097,8 @@ "Ims(parent=sim, models=[gwf])\n", "gwf.npf = Npf()\n", "gwf.ic = Ic(strt=1.0)\n", - "Chd(parent=gwf, period_data={0: [((0, 0, 3), 1.0)]})\n", - "gwf.oc = Oc(head_file=f\"{gwf.name}.hds\", period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\")]})\n", + "Chd(parent=gwf, stress_period_data={0: [((0, 0, 3), 1.0)]})\n", + "gwf.oc = Oc(head_file=f\"{gwf.name}.hds\", stress_period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\")]})\n", "sim.write()\n", "sim.run()" ] diff --git a/docs/examples/period-data.py b/docs/examples/period-data.py index 2806b84cd..e55fe4c04 100644 --- a/docs/examples/period-data.py +++ b/docs/examples/period-data.py @@ -66,7 +66,7 @@ auxiliary=["conc"], boundnames=True, ts=[pumping], - period_data={ + stress_period_data={ 0: [ ((0, 0, 0), -1.0, (5.0,), "north"), ((0, 2, 3), "pumping", (0.0,), None), @@ -78,15 +78,15 @@ }, ) -# Rows come back as `Wel.PeriodData` objects, which can also be built +# Rows come back as `Wel.StressPeriodData` objects, which can also be built # by name. -row = wel.period_data[0][0] +row = wel.stress_period_data[0][0] print(row) assert row.q == -1.0 and row.aux == (5.0,) and row.boundname == "north" -assert row == Wel.PeriodData(cellid=(0, 0, 0), q=-1.0, aux=(5.0,), boundname="north") -assert str(wel.period_data[0][1].q) == "pumping" -assert list(wel.period_data) == [0, 2] +assert row == Wel.StressPeriodData(cellid=(0, 0, 0), q=-1.0, aux=(5.0,), boundname="north") +assert str(wel.stress_period_data[0][1].q) == "pumping" +assert list(wel.stress_period_data) == [0, 2] # ### The array view # @@ -128,16 +128,16 @@ # `from_xarray()` writes a block only where a period changes, so period 1 # now has its own block, and period 2's wells come back as one summed well. -for kper, rows in wel.period_data.items(): +for kper, rows in wel.stress_period_data.items(): print(kper, rows) -assert list(wel.period_data) == [0, 1, 2] -assert wel.period_data[1][0].q == -2.0 -assert len(wel.period_data[2]) == 1 +assert list(wel.stress_period_data) == [0, 1, 2] +assert wel.stress_period_data[1][0].q == -2.0 +assert len(wel.stress_period_data[2]) == 1 # Summing adds auxiliary values too, and keeps the last row's boundname. -assert wel.period_data[2][0].aux == (3.0,) -assert wel.period_data[2][0].boundname == "east-2" +assert wel.stress_period_data[2][0].aux == (3.0,) +assert wel.stress_period_data[2][0].boundname == "east-2" # To add a feature, set all of its variables at the cell. Setting only some # raises an error naming the missing one. @@ -150,7 +150,7 @@ print(e) edited["conc"][0, 0, 2, 0] = 1.0 wel.from_xarray(edited) -assert len(wel.period_data[0]) == 3 +assert len(wel.stress_period_data[0]) == 3 # ### Two features in one cell # @@ -163,7 +163,7 @@ wel = Wel( parent=gwf, - period_data={0: [((0, 1, 1), -2.0), ((0, 1, 1), -0.5)]}, + stress_period_data={0: [((0, 1, 1), -2.0), ((0, 1, 1), -0.5)]}, ) try: wel.to_xarray() @@ -179,9 +179,9 @@ assert list(sparse["q"].values) == [-2.0, -0.5] assert list(sparse["cellid_row"].values) == [1, 1] -expected = wel.period_data +expected = wel.stress_period_data wel.from_xarray(sparse) -assert wel.period_data == expected +assert wel.stress_period_data == expected # - # ### Several values in one column @@ -192,7 +192,7 @@ evt = Evt( parent=gwf, nseg=3, - period_data={ + stress_period_data={ 0: [ # cell, surface, rate, depth, pxdp, petm ((0, 0, 0), 1.0, 0.1, 2.0, (0.3, 0.6), (0.5, 0.2)), @@ -200,7 +200,7 @@ ] }, ) -assert evt.period_data[0][0].pxdp == (0.3, 0.6) +assert evt.stress_period_data[0][0].pxdp == (0.3, 0.6) # In the array view these get an extra `nseg-1` dim. A cell needs all of its # segment values. @@ -213,9 +213,9 @@ # + np.testing.assert_array_equal(pxdp[0, :, 0, 0, 0], [0.3, 0.6]) -expected = evt.period_data +expected = evt.stress_period_data evt.from_xarray(ds) -assert evt.period_data == expected +assert evt.stress_period_data == expected # - # ### Writing and running @@ -226,8 +226,8 @@ Ims(parent=sim, models=[gwf]) gwf.npf = Npf() gwf.ic = Ic(strt=1.0) -Chd(parent=gwf, period_data={0: [((0, 0, 3), 1.0)]}) -gwf.oc = Oc(head_file=f"{gwf.name}.hds", period_data={0: [("SAVE", "HEAD", "ALL")]}) +Chd(parent=gwf, stress_period_data={0: [((0, 0, 3), 1.0)]}) +gwf.oc = Oc(head_file=f"{gwf.name}.hds", stress_period_data={0: [("SAVE", "HEAD", "ALL")]}) sim.write() sim.run() diff --git a/docs/examples/quickstart.ipynb b/docs/examples/quickstart.ipynb index 3b79407b0..ddad3d0f9 100644 --- a/docs/examples/quickstart.ipynb +++ b/docs/examples/quickstart.ipynb @@ -273,7 +273,7 @@ "# Constant-head boundary: pin two corner cells to create a diagonal head gradient.\n", "chd = Chd(\n", " parent=gwf,\n", - " period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]},\n", + " stress_period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]},\n", ")" ] }, @@ -313,7 +313,7 @@ "gwf.oc = Oc(\n", " budget_file=f\"{gwf.name}.bud\",\n", " head_file=f\"{gwf.name}.hds\",\n", - " period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\"), (\"SAVE\", \"BUDGET\", \"ALL\")]},\n", + " stress_period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\"), (\"SAVE\", \"BUDGET\", \"ALL\")]},\n", ")" ] }, diff --git a/docs/examples/quickstart.py b/docs/examples/quickstart.py index 73a304b43..9e8039b3e 100644 --- a/docs/examples/quickstart.py +++ b/docs/examples/quickstart.py @@ -7,7 +7,7 @@ # # Quickstart example: # * define a `Simulation` and attach packages using the `parent=` API -# * inspect package data via `period_data` and `to_dataarray()` +# * inspect package data via `stress_period_data` and `to_dataarray()` # * read binary head and budget output via `gwf.output` # * produce a filled-contour + quiver plot with matplotlib @@ -82,7 +82,7 @@ # Constant-head boundary: pin two corner cells to create a diagonal head gradient. chd = Chd( parent=gwf, - period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}, + stress_period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}, ) # Initial conditions: uniform starting head of 1.0 m across the grid. @@ -92,7 +92,7 @@ gwf.oc = Oc( budget_file=f"{gwf.name}.bud", head_file=f"{gwf.name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) # ### Write and run @@ -103,15 +103,15 @@ # ### Verify package data # List-based period data (CHD, OC) is accessible directly via -# `period_data`, a `dict[kper, list[Item]]` of the rows given at +# `stress_period_data`, a `dict[kper, list[Item]]` of the rows given at # construction. Griddata arrays (DIS) are accessible via `to_dataarray()`, # which reshapes the flat stored array to dims named for the grid's axes (layer, row, col). -assert chd.period_data[0][0].head == 1.0 -assert chd.period_data[0][1].head == 0.0 +assert chd.stress_period_data[0][0].head == 1.0 +assert chd.stress_period_data[0][1].head == 0.0 assert gwf.dis.to_dataarray("botm").isel(layer=0, row=0, col=0) == 0.0 -assert gwf.oc.period_data[0][0].rtype == "HEAD" -assert gwf.oc.period_data[0][0].ocsetting == "ALL" +assert gwf.oc.stress_period_data[0][0].rtype == "HEAD" +assert gwf.oc.stress_period_data[0][0].ocsetting == "ALL" # ### Read results # diff --git a/docs/examples/quickstart_expanded.py b/docs/examples/quickstart_expanded.py index bb4399866..affff5ab5 100644 --- a/docs/examples/quickstart_expanded.py +++ b/docs/examples/quickstart_expanded.py @@ -42,23 +42,23 @@ chd = Chd( parent=gwf, # 1) tuples (like flopy3) - period_data=[[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]], + stress_period_data=[[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]], # # (a tangential idea) # "*" could mean "apply to all stress periods"? # this is the default anyway if only one period # is specified. "*" is just a bit more explicit - # period_data={ + # stress_period_data={ # "*": [[(0, 0, 0), 1.], [(0, 9, 9), 0.]] # } # # 2) dictionaries - # period_data=[ + # stress_period_data=[ # {(0, 0, 0): {"head": 1.}, (0, 9, 9): {"head": 0.}} # ] # # 3) typed records - # period_data=[ + # stress_period_data=[ # Chd.Period(cellid=(0, 0, 0), head=1.), # Chd.Period(cellid=(0, 9, 9), head=0.), # ], @@ -71,20 +71,20 @@ # chd.data["head"].loc(dict(k=0, i=9, j=9)) = 0. # # 5) xarray, object dtype -# chd.data["period_data"].loc(dict(k=0, i=0, j=0)) = Chd.Period(head=1.) -# chd.data["period_data"].loc(dict(k=0, i=9, j=9)) = Chd.Period(head=0.) +# chd.data["stress_period_data"].loc(dict(k=0, i=0, j=0)) = Chd.Period(head=1.) +# chd.data["stress_period_data"].loc(dict(k=0, i=9, j=9)) = Chd.Period(head=0.) # # 5a) xarray, object dtype, labeled vars (does this work? TODO test it) -# chd.data["period_data"].loc(dict(k=0, i=0, j=0, var="head")) = 1. -# chd.data["period_data"].loc(dict(k=0, i=9, j=9, var="head")) = 0. +# chd.data["stress_period_data"].loc(dict(k=0, i=0, j=0, var="head")) = 1. +# chd.data["stress_period_data"].loc(dict(k=0, i=9, j=9, var="head")) = 0. # TODO does this work? -# chd.data["period_data"].loc(dict(k=0, i=0, j=0)) = (1., 0.) -# chd.data["period_data"].loc(dict(k=0, i=9, j=9)) = (0., 0.) +# chd.data["stress_period_data"].loc(dict(k=0, i=0, j=0)) = (1., 0.) +# chd.data["stress_period_data"].loc(dict(k=0, i=9, j=9)) = (0., 0.) # # 6) sparse array # spd = sparse.COO([[0,0], [0,9], [0,9]], [1., 0.]) -# chd = Chd(gwf, period_data=spd) +# chd = Chd(gwf, stress_period_data=spd) # OC. first with builtins budget_file = name + ".bud" diff --git a/docs/examples/selection.ipynb b/docs/examples/selection.ipynb index 21677cee9..c3b25e68e 100644 --- a/docs/examples/selection.ipynb +++ b/docs/examples/selection.ipynb @@ -139,12 +139,12 @@ "Npf(parent=gwf, k=1.0)\n", "west = [((0, r, 0), 25.0) for r in range(nrow)]\n", "east = [((0, r, ncol - 1), 15.0) for r in range(nrow)]\n", - "Chd(parent=gwf, period_data={0: west + east})\n", + "Chd(parent=gwf, stress_period_data={0: west + east})\n", "Oc(\n", " parent=gwf,\n", " budget_file=f\"{name}.cbc\",\n", " head_file=f\"{name}.hds\",\n", - " period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\"), (\"SAVE\", \"BUDGET\", \"ALL\")]},\n", + " stress_period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\"), (\"SAVE\", \"BUDGET\", \"ALL\")]},\n", ")\n", "sim.write()\n", "sim.run()" diff --git a/docs/examples/selection.py b/docs/examples/selection.py index 54c2b461f..cce6d1da2 100644 --- a/docs/examples/selection.py +++ b/docs/examples/selection.py @@ -58,12 +58,12 @@ Npf(parent=gwf, k=1.0) west = [((0, r, 0), 25.0) for r in range(nrow)] east = [((0, r, ncol - 1), 15.0) for r in range(nrow)] -Chd(parent=gwf, period_data={0: west + east}) +Chd(parent=gwf, stress_period_data={0: west + east}) Oc( parent=gwf, budget_file=f"{name}.cbc", head_file=f"{name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) sim.write() sim.run() diff --git a/docs/examples/twri.ipynb b/docs/examples/twri.ipynb index c2f7f871b..3f3f3ad40 100644 --- a/docs/examples/twri.ipynb +++ b/docs/examples/twri.ipynb @@ -264,7 +264,7 @@ "# Constant head boundary on the left: pins head to 0 m on the left column,\n", "# creating the hydraulic gradient that drives flow through the domain.\n", "chd = flopy4.mf6.gwf.Chd(\n", - " period_data={0: [((k, i, 0), 0.0) for k in range(nlay - 1) for i in range(nrow)]},\n", + " stress_period_data={0: [((k, i, 0), 0.0) for k in range(nlay - 1) for i in range(nrow)]},\n", " print_input=True,\n", " print_flows=True,\n", " save_flows=True,\n", @@ -291,7 +291,7 @@ "elevation = [0.0, 0.0, 10.0, 20.0, 30.0, 50.0, 70.0, 90.0, 100.0]\n", "conductance = 1.0\n", "drn = flopy4.mf6.gwf.Drn(\n", - " period_data={0: [((0, 7, j + 1), elevation[j], conductance) for j in range(9)]},\n", + " stress_period_data={0: [((0, 7, j + 1), elevation[j], conductance) for j in range(9)]},\n", " print_input=True,\n", " print_flows=True,\n", " save_flows=True,\n", @@ -366,7 +366,7 @@ " storagecoefficient=False,\n", " ss=1.0e-5,\n", " sy=0.15,\n", - " period_data={0: [(\"STEADY-STATE\",)]},\n", + " stress_period_data={0: [(\"STEADY-STATE\",)]},\n", " iconvert=0,\n", " dims=dims,\n", ")" @@ -392,7 +392,7 @@ "rate = np.repeat(np.expand_dims(rch_rate, axis=0), repeats=nper, axis=0)\n", "rate[0, 0, ...] = 3.0e-8\n", "rch = flopy4.mf6.gwf.Rch(\n", - " period_data={0: [((0, i, j), 3.0e-8) for i in range(nrow) for j in range(ncol)]},\n", + " stress_period_data={0: [((0, i, j), 3.0e-8) for i in range(nrow) for j in range(ncol)]},\n", " dims=dims,\n", ")" ] @@ -415,7 +415,7 @@ "oc = flopy4.mf6.gwf.Oc(\n", " budget_file=\"gwf.bud\",\n", " head_file=\"gwf.hds\",\n", - " period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\"), (\"SAVE\", \"BUDGET\", \"ALL\")]},\n", + " stress_period_data={0: [(\"SAVE\", \"HEAD\", \"ALL\"), (\"SAVE\", \"BUDGET\", \"ALL\")]},\n", " dims=dims,\n", ")" ] @@ -454,7 +454,7 @@ " [0, 12, 13],\n", "]\n", "wel = flopy4.mf6.gwf.Wel(\n", - " period_data={0: [((layer, row, col), wel_q) for layer, row, col in wel_nodes]},\n", + " stress_period_data={0: [((layer, row, col), wel_q) for layer, row, col in wel_nodes]},\n", " dims=dims,\n", ")" ] diff --git a/docs/examples/twri.py b/docs/examples/twri.py index a563275ab..7ac3295cf 100644 --- a/docs/examples/twri.py +++ b/docs/examples/twri.py @@ -87,7 +87,7 @@ def plot_head(head, workspace): # Constant head boundary on the left: pins head to 0 m on the left column, # creating the hydraulic gradient that drives flow through the domain. chd = flopy4.mf6.gwf.Chd( - period_data={0: [((k, i, 0), 0.0) for k in range(nlay - 1) for i in range(nrow)]}, + stress_period_data={0: [((k, i, 0), 0.0) for k in range(nlay - 1) for i in range(nrow)]}, print_input=True, print_flows=True, save_flows=True, @@ -99,7 +99,7 @@ def plot_head(head, workspace): elevation = [0.0, 0.0, 10.0, 20.0, 30.0, 50.0, 70.0, 90.0, 100.0] conductance = 1.0 drn = flopy4.mf6.gwf.Drn( - period_data={0: [((0, 7, j + 1), elevation[j], conductance) for j in range(9)]}, + stress_period_data={0: [((0, 7, j + 1), elevation[j], conductance) for j in range(9)]}, print_input=True, print_flows=True, save_flows=True, @@ -129,7 +129,7 @@ def plot_head(head, workspace): storagecoefficient=False, ss=1.0e-5, sy=0.15, - period_data={0: [("STEADY-STATE",)]}, + stress_period_data={0: [("STEADY-STATE",)]}, iconvert=0, dims=dims, ) @@ -140,7 +140,7 @@ def plot_head(head, workspace): rate = np.repeat(np.expand_dims(rch_rate, axis=0), repeats=nper, axis=0) rate[0, 0, ...] = 3.0e-8 rch = flopy4.mf6.gwf.Rch( - period_data={0: [((0, i, j), 3.0e-8) for i in range(nrow) for j in range(ncol)]}, + stress_period_data={0: [((0, i, j), 3.0e-8) for i in range(nrow) for j in range(ncol)]}, dims=dims, ) @@ -148,7 +148,7 @@ def plot_head(head, workspace): oc = flopy4.mf6.gwf.Oc( budget_file="gwf.bud", head_file="gwf.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, dims=dims, ) @@ -172,7 +172,7 @@ def plot_head(head, workspace): [0, 12, 13], ] wel = flopy4.mf6.gwf.Wel( - period_data={0: [((layer, row, col), wel_q) for layer, row, col in wel_nodes]}, + stress_period_data={0: [((layer, row, col), wel_q) for layer, row, col in wel_nodes]}, dims=dims, ) diff --git a/docs/migrating.md b/docs/migrating.md index 55fb4902d..2c033b22a 100644 --- a/docs/migrating.md +++ b/docs/migrating.md @@ -2,27 +2,27 @@ ## Period data -flopy4 calls every package's period data `period_data`. flopy3 calls it -`stress_period_data` on some packages, and names others' after the input -file's variable. flopy4 still takes flopy3's names, but warns -(`DeprecationWarning`) and will stop taking them in a future release. +flopy4 calls every package's period data `stress_period_data`. flopy3 names +some packages' period data after the input file's variable instead. flopy4 +still takes flopy3's names, but warns (`DeprecationWarning`) and will stop +taking them in a future release. The old names also work as attributes, with the same warning, but only as -names. `wel.stress_period_data` is `wel.period_data`, a dict of rows by period, -not flopy3's `MFTransientList`, so `.get_data()` and `.set_data()` aren't there. -STO's and OC's old attributes raise `AttributeError`, since their values are -shaped differently: use `period_data`. +names. `lak.perioddata` is `lak.stress_period_data`, a dict of rows by period, +not flopy3's `MFTransientList`, so `.get_data()` and `.set_data()` aren't +there. Likewise `wel.stress_period_data`, where the name hasn't changed. STO's +and OC's old attributes raise `AttributeError`, since their values are shaped +differently: use `stress_period_data`. | flopy3 | flopy4 | packages | |---|---|---| -| `stress_period_data` | `period_data` | CDB, CHD, CNC, CSUB, CTP, DRN, ESL, EVP, EVT, FLW, GHB, HFB, PCP, RCH, RIV, SRC, WEL, ZDG | -| `perioddata` | `period_data` | LAK, MAW, MVR, SFR, UZF, PRP, SPC, TVK, TVS | -| `lakeperioddata` | `period_data` | LKT, LKE | -| `reachperioddata` | `period_data` | SFT, SFE | -| `mwtperioddata`, `mweperioddata` | `period_data` | MWT, MWE | -| `uztperioddata`, `uzeperioddata` | `period_data` | UZT, UZE | -| `steady_state`, `transient` | `period_data` | STO | -| `saverecord`, `printrecord` | `period_data` | OC | +| `perioddata` | `stress_period_data` | LAK, MAW, MVR, SFR, UZF, PRP, SPC, TVK, TVS | +| `lakeperioddata` | `stress_period_data` | LKT, LKE | +| `reachperioddata` | `stress_period_data` | SFT, SFE | +| `mwtperioddata`, `mweperioddata` | `stress_period_data` | MWT, MWE | +| `uztperioddata`, `uzeperioddata` | `stress_period_data` | UZT, UZE | +| `steady_state`, `transient` | `stress_period_data` | STO | +| `saverecord`, `printrecord` | `stress_period_data` | OC | The values are the same, except for STO's and OC's. @@ -38,7 +38,7 @@ STO takes one entry per period, `STEADY-STATE` or `TRANSIENT`: sto = flopy.mf6.ModflowGwfsto(gwf, steady_state={0: True}, transient={1: True}) # flopy4 -sto = Sto(parent=gwf, period_data={0: [("STEADY-STATE",)], 1: [("TRANSIENT",)]}) +sto = Sto(parent=gwf, stress_period_data={0: [("STEADY-STATE",)], 1: [("TRANSIENT",)]}) ``` OC takes each period's saves and prints in one list, each starting with @@ -55,7 +55,7 @@ oc = flopy.mf6.ModflowGwfoc( # flopy4 oc = Oc( parent=gwf, - period_data={ + stress_period_data={ 0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL"), ("PRINT", "BUDGET", "LAST")] }, ) diff --git a/flopy4/mf6/adapters.py b/flopy4/mf6/adapters.py index 8cd2516e5..903d63411 100644 --- a/flopy4/mf6/adapters.py +++ b/flopy4/mf6/adapters.py @@ -312,10 +312,10 @@ def plottable(self): @property def has_stress_period_data(self): # Stress-period recarray packages (CHD, DRN, etc.) - if getattr(self._package, "_period_data", None) is not None: + if getattr(self._package, "_stress_period_data", None) is not None: return True # Any other fill-forward (period) field (covers OC's own - # _period_data too, redundantly with the check above -- kept + # _stress_period_data too, redundantly with the check above -- kept # as a generic fallback for any period field shape). try: for f in attrs.fields(type(self._package)): @@ -513,7 +513,7 @@ def __init__(self, package: "Flopy3Package", nper: int): self._nper = nper pkg = package._package item_cls = item_list_type(pkg._period_item_field().type) - self._kpers = sorted(pkg.period_data) + self._kpers = sorted(pkg.stress_period_data) self._dtype, flat = _flatten(pkg.to_dataframe(), item_cls, pkg) self._data = {} for kper in self._kpers: @@ -525,7 +525,7 @@ def from_package(cls, package: "Flopy3Package") -> "Flopy3ListData | None": """The package's stress period data, or None if it has none, or its rows are of more than one kind (a list of unions).""" pkg = package._package - if not getattr(pkg, "period_data", None): + if not getattr(pkg, "stress_period_data", None): return None try: field = pkg._period_item_field() @@ -721,7 +721,7 @@ def _nper(package: "Flopy3Package") -> int: pkg = package._package if nper := pkg.resolve_dims("nper").get("nper"): return int(nper) - return max(pkg.period_data) + 1 + return max(pkg.stress_period_data) + 1 def _flatten(df, item_cls, pkg) -> "tuple[np.dtype, Any]": diff --git a/flopy4/mf6/chf/cdb.py b/flopy4/mf6/chf/cdb.py index e5698a129..caa6e92d6 100644 --- a/flopy4/mf6/chf/cdb.py +++ b/flopy4/mf6/chf/cdb.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, integer, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Cdb(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() idcxs: int = integer(index=True, fk="chf-cxs.packagedata.ifno") width: Union[float, TimeSeriesRef] = double(time_series=True) @@ -76,8 +71,8 @@ class PeriodData(Item): longname="save flows to budget file", ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -88,12 +83,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -CdbPeriodData = Cdb.PeriodData +CdbStressPeriodData = Cdb.StressPeriodData diff --git a/flopy4/mf6/chf/chd.py b/flopy4/mf6/chf/chd.py index 61a25c190..1dc2ae8ce 100644 --- a/flopy4/mf6/chf/chd.py +++ b/flopy4/mf6/chf/chd.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Chd(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() head: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -84,8 +79,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -96,12 +91,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -ChdPeriodData = Chd.PeriodData +ChdStressPeriodData = Chd.StressPeriodData diff --git a/flopy4/mf6/chf/evp.py b/flopy4/mf6/chf/evp.py index 46e18a36f..93e58831c 100644 --- a/flopy4/mf6/chf/evp.py +++ b/flopy4/mf6/chf/evp.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Evp(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() evaporation: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -84,8 +79,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -96,12 +91,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -EvpPeriodData = Evp.PeriodData +EvpStressPeriodData = Evp.StressPeriodData diff --git a/flopy4/mf6/chf/flw.py b/flopy4/mf6/chf/flw.py index f12b7b527..886bab8b3 100644 --- a/flopy4/mf6/chf/flw.py +++ b/flopy4/mf6/chf/flw.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -30,12 +29,8 @@ class Flw(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() q: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -85,8 +80,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -97,12 +92,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -FlwPeriodData = Flw.PeriodData +FlwStressPeriodData = Flw.StressPeriodData diff --git a/flopy4/mf6/chf/oc.py b/flopy4/mf6/chf/oc.py index 441debf80..59b23ad49 100644 --- a/flopy4/mf6/chf/oc.py +++ b/flopy4/mf6/chf/oc.py @@ -17,8 +17,8 @@ class Oc(Package): ftype: ClassVar[str] = "OC6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "saverecord": Legacy("period_data", oc_period_data), - "printrecord": Legacy("period_data", oc_period_data), + "saverecord": Legacy("stress_period_data", oc_period_data), + "printrecord": Legacy("stress_period_data", oc_period_data), } @attrs.define @@ -57,7 +57,7 @@ class Print(Item): rtype: str = string() ocsetting: "Literal['ALL', 'FIRST', 'LAST'] | Oc.Frequency | Oc.Steps" = union() - _PeriodDataItem = Save | Print + _StressPeriodDataItem = Save | Print budget_file: Optional[Path] = file( default=None, @@ -96,8 +96,8 @@ class Print(Item): converter=Qoutflowprint.convert, block="options", ) - _period_data: Optional[dict[int, list[_PeriodDataItem]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[_StressPeriodDataItem]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", diff --git a/flopy4/mf6/chf/pcp.py b/flopy4/mf6/chf/pcp.py index 57ca7184b..ed1cbbc97 100644 --- a/flopy4/mf6/chf/pcp.py +++ b/flopy4/mf6/chf/pcp.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Pcp(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() precipitation: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -84,8 +79,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -96,12 +91,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -PcpPeriodData = Pcp.PeriodData +PcpStressPeriodData = Pcp.StressPeriodData diff --git a/flopy4/mf6/chf/sto.py b/flopy4/mf6/chf/sto.py index 16d636d5d..f51036a96 100644 --- a/flopy4/mf6/chf/sto.py +++ b/flopy4/mf6/chf/sto.py @@ -15,13 +15,13 @@ class Sto(Package): ftype: ClassVar[str] = "STO6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "steady_state": Legacy("period_data", sto_period_data), - "transient": Legacy("period_data", sto_period_data), + "steady_state": Legacy("stress_period_data", sto_period_data), + "transient": Legacy("stress_period_data", sto_period_data), } @attrs.define - class PeriodData(Item): - period_data: str = string() + class StressPeriodData(Item): + stress_period_data: str = string() save_flows: bool = keyword( default=False, @@ -35,8 +35,8 @@ class PeriodData(Item): optional=True, longname="export array variables to layered ascii files.", ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -44,4 +44,4 @@ class PeriodData(Item): ) -StoPeriodData = Sto.PeriodData +StoStressPeriodData = Sto.StressPeriodData diff --git a/flopy4/mf6/chf/zdg.py b/flopy4/mf6/chf/zdg.py index 628df5c6c..66d59fc9f 100644 --- a/flopy4/mf6/chf/zdg.py +++ b/flopy4/mf6/chf/zdg.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, integer, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -30,12 +29,8 @@ class Zdg(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() idcxs: int = integer(index=True, fk="chf-cxs.packagedata.ifno") width: Union[float, TimeSeriesRef] = double(time_series=True) @@ -82,8 +77,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -94,12 +89,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -ZdgPeriodData = Zdg.PeriodData +ZdgStressPeriodData = Zdg.StressPeriodData diff --git a/flopy4/mf6/codec/reader/grammar/__init__.py b/flopy4/mf6/codec/reader/grammar/__init__.py index 6591d5192..845b5d7fe 100644 --- a/flopy4/mf6/codec/reader/grammar/__init__.py +++ b/flopy4/mf6/codec/reader/grammar/__init__.py @@ -71,10 +71,6 @@ def _to_context(blocks: dict[str, Block]) -> tuple[list[dict], dict[str, object] for field_name, field in block.fields.items(): if field.removed: continue - # the DFNs' period list, and STO's scalar in its place - if field_name == "stress_period_data": - field_name = "period_data" - field = field.model_copy(update={"name": field_name}) if field.tagged and getattr(field, "valid", None): tagged_valid.add(field_name) field = filters.valid_as_union(field) diff --git a/flopy4/mf6/codec/reader/grammar/filters.py b/flopy4/mf6/codec/reader/grammar/filters.py index 6b56ee1f6..f1ba4b03e 100644 --- a/flopy4/mf6/codec/reader/grammar/filters.py +++ b/flopy4/mf6/codec/reader/grammar/filters.py @@ -86,8 +86,7 @@ def part_tag(field: InputField) -> str: def get_recarray_name(block_name: str) -> str: """Get the name for a recarray representing period data in a block.""" - # The DFNs call a period list stress_period_data, perioddata, etc.; - # flopy4 calls them all period_data. + # Use similar naming to V1: stress_period_data, perioddata, etc. if block_name == "period": - return "period_data" + return "stress_period_data" return f"{block_name}data" diff --git a/flopy4/mf6/codec/reader/grammar/generated/chf-cdb.lark b/flopy4/mf6/codec/reader/grammar/generated/chf-cdb.lark index fc768bf48..e5ff7ff12 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/chf-cdb.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/chf-cdb.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL boundnames__kw: "boundnames"i [_remark] _NL print_input__kw: "print_input"i [_remark] _NL @@ -41,4 +41,4 @@ save_flows__kw: "save_flows"i [_remark] _NL obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/chf-chd.lark b/flopy4/mf6/codec/reader/grammar/generated/chf-chd.lark index e272bf8be..330b86d7f 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/chf-chd.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/chf-chd.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/chf-evp.lark b/flopy4/mf6/codec/reader/grammar/generated/chf-evp.lark index 0bd68b59f..ebfc4f23e 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/chf-evp.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/chf-evp.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/chf-flw.lark b/flopy4/mf6/codec/reader/grammar/generated/chf-flw.lark index b84f700ba..e13a601c4 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/chf-flw.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/chf-flw.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/chf-pcp.lark b/flopy4/mf6/codec/reader/grammar/generated/chf-pcp.lark index f6bbd922e..cc63263c9 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/chf-pcp.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/chf-pcp.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/chf-sto.lark b/flopy4/mf6/codec/reader/grammar/generated/chf-sto.lark index d36bc7d5d..0eed63b36 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/chf-sto.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/chf-sto.lark @@ -30,10 +30,10 @@ options__block: _BEGIN "options"i [_remark] _NL options__fields _END "options"i period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "period"i [block_index] %import typed.block_index -> block_index options__fields: (save_flows__kw | export_array_ascii__kw | open_close_redirect _NL)* -period__fields: (period_data__union | open_close_redirect _NL)* +period__fields: (stress_period_data__union | open_close_redirect _NL)* save_flows__kw: "save_flows"i [_remark] _NL export_array_ascii__kw: "export_array_ascii"i [_remark] _NL -period_data__union: (period_data__steady_state__kw | period_data__transient__kw) [_remark] _NL +stress_period_data__union: (stress_period_data__steady_state__kw | stress_period_data__transient__kw) [_remark] _NL -!period_data__steady_state__kw: "steady-state"i -!period_data__transient__kw: "transient"i +!stress_period_data__steady_state__kw: "steady-state"i +!stress_period_data__transient__kw: "transient"i diff --git a/flopy4/mf6/codec/reader/grammar/generated/chf-zdg.lark b/flopy4/mf6/codec/reader/grammar/generated/chf-zdg.lark index 5920c4519..c37faa999 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/chf-zdg.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/chf-zdg.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL boundnames__kw: "boundnames"i [_remark] _NL print_input__kw: "print_input"i [_remark] _NL @@ -43,4 +43,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwe-ctp.lark b/flopy4/mf6/codec/reader/grammar/generated/gwe-ctp.lark index 25542b365..0afb30c00 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwe-ctp.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwe-ctp.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwe-esl.lark b/flopy4/mf6/codec/reader/grammar/generated/gwe-esl.lark index d282c9c17..4185d89d4 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwe-esl.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwe-esl.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwe-lke.lark b/flopy4/mf6/codec/reader/grammar/generated/gwe-lke.lark index 564aaa9f5..b6b17ba51 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwe-lke.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwe-lke.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (flow_package_name__val | auxiliary__val | flow_package_auxiliary_name__val | boundnames__kw | print_input__kw | print_temperature__kw | print_flows__kw | save_flows__kw | temperature_filerecord__rec | budget_filerecord__rec | budgetcsv_filerecord__rec | ts_filerecord__rec__elem | obs_filerecord__rec | dev_nonexpanding_matrix__kw | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* flow_package_name__val: "flow_package_name"i string auxiliary__val: "auxiliary"i word+ [_remark] _NL flow_package_auxiliary_name__val: "flow_package_auxiliary_name"i string @@ -53,4 +53,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word dev_nonexpanding_matrix__kw: "dev_nonexpanding_matrix"i [_remark] _NL packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwe-mwe.lark b/flopy4/mf6/codec/reader/grammar/generated/gwe-mwe.lark index 874810daf..d3e841e52 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwe-mwe.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwe-mwe.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (flow_package_name__val | auxiliary__val | flow_package_auxiliary_name__val | boundnames__kw | print_input__kw | print_temperature__kw | print_flows__kw | save_flows__kw | temperature_filerecord__rec | budget_filerecord__rec | budgetcsv_filerecord__rec | ts_filerecord__rec__elem | obs_filerecord__rec | dev_nonexpanding_matrix__kw | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* flow_package_name__val: "flow_package_name"i string auxiliary__val: "auxiliary"i word+ [_remark] _NL flow_package_auxiliary_name__val: "flow_package_auxiliary_name"i string @@ -53,4 +53,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word dev_nonexpanding_matrix__kw: "dev_nonexpanding_matrix"i [_remark] _NL packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwe-sfe.lark b/flopy4/mf6/codec/reader/grammar/generated/gwe-sfe.lark index a11b6c689..f9abc13fb 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwe-sfe.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwe-sfe.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (flow_package_name__val | auxiliary__val | flow_package_auxiliary_name__val | boundnames__kw | print_input__kw | print_temperature__kw | print_flows__kw | save_flows__kw | temperature_filerecord__rec | budget_filerecord__rec | budgetcsv_filerecord__rec | ts_filerecord__rec__elem | obs_filerecord__rec | dev_nonexpanding_matrix__kw | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* flow_package_name__val: "flow_package_name"i string auxiliary__val: "auxiliary"i word+ [_remark] _NL flow_package_auxiliary_name__val: "flow_package_auxiliary_name"i string @@ -53,4 +53,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word dev_nonexpanding_matrix__kw: "dev_nonexpanding_matrix"i [_remark] _NL packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwe-uze.lark b/flopy4/mf6/codec/reader/grammar/generated/gwe-uze.lark index 0b5883fb3..556ffcdbc 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwe-uze.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwe-uze.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (flow_package_name__val | auxiliary__val | flow_package_auxiliary_name__val | boundnames__kw | print_input__kw | print_temperature__kw | print_flows__kw | save_flows__kw | temperature_filerecord__rec | budget_filerecord__rec | budgetcsv_filerecord__rec | ts_filerecord__rec__elem | obs_filerecord__rec | dev_nonexpanding_matrix__kw | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* flow_package_name__val: "flow_package_name"i string auxiliary__val: "auxiliary"i word+ [_remark] _NL flow_package_auxiliary_name__val: "flow_package_auxiliary_name"i string @@ -53,4 +53,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word dev_nonexpanding_matrix__kw: "dev_nonexpanding_matrix"i [_remark] _NL packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-chd.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-chd.lark index 5ad63199d..6591d2b00 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-chd.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-chd.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | dev_no_newton__kw | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -45,4 +45,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word dev_no_newton__kw: "dev_no_newton"i [_remark] _NL maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-csub.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-csub.lark index 75647ab3e..6dc7c6c6d 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-csub.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-csub.lark @@ -36,7 +36,7 @@ options__fields: (boundnames__kw | print_input__kw | save_flows__kw | gammaw__va dimensions__fields: (ninterbeds__val | maxsig0__val | open_close_redirect _NL)* griddata__fields: (cg_ske_cr__val | cg_theta__val | sgm__val | sgs__val | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* boundnames__kw: "boundnames"i [_remark] _NL print_input__kw: "print_input"i [_remark] _NL save_flows__kw: "save_flows"i [_remark] _NL @@ -83,4 +83,4 @@ cg_theta__val: "cg_theta"i [_remark] [_NL] array sgm__val: "sgm"i [_remark] [_NL] array sgs__val: "sgs"i [_remark] [_NL] array packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-drn.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-drn.lark index acf44c8d0..686be7f13 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-drn.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-drn.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | auxdepthname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | mover__kw | dev_cubic_scaling__kw | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string auxdepthname__val: "auxdepthname"i string @@ -47,4 +47,4 @@ obs_filerecord__obs6_filename__val: "filein"i word mover__kw: "mover"i [_remark] _NL dev_cubic_scaling__kw: "dev_cubic_scaling"i [_remark] _NL maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-evt.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-evt.lark index 36620a90d..518d4666a 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-evt.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-evt.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (fixed_cell__kw | auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | surf_rate_specified__kw | open_close_redirect _NL)* dimensions__fields: (maxbound__val | nseg__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* fixed_cell__kw: "fixed_cell"i [_remark] _NL auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string @@ -47,4 +47,4 @@ obs_filerecord__obs6_filename__val: "filein"i word surf_rate_specified__kw: "surf_rate_specified"i [_remark] _NL maxbound__val: "maxbound"i integer [_remark] _NL nseg__val: "nseg"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-ghb.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-ghb.lark index 542df9c0e..0c8165f4b 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-ghb.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-ghb.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | mover__kw | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -45,4 +45,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word mover__kw: "mover"i [_remark] _NL maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-hfb.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-hfb.lark index 9a0615bbb..88efb204a 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-hfb.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-hfb.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (print_input__kw | open_close_redirect _NL)* dimensions__fields: (maxhfb__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* print_input__kw: "print_input"i [_remark] _NL maxhfb__val: "maxhfb"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-maw.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-maw.lark index fa1fbcc32..5e0aed297 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-maw.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-maw.lark @@ -38,7 +38,7 @@ dimensions__fields: (nmawwells__val | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* connectiondata__fields: (connectiondatadata | open_close_redirect _NL)* angledata__fields: (angledatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL boundnames__kw: "boundnames"i [_remark] _NL print_input__kw: "print_input"i [_remark] _NL @@ -69,4 +69,4 @@ nmawwells__val: "nmawwells"i integer [_remark] _NL packagedatadata: record+ connectiondatadata: record+ angledatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-mvr.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-mvr.lark index b2b00e2a8..0500360e5 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-mvr.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-mvr.lark @@ -34,7 +34,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p options__fields: (print_input__kw | print_flows__kw | modelnames__kw | budget_filerecord__rec | budgetcsv_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxmvr__val | maxpackages__val | open_close_redirect _NL)* packages__fields: (packagesdata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* print_input__kw: "print_input"i [_remark] _NL print_flows__kw: "print_flows"i [_remark] _NL modelnames__kw: "modelnames"i [_remark] _NL @@ -45,4 +45,4 @@ budgetcsv_filerecord__budgetcsvfile__val: "fileout"i word maxmvr__val: "maxmvr"i integer [_remark] _NL maxpackages__val: "maxpackages"i integer [_remark] _NL packagesdata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-rch.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-rch.lark index e52347292..fb4e1af7e 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-rch.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-rch.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (fixed_cell__kw | auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* fixed_cell__kw: "fixed_cell"i [_remark] _NL auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string @@ -45,4 +45,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-riv.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-riv.lark index acfe5ea09..bdc63790a 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-riv.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-riv.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | mover__kw | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -45,4 +45,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word mover__kw: "mover"i [_remark] _NL maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-sfr.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-sfr.lark index 2ae1ac827..697cd8a80 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-sfr.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-sfr.lark @@ -42,7 +42,7 @@ crosssections__fields: (crosssectionsdata | open_close_redirect _NL)* connectiondata__fields: (connectiondatadata | open_close_redirect _NL)* diversions__fields: (diversionsdata | open_close_redirect _NL)* initialstages__fields: (initialstagesdata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* storage__kw: "storage"i [_remark] _NL ats_courant__val: "ats_courant"i double [_remark] _NL auxiliary__val: "auxiliary"i word+ [_remark] _NL @@ -79,4 +79,4 @@ crosssectionsdata: record+ connectiondatadata: record+ diversionsdata: record+ initialstagesdata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-sto.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-sto.lark index 140cba1cc..954cb8b33 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-sto.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-sto.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (save_flows__kw | storagecoefficient__kw | ss_confined_only__kw | tvs_filerecord__rec | export_array_ascii__kw | export_array_netcdf__kw | dev_original_specific_storage__kw | dev_oldstorageformulation__kw | open_close_redirect _NL)* griddata__fields: (iconvert__val | ss__val | sy__val | open_close_redirect _NL)* -period__fields: (period_data__union | open_close_redirect _NL)* +period__fields: (stress_period_data__union | open_close_redirect _NL)* save_flows__kw: "save_flows"i [_remark] _NL storagecoefficient__kw: "storagecoefficient"i [_remark] _NL ss_confined_only__kw: "ss_confined_only"i [_remark] _NL @@ -45,7 +45,7 @@ dev_oldstorageformulation__kw: "dev_oldstorageformulation"i [_remark] _NL iconvert__val: "iconvert"i [_remark] [_NL] array ss__val: "ss"i [_remark] [_NL] array sy__val: "sy"i [_remark] [_NL] array -period_data__union: (period_data__steady_state__kw | period_data__transient__kw) [_remark] _NL +stress_period_data__union: (stress_period_data__steady_state__kw | stress_period_data__transient__kw) [_remark] _NL -!period_data__steady_state__kw: "steady-state"i -!period_data__transient__kw: "transient"i +!stress_period_data__steady_state__kw: "steady-state"i +!stress_period_data__transient__kw: "transient"i diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-uzf.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-uzf.lark index c97481482..065cfe807 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-uzf.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-uzf.lark @@ -34,7 +34,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | wc_filerecord__rec | budget_filerecord__rec | budgetcsv_filerecord__rec | package_convergence_filerecord__rec | ts_filerecord__rec__elem | obs_filerecord__rec | mover__kw | dev_no_final_check__kw | simulate_et__kw | linear_gwet__kw | square_gwet__kw | simulate_gwseep__kw | unsat_etwc__kw | unsat_etae__kw | open_close_redirect _NL)* dimensions__fields: (nuzfcells__val | ntrailwaves__val | nwavesets__val | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -65,4 +65,4 @@ nuzfcells__val: "nuzfcells"i integer [_remark] _NL ntrailwaves__val: "ntrailwaves"i integer [_remark] _NL nwavesets__val: "nwavesets"i integer [_remark] _NL packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwf-wel.lark b/flopy4/mf6/codec/reader/grammar/generated/gwf-wel.lark index 3c833629c..20b501035 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwf-wel.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwf-wel.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | auto_flow_reduce__val | afrcsv_filerecord__rec | flow_reduction_length__kw | auto_flow_reduce_auxname__val | ts_filerecord__rec__elem | obs_filerecord__rec | mover__kw | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -50,4 +50,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word mover__kw: "mover"i [_remark] _NL maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwt-cnc.lark b/flopy4/mf6/codec/reader/grammar/generated/gwt-cnc.lark index d91ca505d..063135c3c 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwt-cnc.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwt-cnc.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwt-lkt.lark b/flopy4/mf6/codec/reader/grammar/generated/gwt-lkt.lark index 339e27eed..c2e3ac134 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwt-lkt.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwt-lkt.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (flow_package_name__val | auxiliary__val | flow_package_auxiliary_name__val | boundnames__kw | print_input__kw | print_concentration__kw | print_flows__kw | save_flows__kw | concentration_filerecord__rec | budget_filerecord__rec | budgetcsv_filerecord__rec | ts_filerecord__rec__elem | obs_filerecord__rec | dev_nonexpanding_matrix__kw | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* flow_package_name__val: "flow_package_name"i string auxiliary__val: "auxiliary"i word+ [_remark] _NL flow_package_auxiliary_name__val: "flow_package_auxiliary_name"i string @@ -53,4 +53,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word dev_nonexpanding_matrix__kw: "dev_nonexpanding_matrix"i [_remark] _NL packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwt-mwt.lark b/flopy4/mf6/codec/reader/grammar/generated/gwt-mwt.lark index 963f479e9..88a9308fd 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwt-mwt.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwt-mwt.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (flow_package_name__val | auxiliary__val | flow_package_auxiliary_name__val | boundnames__kw | print_input__kw | print_concentration__kw | print_flows__kw | save_flows__kw | concentration_filerecord__rec | budget_filerecord__rec | budgetcsv_filerecord__rec | ts_filerecord__rec__elem | obs_filerecord__rec | dev_nonexpanding_matrix__kw | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* flow_package_name__val: "flow_package_name"i string auxiliary__val: "auxiliary"i word+ [_remark] _NL flow_package_auxiliary_name__val: "flow_package_auxiliary_name"i string @@ -53,4 +53,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word dev_nonexpanding_matrix__kw: "dev_nonexpanding_matrix"i [_remark] _NL packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwt-sft.lark b/flopy4/mf6/codec/reader/grammar/generated/gwt-sft.lark index d5aab0b80..3a4637096 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwt-sft.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwt-sft.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (flow_package_name__val | auxiliary__val | flow_package_auxiliary_name__val | boundnames__kw | print_input__kw | print_concentration__kw | print_flows__kw | save_flows__kw | concentration_filerecord__rec | budget_filerecord__rec | budgetcsv_filerecord__rec | ts_filerecord__rec__elem | obs_filerecord__rec | dev_nonexpanding_matrix__kw | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* flow_package_name__val: "flow_package_name"i string auxiliary__val: "auxiliary"i word+ [_remark] _NL flow_package_auxiliary_name__val: "flow_package_auxiliary_name"i string @@ -53,4 +53,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word dev_nonexpanding_matrix__kw: "dev_nonexpanding_matrix"i [_remark] _NL packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwt-src.lark b/flopy4/mf6/codec/reader/grammar/generated/gwt-src.lark index a9337dff1..66af17218 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwt-src.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwt-src.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | highest_saturated__kw | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -45,4 +45,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word highest_saturated__kw: "highest_saturated"i [_remark] _NL maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/gwt-uzt.lark b/flopy4/mf6/codec/reader/grammar/generated/gwt-uzt.lark index f29042e84..6ed294a0e 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/gwt-uzt.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/gwt-uzt.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (flow_package_name__val | auxiliary__val | flow_package_auxiliary_name__val | boundnames__kw | print_input__kw | print_concentration__kw | print_flows__kw | save_flows__kw | concentration_filerecord__rec | budget_filerecord__rec | budgetcsv_filerecord__rec | ts_filerecord__rec__elem | obs_filerecord__rec | dev_nonexpanding_matrix__kw | open_close_redirect _NL)* packagedata__fields: (packagedatadata | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* flow_package_name__val: "flow_package_name"i string auxiliary__val: "auxiliary"i word+ [_remark] _NL flow_package_auxiliary_name__val: "flow_package_auxiliary_name"i string @@ -53,4 +53,4 @@ obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word dev_nonexpanding_matrix__kw: "dev_nonexpanding_matrix"i [_remark] _NL packagedatadata: record+ -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/olf-cdb.lark b/flopy4/mf6/codec/reader/grammar/generated/olf-cdb.lark index 61a203059..82ded0944 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/olf-cdb.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/olf-cdb.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL boundnames__kw: "boundnames"i [_remark] _NL print_input__kw: "print_input"i [_remark] _NL @@ -41,4 +41,4 @@ save_flows__kw: "save_flows"i [_remark] _NL obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/olf-chd.lark b/flopy4/mf6/codec/reader/grammar/generated/olf-chd.lark index 24a75d2f6..3aa774e4d 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/olf-chd.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/olf-chd.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/olf-evp.lark b/flopy4/mf6/codec/reader/grammar/generated/olf-evp.lark index fe50cb196..d451d2f1f 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/olf-evp.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/olf-evp.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/olf-flw.lark b/flopy4/mf6/codec/reader/grammar/generated/olf-flw.lark index 3fcaf1d9f..3ce1cb1fe 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/olf-flw.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/olf-flw.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/olf-pcp.lark b/flopy4/mf6/codec/reader/grammar/generated/olf-pcp.lark index 139021f5f..f9dbf21a0 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/olf-pcp.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/olf-pcp.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | auxmultname__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL auxmultname__val: "auxmultname"i string boundnames__kw: "boundnames"i [_remark] _NL @@ -44,4 +44,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/olf-sto.lark b/flopy4/mf6/codec/reader/grammar/generated/olf-sto.lark index f6c9c0a47..fc9eb0f80 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/olf-sto.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/olf-sto.lark @@ -30,10 +30,10 @@ options__block: _BEGIN "options"i [_remark] _NL options__fields _END "options"i period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "period"i [block_index] %import typed.block_index -> block_index options__fields: (save_flows__kw | export_array_ascii__kw | open_close_redirect _NL)* -period__fields: (period_data__union | open_close_redirect _NL)* +period__fields: (stress_period_data__union | open_close_redirect _NL)* save_flows__kw: "save_flows"i [_remark] _NL export_array_ascii__kw: "export_array_ascii"i [_remark] _NL -period_data__union: (period_data__steady_state__kw | period_data__transient__kw) [_remark] _NL +stress_period_data__union: (stress_period_data__steady_state__kw | stress_period_data__transient__kw) [_remark] _NL -!period_data__steady_state__kw: "steady-state"i -!period_data__transient__kw: "transient"i +!stress_period_data__steady_state__kw: "steady-state"i +!stress_period_data__transient__kw: "transient"i diff --git a/flopy4/mf6/codec/reader/grammar/generated/olf-zdg.lark b/flopy4/mf6/codec/reader/grammar/generated/olf-zdg.lark index cf646f693..016652f26 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/olf-zdg.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/olf-zdg.lark @@ -32,7 +32,7 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (auxiliary__val | boundnames__kw | print_input__kw | print_flows__kw | save_flows__kw | ts_filerecord__rec__elem | obs_filerecord__rec | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* auxiliary__val: "auxiliary"i word+ [_remark] _NL boundnames__kw: "boundnames"i [_remark] _NL print_input__kw: "print_input"i [_remark] _NL @@ -43,4 +43,4 @@ ts_filerecord__ts6_filename__val: "filein"i word obs_filerecord__rec: "obs6"i obs_filerecord__obs6_filename__val [_remark] _NL obs_filerecord__obs6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/utl-spc.lark b/flopy4/mf6/codec/reader/grammar/generated/utl-spc.lark index b8ab24874..5174a25d2 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/utl-spc.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/utl-spc.lark @@ -32,9 +32,9 @@ period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "p %import typed.block_index -> block_index options__fields: (print_input__kw | ts_filerecord__rec__elem | open_close_redirect _NL)* dimensions__fields: (maxbound__val | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* print_input__kw: "print_input"i [_remark] _NL ts_filerecord__rec__elem: "ts6"i ts_filerecord__ts6_filename__val [_remark] _NL ts_filerecord__ts6_filename__val: "filein"i word maxbound__val: "maxbound"i integer [_remark] _NL -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/utl-tvk.lark b/flopy4/mf6/codec/reader/grammar/generated/utl-tvk.lark index 9f05d3e24..f45c27f37 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/utl-tvk.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/utl-tvk.lark @@ -30,8 +30,8 @@ options__block: _BEGIN "options"i [_remark] _NL options__fields _END "options"i period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "period"i [block_index] %import typed.block_index -> block_index options__fields: (print_input__kw | ts_filerecord__rec__elem | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* print_input__kw: "print_input"i [_remark] _NL ts_filerecord__rec__elem: "ts6"i ts_filerecord__ts6_filename__val [_remark] _NL ts_filerecord__ts6_filename__val: "filein"i word -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/grammar/generated/utl-tvs.lark b/flopy4/mf6/codec/reader/grammar/generated/utl-tvs.lark index 4612c8423..c3ceaf806 100644 --- a/flopy4/mf6/codec/reader/grammar/generated/utl-tvs.lark +++ b/flopy4/mf6/codec/reader/grammar/generated/utl-tvs.lark @@ -30,9 +30,9 @@ options__block: _BEGIN "options"i [_remark] _NL options__fields _END "options"i period__block: _BEGIN "period"i block_index [_remark] _NL period__fields _END "period"i [block_index] %import typed.block_index -> block_index options__fields: (disable_storage_change_integration__kw | print_input__kw | ts_filerecord__rec__elem | open_close_redirect _NL)* -period__fields: (period_data | open_close_redirect _NL)* +period__fields: (stress_period_data | open_close_redirect _NL)* disable_storage_change_integration__kw: "disable_storage_change_integration"i [_remark] _NL print_input__kw: "print_input"i [_remark] _NL ts_filerecord__rec__elem: "ts6"i ts_filerecord__ts6_filename__val [_remark] _NL ts_filerecord__ts6_filename__val: "filein"i word -period_data: record+ +stress_period_data: record+ diff --git a/flopy4/mf6/codec/reader/transformer/typed.py b/flopy4/mf6/codec/reader/transformer/typed.py index 57088e8db..8d4631554 100644 --- a/flopy4/mf6/codec/reader/transformer/typed.py +++ b/flopy4/mf6/codec/reader/transformer/typed.py @@ -260,7 +260,7 @@ def block_index(self, items: list[Any]) -> int | float: """Extract block index (e.g., period number, or utl-tas's time).""" return parse_number(str(items[0])) - def period_data(self, items: list[Any]) -> list | NumberRows: + def stress_period_data(self, items: list[Any]) -> list | NumberRows: """A period block's list rows.""" return _rows(items) @@ -342,12 +342,12 @@ def _fields(children: list[Any]) -> dict: """A block's contents, by field name. A list's elements are always a list, anything else one value.""" if children and not any(isinstance(c, tuple) for c in children): - # list data (e.g. period_data records), not named fields + # list data (e.g. stress_period_data records), not named fields if all(_is_rows(c) for c in children): - return {"period_data": _rows(children)} + return {"stress_period_data": _rows(children)} if len(children) == 1 and isinstance(children[0], list): - return {"period_data": children[0]} - return {"period_data": children} + return {"stress_period_data": children[0]} + return {"stress_period_data": children} fields: dict = {} rows: list = [] for item in children: @@ -360,7 +360,7 @@ def _fields(children: list[Any]) -> dict: # SOLUTIONGROUP: MXITER, then its solutions' rows) rows.append(item) if rows: - fields["period_data"] = _rows(rows) + fields["stress_period_data"] = _rows(rows) return fields def __default__(self, data, children, meta): diff --git a/flopy4/mf6/converter/ingress/structure.py b/flopy4/mf6/converter/ingress/structure.py index e87b69fc4..d16183a07 100644 --- a/flopy4/mf6/converter/ingress/structure.py +++ b/flopy4/mf6/converter/ingress/structure.py @@ -1225,7 +1225,7 @@ def load_child(f: Any, token: str) -> Any: if list_io is not None: list_ios[(_list_key(period_field), kper)] = list_io if spd: - # Use the alias (period_data) as the init kwarg + # Use the alias (stress_period_data) as the init kwarg init_key = period_field.alias if period_field.alias else period_field.name kwargs[init_key] = spd diff --git a/flopy4/mf6/gwe/ctp.py b/flopy4/mf6/gwe/ctp.py index ac13c03b6..fe88d5c08 100644 --- a/flopy4/mf6/gwe/ctp.py +++ b/flopy4/mf6/gwe/ctp.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Ctp(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() temp: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -84,8 +79,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -96,12 +91,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -CtpPeriodData = Ctp.PeriodData +CtpStressPeriodData = Ctp.StressPeriodData diff --git a/flopy4/mf6/gwe/esl.py b/flopy4/mf6/gwe/esl.py index 96dd0a3d5..0048dba2e 100644 --- a/flopy4/mf6/gwe/esl.py +++ b/flopy4/mf6/gwe/esl.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -30,12 +29,8 @@ class Esl(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() senerrate: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -85,8 +80,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -97,12 +92,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -EslPeriodData = Esl.PeriodData +EslStressPeriodData = Esl.StressPeriodData diff --git a/flopy4/mf6/gwe/lke.py b/flopy4/mf6/gwe/lke.py index 5e1ad45e3..557ad8103 100644 --- a/flopy4/mf6/gwe/lke.py +++ b/flopy4/mf6/gwe/lke.py @@ -39,7 +39,7 @@ class Lke(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "lakeperioddata": Legacy("period_data"), + "lakeperioddata": Legacy("stress_period_data"), } @attrs.define @@ -92,7 +92,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): lakeno: int = integer(index=True, fk="packagedata.lakeno") laksetting: "Lke.Status | Lke.Temperature | Lke.Rainfall | Lke.Evaporation | Lke.Runoff | Lke.ExtInflow | Lke.Auxiliary" = union() # noqa: E501 @@ -177,8 +177,8 @@ class PeriodData(Item): block="packagedata", write_if_empty=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -194,4 +194,4 @@ class PeriodData(Item): LkeRunoff = Lke.Runoff LkeExtInflow = Lke.ExtInflow LkeAuxiliary = Lke.Auxiliary -LkePeriodData = Lke.PeriodData +LkeStressPeriodData = Lke.StressPeriodData diff --git a/flopy4/mf6/gwe/mwe.py b/flopy4/mf6/gwe/mwe.py index a3c1a8ab0..c0589f1a9 100644 --- a/flopy4/mf6/gwe/mwe.py +++ b/flopy4/mf6/gwe/mwe.py @@ -35,7 +35,7 @@ class Mwe(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "mweperioddata": Legacy("period_data"), + "mweperioddata": Legacy("stress_period_data"), } @attrs.define @@ -73,7 +73,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): mawno: int = integer(index=True, fk="packagedata.mawno") mwesetting: "Mwe.Status | Mwe.Temperature | Mwe.Rate | Mwe.Auxiliary" = union() @@ -158,8 +158,8 @@ class PeriodData(Item): block="packagedata", write_if_empty=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -172,4 +172,4 @@ class PeriodData(Item): MweTemperature = Mwe.Temperature MweRate = Mwe.Rate MweAuxiliary = Mwe.Auxiliary -MwePeriodData = Mwe.PeriodData +MweStressPeriodData = Mwe.StressPeriodData diff --git a/flopy4/mf6/gwe/oc.py b/flopy4/mf6/gwe/oc.py index eb6188ad7..f70e0fac7 100644 --- a/flopy4/mf6/gwe/oc.py +++ b/flopy4/mf6/gwe/oc.py @@ -17,8 +17,8 @@ class Oc(Package): ftype: ClassVar[str] = "OC6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "saverecord": Legacy("period_data", oc_period_data), - "printrecord": Legacy("period_data", oc_period_data), + "saverecord": Legacy("stress_period_data", oc_period_data), + "printrecord": Legacy("stress_period_data", oc_period_data), } @attrs.define @@ -57,7 +57,7 @@ class Print(Item): rtype: str = string() ocsetting: "Literal['ALL', 'FIRST', 'LAST'] | Oc.Frequency | Oc.Steps" = union() - _PeriodDataItem = Save | Print + _StressPeriodDataItem = Save | Print budget_file: Optional[Path] = file( default=None, @@ -88,8 +88,8 @@ class Print(Item): converter=Temperatureprint.convert, block="options", ) - _period_data: Optional[dict[int, list[_PeriodDataItem]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[_StressPeriodDataItem]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", diff --git a/flopy4/mf6/gwe/sfe.py b/flopy4/mf6/gwe/sfe.py index cc2086514..b2656161e 100644 --- a/flopy4/mf6/gwe/sfe.py +++ b/flopy4/mf6/gwe/sfe.py @@ -39,7 +39,7 @@ class Sfe(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "reachperioddata": Legacy("period_data"), + "reachperioddata": Legacy("stress_period_data"), } @attrs.define @@ -92,7 +92,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): rno: int = integer(index=True, fk="packagedata.rno") reachsetting: "Sfe.Status | Sfe.Temperature | Sfe.Rainfall | Sfe.Evaporation | Sfe.Runoff | Sfe.Inflow | Sfe.Auxiliary" = union() # noqa: E501 @@ -177,8 +177,8 @@ class PeriodData(Item): block="packagedata", write_if_empty=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -194,4 +194,4 @@ class PeriodData(Item): SfeRunoff = Sfe.Runoff SfeInflow = Sfe.Inflow SfeAuxiliary = Sfe.Auxiliary -SfePeriodData = Sfe.PeriodData +SfeStressPeriodData = Sfe.StressPeriodData diff --git a/flopy4/mf6/gwe/uze.py b/flopy4/mf6/gwe/uze.py index 5c2049a15..f0d37a237 100644 --- a/flopy4/mf6/gwe/uze.py +++ b/flopy4/mf6/gwe/uze.py @@ -37,7 +37,7 @@ class Uze(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "uzeperioddata": Legacy("period_data"), + "uzeperioddata": Legacy("stress_period_data"), } @attrs.define @@ -78,7 +78,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): uzfno: int = integer(index=True, fk="packagedata.uzfno") uzesetting: "Uze.Status | Uze.Temperature | Uze.Infiltration | Uze.Uzet | Uze.Auxiliary" = ( union() @@ -165,8 +165,8 @@ class PeriodData(Item): block="packagedata", write_if_empty=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -180,4 +180,4 @@ class PeriodData(Item): UzeInfiltration = Uze.Infiltration UzeUzet = Uze.Uzet UzeAuxiliary = Uze.Auxiliary -UzePeriodData = Uze.PeriodData +UzeStressPeriodData = Uze.StressPeriodData diff --git a/flopy4/mf6/gwf/chd.py b/flopy4/mf6/gwf/chd.py index df6ff9089..55599ea1f 100644 --- a/flopy4/mf6/gwf/chd.py +++ b/flopy4/mf6/gwf/chd.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Chd(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() head: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -84,8 +79,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -96,12 +91,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -ChdPeriodData = Chd.PeriodData +ChdStressPeriodData = Chd.StressPeriodData diff --git a/flopy4/mf6/gwf/csub.py b/flopy4/mf6/gwf/csub.py index 7b6c2a1ec..c9a3eeaa2 100644 --- a/flopy4/mf6/gwf/csub.py +++ b/flopy4/mf6/gwf/csub.py @@ -6,7 +6,6 @@ from flopy4.mf6._types import FloatArrayLike, TimeSeriesRef from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, file, integer, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -57,10 +56,6 @@ class Csub(Package): "wcomp-csub-cell": (("cellid",),), } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define class Packagedata(Item): icsubno: int = integer(index=True, pk=True) @@ -79,7 +74,7 @@ class Packagedata(Item): ) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() sig0: Union[float, TimeSeriesRef] = double(time_series=True) @@ -316,8 +311,8 @@ class PeriodData(Item): block="packagedata", shape=("ninterbeds",), ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -327,4 +322,4 @@ class PeriodData(Item): CsubPackagedata = Csub.Packagedata -CsubPeriodData = Csub.PeriodData +CsubStressPeriodData = Csub.StressPeriodData diff --git a/flopy4/mf6/gwf/drn.py b/flopy4/mf6/gwf/drn.py index cf1ed368c..e81736b92 100644 --- a/flopy4/mf6/gwf/drn.py +++ b/flopy4/mf6/gwf/drn.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -34,12 +33,8 @@ class Drn(Package): "mover_provider": "mover", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() elev: Union[float, TimeSeriesRef] = double(time_series=True) cond: Union[float, TimeSeriesRef] = double(time_series=True) @@ -101,8 +96,8 @@ class PeriodData(Item): block="options", optional=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -113,12 +108,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -DrnPeriodData = Drn.PeriodData +DrnStressPeriodData = Drn.StressPeriodData diff --git a/flopy4/mf6/gwf/evt.py b/flopy4/mf6/gwf/evt.py index 086c729eb..57f53fb3e 100644 --- a/flopy4/mf6/gwf/evt.py +++ b/flopy4/mf6/gwf/evt.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, integer, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Evt(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() surface: Union[float, TimeSeriesRef] = double(time_series=True) rate: Union[float, TimeSeriesRef] = double(time_series=True) @@ -112,8 +107,8 @@ class PeriodData(Item): block="dimensions", longname="number of ET segments", ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -124,12 +119,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -EvtPeriodData = Evt.PeriodData +EvtStressPeriodData = Evt.StressPeriodData diff --git a/flopy4/mf6/gwf/ghb.py b/flopy4/mf6/gwf/ghb.py index 1c42c0708..e1677ac7c 100644 --- a/flopy4/mf6/gwf/ghb.py +++ b/flopy4/mf6/gwf/ghb.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -34,12 +33,8 @@ class Ghb(Package): "mover_provider": "mover", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() bhead: Union[float, TimeSeriesRef] = double(time_series=True) cond: Union[float, TimeSeriesRef] = double(time_series=True) @@ -95,8 +90,8 @@ class PeriodData(Item): block="options", optional=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -107,12 +102,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -GhbPeriodData = Ghb.PeriodData +GhbStressPeriodData = Ghb.StressPeriodData diff --git a/flopy4/mf6/gwf/hfb.py b/flopy4/mf6/gwf/hfb.py index 3aad9a4a5..6b9efd836 100644 --- a/flopy4/mf6/gwf/hfb.py +++ b/flopy4/mf6/gwf/hfb.py @@ -4,7 +4,6 @@ import attrs from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import cellid_, double, integer, keyword, list_ @@ -14,12 +13,8 @@ class Hfb(Package): dfn_name: ClassVar[str] = "gwf-hfb" ftype: ClassVar[str] = "HFB6" - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid1: tuple[int, ...] = cellid_() cellid2: tuple[int, ...] = cellid_() hydchr: float = double() @@ -35,8 +30,8 @@ class PeriodData(Item): block="dimensions", longname="maximum number of barriers", ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -45,4 +40,4 @@ class PeriodData(Item): ) -HfbPeriodData = Hfb.PeriodData +HfbStressPeriodData = Hfb.StressPeriodData diff --git a/flopy4/mf6/gwf/lak.py b/flopy4/mf6/gwf/lak.py index 02f9dcdee..442748a40 100644 --- a/flopy4/mf6/gwf/lak.py +++ b/flopy4/mf6/gwf/lak.py @@ -68,7 +68,7 @@ class Lak(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "perioddata": Legacy("period_data"), + "perioddata": Legacy("stress_period_data"), } @attrs.define @@ -190,7 +190,7 @@ class Auxiliary(Item): auxname: str = string() auxval: Union[float, TimeSeriesRef] = double(time_series=True) - _PeriodDataItem = ( + _StressPeriodDataItem = ( Status | Stage | Rainfall @@ -354,8 +354,8 @@ class Auxiliary(Item): block="outlets", shape=("noutlets",), ) - _period_data: Optional[dict[int, list[_PeriodDataItem]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[_StressPeriodDataItem]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", diff --git a/flopy4/mf6/gwf/maw.py b/flopy4/mf6/gwf/maw.py index 12cf78d0b..ddcdde91b 100644 --- a/flopy4/mf6/gwf/maw.py +++ b/flopy4/mf6/gwf/maw.py @@ -59,7 +59,7 @@ class Maw(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "perioddata": Legacy("period_data"), + "perioddata": Legacy("stress_period_data"), } @attrs.define @@ -151,7 +151,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): ifno: int = integer(index=True, fk="packagedata.ifno") mawsetting: "Maw.Status | Maw.ConnectionStatus | Maw.Bottom | Maw.FlowingWell | Maw.Rate | Maw.WellHead | Maw.HeadLimit | Maw.Shutoff | Maw.RateScaling | Maw.Auxiliary" = union() # noqa: E501 @@ -287,8 +287,8 @@ class PeriodData(Item): default=None, block="angledata", ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -311,4 +311,4 @@ class PeriodData(Item): MawShutoff = Maw.Shutoff MawRateScaling = Maw.RateScaling MawAuxiliary = Maw.Auxiliary -MawPeriodData = Maw.PeriodData +MawStressPeriodData = Maw.StressPeriodData diff --git a/flopy4/mf6/gwf/mvr.py b/flopy4/mf6/gwf/mvr.py index d0182ce69..514348e94 100644 --- a/flopy4/mf6/gwf/mvr.py +++ b/flopy4/mf6/gwf/mvr.py @@ -16,7 +16,7 @@ class Mvr(Package): ftype: ClassVar[str] = "MVR6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "perioddata": Legacy("period_data"), + "perioddata": Legacy("stress_period_data"), } @attrs.define @@ -33,7 +33,7 @@ class Packages(Item): ) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): _columns: ClassVar[tuple[str, ...]] = ( "mname1", "pname1", @@ -106,8 +106,8 @@ class PeriodData(Item): block="packages", shape=("maxpackages",), ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -116,4 +116,4 @@ class PeriodData(Item): MvrPackages = Mvr.Packages -MvrPeriodData = Mvr.PeriodData +MvrStressPeriodData = Mvr.StressPeriodData diff --git a/flopy4/mf6/gwf/oc.py b/flopy4/mf6/gwf/oc.py index 332334b64..bbcd1b26b 100644 --- a/flopy4/mf6/gwf/oc.py +++ b/flopy4/mf6/gwf/oc.py @@ -17,8 +17,8 @@ class Oc(Package): ftype: ClassVar[str] = "OC6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "saverecord": Legacy("period_data", oc_period_data), - "printrecord": Legacy("period_data", oc_period_data), + "saverecord": Legacy("stress_period_data", oc_period_data), + "printrecord": Legacy("stress_period_data", oc_period_data), } @attrs.define @@ -57,7 +57,7 @@ class Print(Item): rtype: str = string() ocsetting: "Literal['ALL', 'FIRST', 'LAST'] | Oc.Frequency | Oc.Steps" = union() - _PeriodDataItem = Save | Print + _StressPeriodDataItem = Save | Print budget_file: Optional[Path] = file( default=None, @@ -88,8 +88,8 @@ class Print(Item): converter=Headprint.convert, block="options", ) - _period_data: Optional[dict[int, list[_PeriodDataItem]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[_StressPeriodDataItem]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", diff --git a/flopy4/mf6/gwf/rch.py b/flopy4/mf6/gwf/rch.py index c9c058203..252df7cee 100644 --- a/flopy4/mf6/gwf/rch.py +++ b/flopy4/mf6/gwf/rch.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Rch(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() recharge: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -90,8 +85,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -102,12 +97,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -RchPeriodData = Rch.PeriodData +RchStressPeriodData = Rch.StressPeriodData diff --git a/flopy4/mf6/gwf/riv.py b/flopy4/mf6/gwf/riv.py index 63f0b6c77..0332ec134 100644 --- a/flopy4/mf6/gwf/riv.py +++ b/flopy4/mf6/gwf/riv.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -34,12 +33,8 @@ class Riv(Package): "mover_provider": "mover", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() stage: Union[float, TimeSeriesRef] = double(time_series=True) cond: Union[float, TimeSeriesRef] = double(time_series=True) @@ -96,8 +91,8 @@ class PeriodData(Item): block="options", optional=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -108,12 +103,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -RivPeriodData = Riv.PeriodData +RivStressPeriodData = Riv.StressPeriodData diff --git a/flopy4/mf6/gwf/sfr.py b/flopy4/mf6/gwf/sfr.py index 62f477ac8..4bd4df2df 100644 --- a/flopy4/mf6/gwf/sfr.py +++ b/flopy4/mf6/gwf/sfr.py @@ -65,7 +65,7 @@ class Sfr(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "perioddata": Legacy("period_data"), + "perioddata": Legacy("stress_period_data"), } @attrs.define @@ -180,7 +180,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): ifno: int = integer(index=True, fk="packagedata.ifno") sfrsetting: "Sfr.Status | Sfr.Bedk | Sfr.Manning | Sfr.Stage | Sfr.Inflow | Sfr.Rainfall | Sfr.Evaporation | Sfr.Runoff | Sfr.Diversion | Sfr.UpstreamFraction | Sfr.CrossSection | Sfr.Auxiliary" = union() # noqa: E501 @@ -337,8 +337,8 @@ class PeriodData(Item): block="initialstages", shape=("nreaches",), ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -363,4 +363,4 @@ class PeriodData(Item): SfrUpstreamFraction = Sfr.UpstreamFraction SfrCrossSection = Sfr.CrossSection SfrAuxiliary = Sfr.Auxiliary -SfrPeriodData = Sfr.PeriodData +SfrStressPeriodData = Sfr.StressPeriodData diff --git a/flopy4/mf6/gwf/sto.py b/flopy4/mf6/gwf/sto.py index cc57b7caf..3abde14d7 100644 --- a/flopy4/mf6/gwf/sto.py +++ b/flopy4/mf6/gwf/sto.py @@ -17,13 +17,13 @@ class Sto(Package): ftype: ClassVar[str] = "STO6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "steady_state": Legacy("period_data", sto_period_data), - "transient": Legacy("period_data", sto_period_data), + "steady_state": Legacy("stress_period_data", sto_period_data), + "transient": Legacy("stress_period_data", sto_period_data), } @attrs.define - class PeriodData(Item): - period_data: str = string() + class StressPeriodData(Item): + stress_period_data: str = string() save_flows: bool = keyword( default=False, @@ -80,8 +80,8 @@ class PeriodData(Item): netcdf=True, longname="specific yield", ) # type: ignore[assignment] - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -89,4 +89,4 @@ class PeriodData(Item): ) -StoPeriodData = Sto.PeriodData +StoStressPeriodData = Sto.StressPeriodData diff --git a/flopy4/mf6/gwf/uzf.py b/flopy4/mf6/gwf/uzf.py index ac5326d1f..d61ca5ec4 100644 --- a/flopy4/mf6/gwf/uzf.py +++ b/flopy4/mf6/gwf/uzf.py @@ -48,7 +48,7 @@ class Uzf(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "perioddata": Legacy("period_data"), + "perioddata": Legacy("stress_period_data"), } @attrs.define @@ -68,7 +68,7 @@ class Packagedata(Item): ) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): ifno: int = integer(index=True, fk="packagedata.ifno") finf: Union[float, TimeSeriesRef] = double(time_series=True) pet: Union[float, TimeSeriesRef] = double(time_series=True) @@ -213,8 +213,8 @@ class PeriodData(Item): block="packagedata", shape=("nuzfcells",), ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -223,4 +223,4 @@ class PeriodData(Item): UzfPackagedata = Uzf.Packagedata -UzfPeriodData = Uzf.PeriodData +UzfStressPeriodData = Uzf.StressPeriodData diff --git a/flopy4/mf6/gwf/wel.py b/flopy4/mf6/gwf/wel.py index 531473797..9a07f4f3d 100644 --- a/flopy4/mf6/gwf/wel.py +++ b/flopy4/mf6/gwf/wel.py @@ -8,7 +8,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, file, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -36,12 +35,8 @@ class Wel(Package): "mover_provider": "mover", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() q: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -122,8 +117,8 @@ class PeriodData(Item): block="options", optional=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -134,12 +129,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -WelPeriodData = Wel.PeriodData +WelStressPeriodData = Wel.StressPeriodData diff --git a/flopy4/mf6/gwt/cnc.py b/flopy4/mf6/gwt/cnc.py index 33b7886e0..38cca99e0 100644 --- a/flopy4/mf6/gwt/cnc.py +++ b/flopy4/mf6/gwt/cnc.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Cnc(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() conc: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -84,8 +79,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -96,12 +91,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -CncPeriodData = Cnc.PeriodData +CncStressPeriodData = Cnc.StressPeriodData diff --git a/flopy4/mf6/gwt/lkt.py b/flopy4/mf6/gwt/lkt.py index 0261a465f..520bad9d9 100644 --- a/flopy4/mf6/gwt/lkt.py +++ b/flopy4/mf6/gwt/lkt.py @@ -39,7 +39,7 @@ class Lkt(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "lakeperioddata": Legacy("period_data"), + "lakeperioddata": Legacy("stress_period_data"), } @attrs.define @@ -90,7 +90,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): ifno: int = integer(index=True, fk="packagedata.ifno") laksetting: "Lkt.Status | Lkt.Concentration | Lkt.Rainfall | Lkt.Evaporation | Lkt.Runoff | Lkt.ExtInflow | Lkt.Auxiliary" = union() # noqa: E501 @@ -175,8 +175,8 @@ class PeriodData(Item): block="packagedata", write_if_empty=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -192,4 +192,4 @@ class PeriodData(Item): LktRunoff = Lkt.Runoff LktExtInflow = Lkt.ExtInflow LktAuxiliary = Lkt.Auxiliary -LktPeriodData = Lkt.PeriodData +LktStressPeriodData = Lkt.StressPeriodData diff --git a/flopy4/mf6/gwt/mwt.py b/flopy4/mf6/gwt/mwt.py index 6e1eec569..b4315f5b8 100644 --- a/flopy4/mf6/gwt/mwt.py +++ b/flopy4/mf6/gwt/mwt.py @@ -35,7 +35,7 @@ class Mwt(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "mwtperioddata": Legacy("period_data"), + "mwtperioddata": Legacy("stress_period_data"), } @attrs.define @@ -71,7 +71,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): ifno: int = integer(index=True, fk="packagedata.ifno") mwtsetting: "Mwt.Status | Mwt.Concentration | Mwt.Rate | Mwt.Auxiliary" = union() @@ -156,8 +156,8 @@ class PeriodData(Item): block="packagedata", write_if_empty=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -170,4 +170,4 @@ class PeriodData(Item): MwtConcentration = Mwt.Concentration MwtRate = Mwt.Rate MwtAuxiliary = Mwt.Auxiliary -MwtPeriodData = Mwt.PeriodData +MwtStressPeriodData = Mwt.StressPeriodData diff --git a/flopy4/mf6/gwt/oc.py b/flopy4/mf6/gwt/oc.py index 83bf333c9..59c06905e 100644 --- a/flopy4/mf6/gwt/oc.py +++ b/flopy4/mf6/gwt/oc.py @@ -17,8 +17,8 @@ class Oc(Package): ftype: ClassVar[str] = "OC6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "saverecord": Legacy("period_data", oc_period_data), - "printrecord": Legacy("period_data", oc_period_data), + "saverecord": Legacy("stress_period_data", oc_period_data), + "printrecord": Legacy("stress_period_data", oc_period_data), } @attrs.define @@ -57,7 +57,7 @@ class Print(Item): rtype: str = string() ocsetting: "Literal['ALL', 'FIRST', 'LAST'] | Oc.Frequency | Oc.Steps" = union() - _PeriodDataItem = Save | Print + _StressPeriodDataItem = Save | Print budget_file: Optional[Path] = file( default=None, @@ -88,8 +88,8 @@ class Print(Item): converter=Concentrationprint.convert, block="options", ) - _period_data: Optional[dict[int, list[_PeriodDataItem]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[_StressPeriodDataItem]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", diff --git a/flopy4/mf6/gwt/sft.py b/flopy4/mf6/gwt/sft.py index 1f9f92ded..9defcb46d 100644 --- a/flopy4/mf6/gwt/sft.py +++ b/flopy4/mf6/gwt/sft.py @@ -38,7 +38,7 @@ class Sft(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "reachperioddata": Legacy("period_data"), + "reachperioddata": Legacy("stress_period_data"), } @attrs.define @@ -89,7 +89,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): ifno: int = integer(index=True, fk="packagedata.ifno") reachsetting: "Sft.Status | Sft.Concentration | Sft.Rainfall | Sft.Evaporation | Sft.Runoff | Sft.Inflow | Sft.Auxiliary" = union() # noqa: E501 @@ -174,8 +174,8 @@ class PeriodData(Item): block="packagedata", write_if_empty=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -191,4 +191,4 @@ class PeriodData(Item): SftRunoff = Sft.Runoff SftInflow = Sft.Inflow SftAuxiliary = Sft.Auxiliary -SftPeriodData = Sft.PeriodData +SftStressPeriodData = Sft.StressPeriodData diff --git a/flopy4/mf6/gwt/src.py b/flopy4/mf6/gwt/src.py index a8a9e1073..70f781dbd 100644 --- a/flopy4/mf6/gwt/src.py +++ b/flopy4/mf6/gwt/src.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -30,12 +29,8 @@ class Src(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() smassrate: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -91,8 +86,8 @@ class PeriodData(Item): optional=True, longname="apply source to highest saturated cell", ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -103,12 +98,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -SrcPeriodData = Src.PeriodData +SrcStressPeriodData = Src.StressPeriodData diff --git a/flopy4/mf6/gwt/uzt.py b/flopy4/mf6/gwt/uzt.py index 67a541eca..0d716ae94 100644 --- a/flopy4/mf6/gwt/uzt.py +++ b/flopy4/mf6/gwt/uzt.py @@ -36,7 +36,7 @@ class Uzt(Package): } legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "uztperioddata": Legacy("period_data"), + "uztperioddata": Legacy("stress_period_data"), } @attrs.define @@ -77,7 +77,7 @@ class Auxiliary(Item): auxval: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): ifno: int = integer(index=True, fk="packagedata.ifno") uztsetting: "Uzt.Status | Uzt.Concentration | Uzt.Infiltration | Uzt.Uzet | Uzt.Auxiliary" = union() # noqa: E501 @@ -162,8 +162,8 @@ class PeriodData(Item): block="packagedata", write_if_empty=True, ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -177,4 +177,4 @@ class PeriodData(Item): UztInfiltration = Uzt.Infiltration UztUzet = Uzt.Uzet UztAuxiliary = Uzt.Auxiliary -UztPeriodData = Uzt.PeriodData +UztStressPeriodData = Uzt.StressPeriodData diff --git a/flopy4/mf6/legacy.py b/flopy4/mf6/legacy.py index 90427047b..b4a34d4cc 100644 --- a/flopy4/mf6/legacy.py +++ b/flopy4/mf6/legacy.py @@ -1,15 +1,16 @@ """flopy3's constructor keywords and attributes, with a deprecation warning. -flopy3 names a package's period list after its v1 DFN field (CHD's -`stress_period_data`, LAK's `perioddata`, LKT's `lakeperioddata`, ...), and -spreads STO's and OC's over several keywords whose values are shaped -differently. flopy4 calls each of them `period_data`. A generated class -lists flopy3's names in `legacy_kwargs`, and `LegacyKwargs` translates them -when the class is called, before attrs' `__init__` sees them. - -The same names work as attributes, by name only: `wel.stress_period_data` is -`wel.period_data`, not flopy3's `MFTransientList`. A keyword that's converted -has no value of its own to read or assign, so its attribute raises instead. +flopy3 names some packages' period list after its v1 DFN field (LAK's +`perioddata`, LKT's `lakeperioddata`, ...), and spreads STO's and OC's over +several keywords whose values are shaped differently. flopy4 calls each of +them `stress_period_data`. A generated class lists flopy3's names in +`legacy_kwargs`, and `LegacyKwargs` translates them when the class is +called, before attrs' `__init__` sees them. + +The same names work as attributes, by name only: `lak.perioddata` is +`lak.stress_period_data`, not flopy3's `MFTransientList`. A keyword that's +converted has no value of its own to read or assign, so its attribute raises +instead. """ import warnings @@ -106,7 +107,7 @@ def _periods(value: Any) -> dict[int, Any]: def sto_period_data(steady_state: Any = None, transient: Any = None) -> dict[int, list]: - """STO's `period_data` from flopy3's `steady_state` and + """STO's `stress_period_data` from flopy3's `steady_state` and `transient`. Each is `{kper: True}`, `True` (period 0), or a list of periods. A period can't be both.""" @@ -129,7 +130,7 @@ def periods(value: Any) -> list[int]: def oc_period_data(saverecord: Any = None, printrecord: Any = None) -> dict[int, list]: - """OC's `period_data` from flopy3's `saverecord` and + """OC's `stress_period_data` from flopy3's `saverecord` and `printrecord`. Each is a list of `(rtype, ocsetting...)` tuples for period 0, or a dict of them by period. Each period's saves come before its prints, as flopy3 writes them.""" diff --git a/flopy4/mf6/olf/cdb.py b/flopy4/mf6/olf/cdb.py index ea3758ccc..5cb48dfea 100644 --- a/flopy4/mf6/olf/cdb.py +++ b/flopy4/mf6/olf/cdb.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, integer, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Cdb(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() idcxs: int = integer(index=True) width: Union[float, TimeSeriesRef] = double(time_series=True) @@ -76,8 +71,8 @@ class PeriodData(Item): longname="save flows to budget file", ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -88,12 +83,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -CdbPeriodData = Cdb.PeriodData +CdbStressPeriodData = Cdb.StressPeriodData diff --git a/flopy4/mf6/olf/chd.py b/flopy4/mf6/olf/chd.py index d89d724ac..a6ffe258d 100644 --- a/flopy4/mf6/olf/chd.py +++ b/flopy4/mf6/olf/chd.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Chd(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() head: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -84,8 +79,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -96,12 +91,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -ChdPeriodData = Chd.PeriodData +ChdStressPeriodData = Chd.StressPeriodData diff --git a/flopy4/mf6/olf/evp.py b/flopy4/mf6/olf/evp.py index 3fd7347dd..dd773af97 100644 --- a/flopy4/mf6/olf/evp.py +++ b/flopy4/mf6/olf/evp.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Evp(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() evaporation: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -84,8 +79,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -96,12 +91,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -EvpPeriodData = Evp.PeriodData +EvpStressPeriodData = Evp.StressPeriodData diff --git a/flopy4/mf6/olf/flw.py b/flopy4/mf6/olf/flw.py index e880d11ab..5799319ca 100644 --- a/flopy4/mf6/olf/flw.py +++ b/flopy4/mf6/olf/flw.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -30,12 +29,8 @@ class Flw(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() q: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -85,8 +80,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -97,12 +92,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -FlwPeriodData = Flw.PeriodData +FlwStressPeriodData = Flw.StressPeriodData diff --git a/flopy4/mf6/olf/oc.py b/flopy4/mf6/olf/oc.py index bb50896f4..3656fb31a 100644 --- a/flopy4/mf6/olf/oc.py +++ b/flopy4/mf6/olf/oc.py @@ -17,8 +17,8 @@ class Oc(Package): ftype: ClassVar[str] = "OC6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "saverecord": Legacy("period_data", oc_period_data), - "printrecord": Legacy("period_data", oc_period_data), + "saverecord": Legacy("stress_period_data", oc_period_data), + "printrecord": Legacy("stress_period_data", oc_period_data), } @attrs.define @@ -57,7 +57,7 @@ class Print(Item): rtype: str = string() ocsetting: "Literal['ALL', 'FIRST', 'LAST'] | Oc.Frequency | Oc.Steps" = union() - _PeriodDataItem = Save | Print + _StressPeriodDataItem = Save | Print budget_file: Optional[Path] = file( default=None, @@ -96,8 +96,8 @@ class Print(Item): converter=Qoutflowprint.convert, block="options", ) - _period_data: Optional[dict[int, list[_PeriodDataItem]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[_StressPeriodDataItem]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", diff --git a/flopy4/mf6/olf/pcp.py b/flopy4/mf6/olf/pcp.py index 367ebbada..46ac18029 100644 --- a/flopy4/mf6/olf/pcp.py +++ b/flopy4/mf6/olf/pcp.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -29,12 +28,8 @@ class Pcp(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() precipitation: Union[float, TimeSeriesRef] = double(time_series=True) aux: tuple[Union[float, TimeSeriesRef], ...] = array( @@ -84,8 +79,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -96,12 +91,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -PcpPeriodData = Pcp.PeriodData +PcpStressPeriodData = Pcp.StressPeriodData diff --git a/flopy4/mf6/olf/sto.py b/flopy4/mf6/olf/sto.py index 76e3c6d83..79723ee05 100644 --- a/flopy4/mf6/olf/sto.py +++ b/flopy4/mf6/olf/sto.py @@ -15,13 +15,13 @@ class Sto(Package): ftype: ClassVar[str] = "STO6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "steady_state": Legacy("period_data", sto_period_data), - "transient": Legacy("period_data", sto_period_data), + "steady_state": Legacy("stress_period_data", sto_period_data), + "transient": Legacy("stress_period_data", sto_period_data), } @attrs.define - class PeriodData(Item): - period_data: str = string() + class StressPeriodData(Item): + stress_period_data: str = string() save_flows: bool = keyword( default=False, @@ -35,8 +35,8 @@ class PeriodData(Item): optional=True, longname="export array variables to layered ascii files.", ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -44,4 +44,4 @@ class PeriodData(Item): ) -StoPeriodData = Sto.PeriodData +StoStressPeriodData = Sto.StressPeriodData diff --git a/flopy4/mf6/olf/zdg.py b/flopy4/mf6/olf/zdg.py index 0cac2333c..ec6009678 100644 --- a/flopy4/mf6/olf/zdg.py +++ b/flopy4/mf6/olf/zdg.py @@ -7,7 +7,6 @@ from flopy4.mf6._types import TimeSeriesRef, to_array from flopy4.mf6.item import Item -from flopy4.mf6.legacy import Legacy from flopy4.mf6.package import Package from flopy4.mf6.spec import array, cellid_, child, double, integer, keyword, list_, string from flopy4.mf6.utl.obs import Obs @@ -30,12 +29,8 @@ class Zdg(Package): "bound": "<=maxbound", } - legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "stress_period_data": Legacy("period_data"), - } - @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() idcxs: int = integer(index=True, fk="chf-cxs.packagedata.ifno") width: Union[float, TimeSeriesRef] = double(time_series=True) @@ -82,8 +77,8 @@ class PeriodData(Item): block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) obs: Optional[Obs] = child(block="options", keyword="obs6", direction="in") - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -94,12 +89,12 @@ class PeriodData(Item): def maxbound(self) -> int: """Maximum number of active entries in any stress period. - Computed live from `period_data`'s row counts -- not + Computed live from `stress_period_data`'s row counts -- not stored or independently settable. """ - if not self.period_data: + if not self.stress_period_data: return 0 - return max(len(v) for v in self.period_data.values()) + return max(len(v) for v in self.stress_period_data.values()) -ZdgPeriodData = Zdg.PeriodData +ZdgStressPeriodData = Zdg.StressPeriodData diff --git a/flopy4/mf6/package.py b/flopy4/mf6/package.py index d967da7ce..d32a5393d 100644 --- a/flopy4/mf6/package.py +++ b/flopy4/mf6/package.py @@ -112,7 +112,7 @@ def _grid_period_has_explicit_clear(stress_periods: list[dict[int, Any]], kper: class PeriodRows(dict): """A fill-forward list field's ``{kper: rows}`` (CHD's - period_data). Rows assigned to a period are coerced as at + stress_period_data). Rows assigned to a period are coerced as at construction (see `Package._coerce_item_list`).""" def __init__(self, package: "Package", name: str, periods: dict) -> None: @@ -216,7 +216,7 @@ def _init_item_lists(self, fields) -> None: `_set_dim_from_rows`). A computed `maxbound` isn't set here. Reads/writes the field's real attribute name (f.name) always -- - aliases (e.g. _period_data's "period_data") only name + aliases (e.g. _stress_period_data's "stress_period_data") only name the __init__ parameter; the instance attribute (and __dict__ key object.__setattr__ writes to) is still the real name. """ @@ -933,7 +933,7 @@ def to_dict(self, blocks: bool = False, strict: bool = False) -> dict: def to_dataframe(self) -> pd.DataFrame: """Return stress period data as a tidy DataFrame. Zero cost if not called.""" - _spd = self.__dict__.get("_period_data") + _spd = self.__dict__.get("_stress_period_data") if not _spd: return pd.DataFrame() union = isinstance(item_list_type(self._period_item_field().type), tuple) @@ -952,7 +952,7 @@ def to_dataframe(self) -> pd.DataFrame: return pd.concat(frames, ignore_index=True) if frames else pd.DataFrame() def from_dataframe(self, df: pd.DataFrame) -> None: - """Set period_data from a tidy DataFrame. + """Set stress_period_data from a tidy DataFrame. The DataFrame must have a ``kper`` column and data columns matching the period Item class's own fields (as produced by ``to_dataframe()``), @@ -984,13 +984,13 @@ def _period_item_field(self) -> attrs.Attribute: raise ValueError(f"{type(self).__name__} has no period Item-list field") @property - def period_data(self): # type: ignore[override] + def stress_period_data(self): # type: ignore[override] """Stress period data as ``dict[int, list[Item]]`` keyed by 0-based kper.""" - return self.__dict__.get("_period_data") + return self.__dict__.get("_stress_period_data") - @period_data.setter # type: ignore[attr-defined, no-redef] - def period_data(self, value) -> None: # type: ignore[override] - setattr(self, "_period_data", value) + @stress_period_data.setter # type: ignore[attr-defined, no-redef] + def stress_period_data(self, value) -> None: # type: ignore[override] + setattr(self, "_stress_period_data", value) def _period_array_fields(self) -> list: """Period array fields (not list ones): READARRAY packages' q, recharge, aux, ...""" @@ -1182,7 +1182,7 @@ def to_xarray( # type: ignore[override] return super().to_xarray() # type: ignore[return-value] def from_xarray(self, ds: xr.Dataset) -> None: - """Set period_data from ``to_xarray()``'s dense or sparse + """Set stress_period_data from ``to_xarray()``'s dense or sparse form (see ``flopy4.mf6.period_lists``).""" spd = period_lists.period_list_field(type(self)) if spd is None: diff --git a/flopy4/mf6/period_lists.py b/flopy4/mf6/period_lists.py index 7a50ffd7e..866b5ebab 100644 --- a/flopy4/mf6/period_lists.py +++ b/flopy4/mf6/period_lists.py @@ -1,4 +1,4 @@ -"""Period list fields (CHD's, SFR's period_data) as xarray. +"""Period list fields (CHD's, SFR's stress_period_data) as xarray. Each period's rows are placed by their key, which sets the dense form's dims: @@ -59,7 +59,7 @@ def period_list_field(cls: type) -> Optional[attrs.Attribute]: - """A package's period list field (``_period_data``), if any.""" + """A package's period list field (``_stress_period_data``), if any.""" return next( ( f diff --git a/flopy4/mf6/prt/oc.py b/flopy4/mf6/prt/oc.py index 8e6a62ddb..fa409f644 100644 --- a/flopy4/mf6/prt/oc.py +++ b/flopy4/mf6/prt/oc.py @@ -16,8 +16,8 @@ class Oc(Package): ftype: ClassVar[str] = "OC6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "saverecord": Legacy("period_data", oc_period_data), - "printrecord": Legacy("period_data", oc_period_data), + "saverecord": Legacy("stress_period_data", oc_period_data), + "printrecord": Legacy("stress_period_data", oc_period_data), } @attrs.define @@ -46,7 +46,7 @@ class Print(Item): rtype: str = string() ocsetting: "Literal['ALL', 'FIRST', 'LAST'] | Oc.Frequency | Oc.Steps" = union() - _PeriodDataItem = Save | Print + _StressPeriodDataItem = Save | Print budget_file: Optional[Path] = file( default=None, @@ -145,8 +145,8 @@ class Print(Item): block="tracktimes", shape=("ntracktimes",), ) - _period_data: Optional[dict[int, list[_PeriodDataItem]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[_StressPeriodDataItem]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", diff --git a/flopy4/mf6/prt/prp.py b/flopy4/mf6/prt/prp.py index 378bceb4b..9fc6a0d5a 100644 --- a/flopy4/mf6/prt/prp.py +++ b/flopy4/mf6/prt/prp.py @@ -18,7 +18,7 @@ class Prp(Package): multi_package: ClassVar[bool] = True legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "perioddata": Legacy("period_data"), + "perioddata": Legacy("stress_period_data"), } @attrs.define @@ -51,7 +51,7 @@ class Fraction(Item): _keyword: ClassVar[str] = "fraction" fraction: tuple[float, ...] = array(default=()) - _PeriodDataItem = Literal["ALL", "FIRST", "LAST"] | Frequency | Steps | Fraction + _StressPeriodDataItem = Literal["ALL", "FIRST", "LAST"] | Frequency | Steps | Fraction boundnames: bool = keyword( default=False, @@ -172,8 +172,8 @@ class Fraction(Item): block="releasetimes", shape=("nreleasetimes",), ) - _period_data: Optional[dict[int, list[_PeriodDataItem]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[_StressPeriodDataItem]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", diff --git a/flopy4/mf6/utils/codegen/filters.py b/flopy4/mf6/utils/codegen/filters.py index 0b08e4dbc..5c4c7f7d0 100644 --- a/flopy4/mf6/utils/codegen/filters.py +++ b/flopy4/mf6/utils/codegen/filters.py @@ -753,7 +753,7 @@ def python_repr(v) -> str: def pascal_name(name: str) -> str: """snake_case, hyphenated, or a plain lowercase word -> PascalCase, e.g. - ``period_data`` -> ``PeriodData``, ``packagedata`` -> + ``stress_period_data`` -> ``StressPeriodData``, ``packagedata`` -> ``Packagedata``, ``ext-inflow`` (a real MF6 keyword, LKT/LKE) -> ``ExtInflow``. Only "_"/"-" split words -- the wire keyword itself (unlike the class name) keeps its original separator, since a hyphen is @@ -1185,7 +1185,7 @@ def item_class( Called as:: - {{ spec.period_schema | item_class("PeriodData", True) }} + {{ spec.period_schema | item_class("StressPeriodData", True) }} {{ block_schema | item_class("Packagedata") }} {{ arm_schema | item_class("Status", keyword="STATUS") }} diff --git a/flopy4/mf6/utils/codegen/make.py b/flopy4/mf6/utils/codegen/make.py index 4f9d977c2..7fbb63050 100644 --- a/flopy4/mf6/utils/codegen/make.py +++ b/flopy4/mf6/utils/codegen/make.py @@ -102,7 +102,7 @@ class BlockPropertySpec: class ItemClassSpec: """Pre-computed context for one generated Item class: the element type of a list field, in any block (see _build_list_item_specs) -- a plain - row (CHD's PeriodData, LAK's Packagedata), a keyword-led row (a + row (CHD's StressPeriodData, LAK's Packagedata), a keyword-led row (a tagged list's record), or one arm of a union (LAK's Stage/Rate/Status, OC's Saverecord/Printrecord). @@ -119,7 +119,7 @@ class ItemClassSpec: @dataclass class ItemUnionSpec: - """A union list's element type alias (e.g. ``_PeriodDataItem = + """A union list's element type alias (e.g. ``_StressPeriodDataItem = Stage | Rate | ...``), keeping the field annotation short. Its keyword arms are words, like a union field's (PRP's ``Literal['ALL', 'FIRST', 'LAST'] | Frequency | ...``).""" @@ -152,7 +152,7 @@ class BlockClassSpec: class ComputedFieldSpec: """Pre-computed context for a read-only computed property, replacing a stored attrs field entirely -- e.g. ``maxbound``, derived live from - ``period_data``'s row counts rather than stored and kept in + ``stress_period_data``'s row counts rather than stored and kept in sync by hand (see ``build_component_spec``'s ``_maxbound_is_computed`` for when this applies).""" @@ -543,7 +543,7 @@ def _build_list_item_specs( union, its keyword arms words (PRP's ALL, FIRST and LAST) - a tagged (keyword-led) record element: one class whose leading keyword is its ``_keyword``, built like a union arm - - an untagged record element (packagedata, CHD's period_data, + - an untagged record element (packagedata, CHD's stress_period_data, LKT's ``ifno`` and ``laksetting``): one class of positional columns, a union among them a field of its own (see _union_arm_specs) @@ -1324,41 +1324,10 @@ def _child_field_spec( # flopy3's constructor keywords for the period list, by component, as # (keyword, converter): flopy4 takes them as deprecated aliases of -# period_data (see flopy4.mf6.legacy). Most are the v1 DFN's name for the -# list; STO's and OC's are reshaped by the converter named. CHF and OLF -# aren't in a flopy3 release yet, since MF6 hasn't released them, but -# flopy3 generates its classes from the same DFNs. +# stress_period_data (see flopy4.mf6.legacy). A closed set, since flopy3's +# names are frozen. Most are the v1 DFN's name for the list; STO's and +# OC's are reshaped by the converter named. _LEGACY_PERIOD_KWARGS: dict[str, tuple[tuple[str, str | None], ...]] = { - **{ - name: (("stress_period_data", None),) - for name in ( - "chf-cdb", - "chf-chd", - "chf-evp", - "chf-flw", - "chf-pcp", - "chf-zdg", - "gwe-ctp", - "gwe-esl", - "gwf-chd", - "gwf-csub", - "gwf-drn", - "gwf-evt", - "gwf-ghb", - "gwf-hfb", - "gwf-rch", - "gwf-riv", - "gwf-wel", - "gwt-cnc", - "gwt-src", - "olf-cdb", - "olf-chd", - "olf-evp", - "olf-flw", - "olf-pcp", - "olf-zdg", - ) - }, **{ name: (("perioddata", None),) for name in ( @@ -1396,7 +1365,7 @@ def _legacy_kwargs(component: Component) -> dict[str, str]: """The component's legacy_kwargs, by flopy3 keyword, as the Legacy calls to render.""" return { - old: f'Legacy("period_data"{f", {convert}" if convert else ""})' + old: f'Legacy("stress_period_data"{f", {convert}" if convert else ""})' for old, convert in _LEGACY_PERIOD_KWARGS.get(component.name, ()) } @@ -1600,7 +1569,7 @@ def build_component_spec( } # Repeating blocks whose missing occurrences reuse the prior one's # values (period) -- see filters.fill_forward_blocks. Their contents - # consolidate into one period_data field (plus any READARRAY + # consolidate into one stress_period_data field (plus any READARRAY # fields), which assumes at most one such block per component. _fill_forward_blocks = filters.fill_forward_blocks(component) if len(_fill_forward_blocks) > 1: @@ -1726,7 +1695,7 @@ def _add_list_items(lf: ListField, class_name: str) -> str: continue if block_name in _fill_forward_blocks and filters.is_list_field(f): - _period_item = _add_list_items(f, "PeriodData") + _period_item = _add_list_items(f, "StressPeriodData") continue # G-variant packages (CHDG, DRNG, WELG, RCHA …) declare period arrays @@ -1744,14 +1713,12 @@ def _add_list_items(lf: ListField, class_name: str) -> str: if block_name in _fill_forward_blocks and filters.is_scalar(f): item_classes.append( ItemClassSpec( - class_name="PeriodData", + class_name="StressPeriodData", keyword="", - schema=[ - filters.attr_column("period_data", "str", "string", {}, optional=False) - ], + schema=[filters.attr_column(f.name, "str", "string", {}, optional=False)], ) ) - _period_item = "PeriodData" + _period_item = "StressPeriodData" continue # maxbound: emitted as a computed property (see computed_field_specs @@ -1951,10 +1918,12 @@ def _add_list_items(lf: ListField, class_name: str) -> str: _spd_meta["dim_required"] = True period_specs.append( FieldSpec( - dfn_name="_period_data", - py_name="_period_data", + dfn_name="_stress_period_data", + py_name="_stress_period_data", type_annotation=f"Optional[dict[int, list[{_period_item}]]]", - spec_call=_ml_field("list_", alias="period_data", repr_=False, metadata=_spd_meta), + spec_call=_ml_field( + "list_", alias="stress_period_data", repr_=False, metadata=_spd_meta + ), generatable=True, ) ) @@ -2123,7 +2092,7 @@ def _block_index(fs: FieldSpec) -> int: ) computed_field_specs = ( - [ComputedFieldSpec(py_name="maxbound", source_field="period_data")] + [ComputedFieldSpec(py_name="maxbound", source_field="stress_period_data")] if _maxbound_is_computed else [] ) diff --git a/flopy4/mf6/utl/spc.py b/flopy4/mf6/utl/spc.py index fa198fee9..5bac7af82 100644 --- a/flopy4/mf6/utl/spc.py +++ b/flopy4/mf6/utl/spc.py @@ -19,7 +19,7 @@ class Spc(Package): multi_package: ClassVar[bool] = True legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "perioddata": Legacy("period_data"), + "perioddata": Legacy("stress_period_data"), } @attrs.define @@ -33,7 +33,7 @@ class Temperature(Item): temperature: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): bndno: int = integer(index=True, pk=True, key="bound", rule="ssm_package") spcsetting: "Spc.Concentration | Spc.Temperature" = union() @@ -51,8 +51,8 @@ class PeriodData(Item): block="dimensions", longname="maximum number of ssm entries", ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -64,4 +64,4 @@ class PeriodData(Item): SpcConcentration = Spc.Concentration SpcTemperature = Spc.Temperature -SpcPeriodData = Spc.PeriodData +SpcStressPeriodData = Spc.StressPeriodData diff --git a/flopy4/mf6/utl/tvk.py b/flopy4/mf6/utl/tvk.py index b7f1e1554..afbd1a166 100644 --- a/flopy4/mf6/utl/tvk.py +++ b/flopy4/mf6/utl/tvk.py @@ -17,7 +17,7 @@ class Tvk(Package): ftype: ClassVar[str] = "TVK6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "perioddata": Legacy("period_data"), + "perioddata": Legacy("stress_period_data"), } @attrs.define @@ -36,7 +36,7 @@ class K33(Item): k33: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() tvksetting: "Tvk.K | Tvk.K22 | Tvk.K33" = union() @@ -49,8 +49,8 @@ class PeriodData(Item): ts: list[Ts] = child( block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -61,4 +61,4 @@ class PeriodData(Item): TvkK = Tvk.K TvkK22 = Tvk.K22 TvkK33 = Tvk.K33 -TvkPeriodData = Tvk.PeriodData +TvkStressPeriodData = Tvk.StressPeriodData diff --git a/flopy4/mf6/utl/tvs.py b/flopy4/mf6/utl/tvs.py index 9dfec32a2..0f8eea195 100644 --- a/flopy4/mf6/utl/tvs.py +++ b/flopy4/mf6/utl/tvs.py @@ -17,7 +17,7 @@ class Tvs(Package): ftype: ClassVar[str] = "TVS6" legacy_kwargs: ClassVar[dict[str, Legacy]] = { - "perioddata": Legacy("period_data"), + "perioddata": Legacy("stress_period_data"), } @attrs.define @@ -31,7 +31,7 @@ class Sy(Item): sy: Union[float, TimeSeriesRef] = double(time_series=True) @attrs.define - class PeriodData(Item): + class StressPeriodData(Item): cellid: tuple[int, ...] = cellid_() tvssetting: "Tvs.Ss | Tvs.Sy" = union() @@ -50,8 +50,8 @@ class PeriodData(Item): ts: list[Ts] = child( block="options", keyword="ts6", direction="in", default=attrs.Factory(list) ) - _period_data: Optional[dict[int, list[PeriodData]]] = list_( - alias="period_data", + _stress_period_data: Optional[dict[int, list[StressPeriodData]]] = list_( + alias="stress_period_data", default=None, repr=False, block="period", @@ -61,4 +61,4 @@ class PeriodData(Item): TvsSs = Tvs.Ss TvsSy = Tvs.Sy -TvsPeriodData = Tvs.PeriodData +TvsStressPeriodData = Tvs.StressPeriodData diff --git a/flopy4/mf6/write_context.py b/flopy4/mf6/write_context.py index 85cd2f762..49fbae49e 100644 --- a/flopy4/mf6/write_context.py +++ b/flopy4/mf6/write_context.py @@ -35,7 +35,7 @@ ListKey = Union[str, tuple[str, int]] """A list's key in `WriteContext.lists`, relative to its component: a -field name (``period_data``), or ``(field, kper)`` for one period +field name (``stress_period_data``), or ``(field, kper)`` for one period of a period field (0-based, like the field's dict keys).""" diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1000_751x751].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1000_751x751].json index b13fafdcd..288b75938 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1000_751x751].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1000_751x751].json @@ -50,9 +50,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1550, 0] da39a3ee5e6b4b0d", "boundname": "9300 chars 55ff68349e9df81e", "cellid": "int64[1550, 3] 7bbd09270a3b4c9f", @@ -137,7 +137,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -208,25 +208,25 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] } @@ -252,9 +252,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1000_751x751_confined].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1000_751x751_confined].json index f91ec30e5..0d1975954 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1000_751x751_confined].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1000_751x751_confined].json @@ -50,9 +50,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1550, 0] da39a3ee5e6b4b0d", "boundname": "9300 chars 55ff68349e9df81e", "cellid": "int64[1550, 3] 7bbd09270a3b4c9f", @@ -137,7 +137,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -165,25 +165,25 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] } @@ -209,9 +209,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1001_Peterson].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1001_Peterson].json index 7fa578838..482ae513a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1001_Peterson].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1001_Peterson].json @@ -107,9 +107,9 @@ }, "simulation/v6/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[60, 0] da39a3ee5e6b4b0d", "boundname": "360 chars a355591c3fb117f6", "cellid": "int64[60, 3] a5c5d747a32ba267", @@ -153,9 +153,9 @@ }, "simulation/v6/drn-1": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1097, 0] da39a3ee5e6b4b0d", "boundname": "6582 chars fa500dc9d73f95c7", "cellid": "int64[1097, 3] e2e644db03a961ab", @@ -212,9 +212,9 @@ }, "simulation/v6/hfb": { "__type__": "Hfb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid1": "int64[69, 3] 73f773b75d22f522", "cellid2": "int64[69, 3] c83ae10d4b3f5f10", "hydchr": "float64[69] 817174715b073ca9", @@ -280,7 +280,7 @@ }, "simulation/v6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -356,9 +356,9 @@ }, "simulation/v6/sfr-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[41844] 23eca3b50f48cb49", "n": 41844, "sfrsetting": "1862071 chars ba918997812e943e" diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_dev].json index b94269810..6e572685d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_dev].json @@ -56,9 +56,9 @@ }, "simulation/Biscayne/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3536, 0] da39a3ee5e6b4b0d", "boundname": "21216 chars ca6cbcc81e1d47a7", "cellid": "int64[3536, 1] 0dee1e2119ebea66", @@ -100,7 +100,7 @@ }, "simulation/Biscayne/evt-1": { "__type__": "Evt", - "_period_data": "45890 chars 61b6c3c2eb907939", + "_stress_period_data": "46490 chars 34afe9cce5fb16d6", "boundnames": false, "dims": { "ncelldim": 1, @@ -155,7 +155,7 @@ }, "simulation/Biscayne/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -213,7 +213,7 @@ }, "simulation/Biscayne/rch-1": { "__type__": "Rch", - "_period_data": "13152 chars 2351e66775664cc4", + "_stress_period_data": "13488 chars 93cd309fc6823898", "boundnames": false, "dims": { "ncelldim": 1, @@ -230,7 +230,7 @@ }, "simulation/Biscayne/riv-1": { "__type__": "Riv", - "_period_data": "31290 chars 22e7ae2fc3c47b7f", + "_stress_period_data": "31890 chars 038fa56fb318e987", "boundnames": false, "dims": { "ncelldim": 1, @@ -265,7 +265,7 @@ }, "simulation/Biscayne/wel-1": { "__type__": "Wel", - "_period_data": "21290 chars 6633381ebff05460", + "_stress_period_data": "21890 chars 33bc58c23050b4d5", "boundnames": false, "dims": { "ncelldim": 1, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_dev].json index e94415992..5865fe51b 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_dev].json @@ -56,9 +56,9 @@ }, "simulation/Biscayne/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3536, 0] da39a3ee5e6b4b0d", "boundname": "21216 chars ca6cbcc81e1d47a7", "cellid": "int64[3536, 2] 0bec98f2d78b71bb", @@ -181,7 +181,7 @@ }, "simulation/Biscayne/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -261,7 +261,7 @@ }, "simulation/Biscayne/riv-1": { "__type__": "Riv", - "_period_data": "31290 chars 210cbd048452ad0b", + "_stress_period_data": "31890 chars fe8e43a9bcc14554", "boundnames": false, "dims": { "ncelldim": 2, @@ -300,7 +300,7 @@ }, "simulation/Biscayne/wel-1": { "__type__": "Wel", - "_period_data": "21290 chars d840e67f9dec25cf", + "_stress_period_data": "21890 chars 62de59c04de82b92", "boundnames": false, "dims": { "ncelldim": 2, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_gnc_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_gnc_dev].json index 1fade9537..651d84e5a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_gnc_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_gnc_dev].json @@ -57,9 +57,9 @@ }, "simulation/Biscayne/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3536, 0] da39a3ee5e6b4b0d", "boundname": "21216 chars ca6cbcc81e1d47a7", "cellid": "int64[3536, 2] 0bec98f2d78b71bb", @@ -207,7 +207,7 @@ }, "simulation/Biscayne/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -287,7 +287,7 @@ }, "simulation/Biscayne/riv-1": { "__type__": "Riv", - "_period_data": "31290 chars 210cbd048452ad0b", + "_stress_period_data": "31890 chars fe8e43a9bcc14554", "boundnames": false, "dims": { "ncelldim": 2, @@ -326,7 +326,7 @@ }, "simulation/Biscayne/wel-1": { "__type__": "Wel", - "_period_data": "21290 chars d840e67f9dec25cf", + "_stress_period_data": "21890 chars 62de59c04de82b92", "boundnames": false, "dims": { "ncelldim": 2, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_gnc_nr_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_gnc_nr_dev].json index 0d10c140d..52faa21e3 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_gnc_nr_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_gnc_nr_dev].json @@ -61,9 +61,9 @@ }, "simulation/Biscayne/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3536, 0] da39a3ee5e6b4b0d", "boundname": "21216 chars ca6cbcc81e1d47a7", "cellid": "int64[3536, 2] 0bec98f2d78b71bb", @@ -212,7 +212,7 @@ }, "simulation/Biscayne/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -292,7 +292,7 @@ }, "simulation/Biscayne/riv-1": { "__type__": "Riv", - "_period_data": "31290 chars 210cbd048452ad0b", + "_stress_period_data": "31890 chars fe8e43a9bcc14554", "boundnames": false, "dims": { "ncelldim": 2, @@ -331,7 +331,7 @@ }, "simulation/Biscayne/wel-1": { "__type__": "Wel", - "_period_data": "21290 chars d840e67f9dec25cf", + "_stress_period_data": "21890 chars 62de59c04de82b92", "boundnames": false, "dims": { "ncelldim": 2, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_MD_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_MD_dev].json index e974f568c..e64c8b8b0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_MD_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_MD_dev].json @@ -60,9 +60,9 @@ }, "simulation/Biscayne/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3536, 0] da39a3ee5e6b4b0d", "boundname": "21216 chars ca6cbcc81e1d47a7", "cellid": "int64[3536, 2] 0bec98f2d78b71bb", @@ -186,7 +186,7 @@ }, "simulation/Biscayne/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -266,7 +266,7 @@ }, "simulation/Biscayne/riv-1": { "__type__": "Riv", - "_period_data": "31290 chars 210cbd048452ad0b", + "_stress_period_data": "31890 chars fe8e43a9bcc14554", "boundnames": false, "dims": { "ncelldim": 2, @@ -305,7 +305,7 @@ }, "simulation/Biscayne/wel-1": { "__type__": "Wel", - "_period_data": "21290 chars d840e67f9dec25cf", + "_stress_period_data": "21890 chars 62de59c04de82b92", "boundnames": false, "dims": { "ncelldim": 2, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_RCM_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_RCM_dev].json index c2e47093d..50f79cc7e 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_RCM_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_RCM_dev].json @@ -60,9 +60,9 @@ }, "simulation/Biscayne/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3536, 0] da39a3ee5e6b4b0d", "boundname": "21216 chars ca6cbcc81e1d47a7", "cellid": "int64[3536, 2] 0bec98f2d78b71bb", @@ -186,7 +186,7 @@ }, "simulation/Biscayne/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -266,7 +266,7 @@ }, "simulation/Biscayne/riv-1": { "__type__": "Riv", - "_period_data": "31290 chars 210cbd048452ad0b", + "_stress_period_data": "31890 chars fe8e43a9bcc14554", "boundnames": false, "dims": { "ncelldim": 2, @@ -305,7 +305,7 @@ }, "simulation/Biscayne/wel-1": { "__type__": "Wel", - "_period_data": "21290 chars d840e67f9dec25cf", + "_stress_period_data": "21890 chars 62de59c04de82b92", "boundnames": false, "dims": { "ncelldim": 2, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_dev].json index 9541acadc..59004448d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_disv_nr_dev].json @@ -60,9 +60,9 @@ }, "simulation/Biscayne/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3536, 0] da39a3ee5e6b4b0d", "boundname": "21216 chars ca6cbcc81e1d47a7", "cellid": "int64[3536, 2] 0bec98f2d78b71bb", @@ -186,7 +186,7 @@ }, "simulation/Biscayne/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -266,7 +266,7 @@ }, "simulation/Biscayne/riv-1": { "__type__": "Riv", - "_period_data": "31290 chars 210cbd048452ad0b", + "_stress_period_data": "31890 chars fe8e43a9bcc14554", "boundnames": false, "dims": { "ncelldim": 2, @@ -305,7 +305,7 @@ }, "simulation/Biscayne/wel-1": { "__type__": "Wel", - "_period_data": "21290 chars d840e67f9dec25cf", + "_stress_period_data": "21890 chars 62de59c04de82b92", "boundnames": false, "dims": { "ncelldim": 2, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_gnc_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_gnc_dev].json index f2a9d987d..5595f5027 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_gnc_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1002_biscqtg_gnc_dev].json @@ -57,9 +57,9 @@ }, "simulation/Biscayne/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3536, 0] da39a3ee5e6b4b0d", "boundname": "21216 chars ca6cbcc81e1d47a7", "cellid": "int64[3536, 1] 0dee1e2119ebea66", @@ -101,7 +101,7 @@ }, "simulation/Biscayne/evt-1": { "__type__": "Evt", - "_period_data": "45890 chars 61b6c3c2eb907939", + "_stress_period_data": "46490 chars 34afe9cce5fb16d6", "boundnames": false, "dims": { "ncelldim": 1, @@ -179,7 +179,7 @@ }, "simulation/Biscayne/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -237,7 +237,7 @@ }, "simulation/Biscayne/rch-1": { "__type__": "Rch", - "_period_data": "13152 chars 2351e66775664cc4", + "_stress_period_data": "13488 chars 93cd309fc6823898", "boundnames": false, "dims": { "ncelldim": 1, @@ -254,7 +254,7 @@ }, "simulation/Biscayne/riv-1": { "__type__": "Riv", - "_period_data": "31290 chars 22e7ae2fc3c47b7f", + "_stress_period_data": "31890 chars 038fa56fb318e987", "boundnames": false, "dims": { "ncelldim": 1, @@ -289,7 +289,7 @@ }, "simulation/Biscayne/wel-1": { "__type__": "Wel", - "_period_data": "21290 chars 6633381ebff05460", + "_stress_period_data": "21890 chars 33bc58c23050b4d5", "boundnames": false, "dims": { "ncelldim": 1, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1003_MNW2_Fig28].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1003_MNW2_Fig28].json index 856f24065..ad9387915 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1003_MNW2_Fig28].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1003_MNW2_Fig28].json @@ -55,9 +55,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -67,7 +67,7 @@ "n": 1 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[3] d3399b7262fb56cb", "mawsetting": [ { @@ -186,9 +186,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -343,7 +343,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Print", "n": 1, @@ -404,18 +404,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] } @@ -441,9 +441,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -455,7 +455,7 @@ "q": "float64[3] a8038e4c29722f09" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_lak_ss_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_lak_ss_dev].json index 25c5bdb62..13aecfdf2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_lak_ss_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_lak_ss_dev].json @@ -111,7 +111,7 @@ }, "simulation/mv/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Status", @@ -281,7 +281,7 @@ }, "simulation/mv/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -353,9 +353,9 @@ }, "simulation/mv/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[18, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -403,9 +403,9 @@ }, "simulation/mv/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -417,7 +417,7 @@ "q": "float64[3] d3399b7262fb56cb" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -429,7 +429,7 @@ "q": "float64[3] 1c7c6fbd21bec6b6" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_lak_tr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_lak_tr].json index 043ff5021..29fda79e6 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_lak_tr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_lak_tr].json @@ -112,7 +112,7 @@ }, "simulation/mv/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Status", @@ -250,7 +250,7 @@ }, "simulation/mv/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -360,9 +360,9 @@ }, "simulation/mv/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[18, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -410,18 +410,18 @@ }, "simulation/mv/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -447,9 +447,9 @@ }, "simulation/mv/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -461,7 +461,7 @@ "q": "float64[3] d3399b7262fb56cb" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -473,7 +473,7 @@ "q": "float64[3] 1c7c6fbd21bec6b6" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_laksfr_tr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_laksfr_tr].json index 73075ebbe..b1192a2a7 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_laksfr_tr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1004_mvlake_laksfr_tr].json @@ -112,7 +112,7 @@ }, "simulation/mv/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Status", @@ -250,7 +250,7 @@ }, "simulation/mv/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -502,18 +502,18 @@ }, "simulation/mv/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -539,9 +539,9 @@ }, "simulation/mv/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -553,7 +553,7 @@ "q": "float64[3] d3399b7262fb56cb" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -565,7 +565,7 @@ "q": "float64[3] 1c7c6fbd21bec6b6" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1005_secp].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1005_secp].json index d0c04d3cd..eab38e8b5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1005_secp].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1005_secp].json @@ -83,9 +83,9 @@ }, "simulation/secp_mf6/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[18647, 0] da39a3ee5e6b4b0d", "boundname": "111882 chars eb80721c5bf275a2", "cellid": "int64[18647, 3] 9507b757e241646e", @@ -206,7 +206,7 @@ }, "simulation/secp_mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -261,9 +261,9 @@ }, "simulation/secp_mf6/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1247, 3] b574388ed4a04355", "boundname": "7482 chars 490091b04528c227", "cellid": "int64[1247, 3] 9f28e95480964d0f", @@ -297,18 +297,18 @@ }, "simulation/secp_mf6/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -334,9 +334,9 @@ }, "simulation/secp_mf6/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3971, 1] adff3e571cba8978", "boundname": "23826 chars 65c82d916d7e6529", "cellid": "int64[3971, 3] a79b47298c4db3d9", @@ -344,7 +344,7 @@ "q": "float64[3971] adff3e571cba8978" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3971, 1] adff3e571cba8978", "boundname": "23826 chars 65c82d916d7e6529", "cellid": "int64[3971, 3] a79b47298c4db3d9", @@ -352,7 +352,7 @@ "q": "float64[3971] 5f2b88d36ae09a22" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3971, 1] adff3e571cba8978", "boundname": "23826 chars 65c82d916d7e6529", "cellid": "int64[3971, 3] a79b47298c4db3d9", @@ -360,7 +360,7 @@ "q": "float64[3971] c15c3ff19f6dc4c7" }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3971, 1] adff3e571cba8978", "boundname": "23826 chars 65c82d916d7e6529", "cellid": "int64[3971, 3] a79b47298c4db3d9", @@ -368,7 +368,7 @@ "q": "float64[3971] c1abc9fbb18a8b0a" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3971, 1] adff3e571cba8978", "boundname": "23826 chars 65c82d916d7e6529", "cellid": "int64[3971, 3] a79b47298c4db3d9", @@ -376,7 +376,7 @@ "q": "float64[3971] d0e614ba7232ef0f" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3971, 1] adff3e571cba8978", "boundname": "23826 chars 65c82d916d7e6529", "cellid": "int64[3971, 3] a79b47298c4db3d9", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1200_gwtbuy-goswami].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1200_gwtbuy-goswami].json index faf751fd9..bfd1d43c5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1200_gwtbuy-goswami].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1200_gwtbuy-goswami].json @@ -83,9 +83,9 @@ }, "simulation/gwf_goswami/chd-right": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[52, 1] 5bab75849b9d716b", "boundname": "312 chars ea6563a339f4c05b", "cellid": "int64[52, 3] 7afa8697c9a7b954", @@ -93,7 +93,7 @@ "n": 52 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[52, 1] 5bab75849b9d716b", "boundname": "312 chars ea6563a339f4c05b", "cellid": "int64[52, 3] 7afa8697c9a7b954", @@ -101,7 +101,7 @@ "n": 52 }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[52, 1] 5bab75849b9d716b", "boundname": "312 chars ea6563a339f4c05b", "cellid": "int64[52, 3] 7afa8697c9a7b954", @@ -146,9 +146,9 @@ }, "simulation/gwf_goswami/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[50, 2] 775fce7b484496ee", "bhead": "float64[50] 2cf50ec037feadf7", "boundname": "300 chars 8fc17e563e60ae10", @@ -222,7 +222,7 @@ }, "simulation/gwf_goswami/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -369,7 +369,7 @@ }, "simulation/gwt_goswami/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1201_gwtbuy-elderRa60].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1201_gwtbuy-elderRa60].json index ac44f7020..c987f36fb 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1201_gwtbuy-elderRa60].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest1201_gwtbuy-elderRa60].json @@ -142,7 +142,7 @@ }, "simulation/gwf_elder/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -296,9 +296,9 @@ }, "simulation/gwt_elder/cnc": { "__type__": "Cnc", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[176, 0] da39a3ee5e6b4b0d", "boundname": "1056 chars 8e496e98369d28cd", "cellid": "int64[176, 3] 1ef70eb90893c0e2", @@ -440,7 +440,7 @@ }, "simulation/gwt_elder/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest2001_gwtbuy-elderRa400].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest2001_gwtbuy-elderRa400].json index 15923881c..b9dc5d6d7 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest2001_gwtbuy-elderRa400].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6largetest2001_gwtbuy-elderRa400].json @@ -142,7 +142,7 @@ }, "simulation/gwf_elder/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -296,9 +296,9 @@ }, "simulation/gwt_elder/cnc": { "__type__": "Cnc", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[176, 0] da39a3ee5e6b4b0d", "boundname": "1056 chars 8e496e98369d28cd", "cellid": "int64[176, 3] 1ef70eb90893c0e2", @@ -440,7 +440,7 @@ }, "simulation/gwt_elder/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic].json index b552511b2..a6d0a4d83 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic].json @@ -47,9 +47,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -137,7 +137,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic_extlist].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic_extlist].json index 4f1b6a264..de2c5abad 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic_extlist].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic_extlist].json @@ -47,9 +47,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 1] dfa6a54f8be705d1", "boundname": [ null, @@ -142,7 +142,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic_tabs].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic_tabs].json index ceca924da..10ad13c23 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic_tabs].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001a_Tharmonic_tabs].json @@ -47,9 +47,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -137,7 +137,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001b_Tlogarithmic].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001b_Tlogarithmic].json index 09f4114d7..d043bbaaf 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001b_Tlogarithmic].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001b_Tlogarithmic].json @@ -47,9 +47,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001c_Tamtlmk].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001c_Tamtlmk].json index 6743c49c4..92268cc39 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001c_Tamtlmk].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001c_Tamtlmk].json @@ -47,9 +47,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001d_Tnewton].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001d_Tnewton].json index 451636f1f..5fe2bad5e 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001d_Tnewton].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001d_Tnewton].json @@ -51,9 +51,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -142,7 +142,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_Tnewton_2models].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_Tnewton_2models].json index 690bfd855..5b7032c5d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_Tnewton_2models].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_Tnewton_2models].json @@ -54,9 +54,9 @@ }, "simulation/Model_01/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -144,7 +144,7 @@ }, "simulation/Model_01/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -215,9 +215,9 @@ }, "simulation/Model_02/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -305,7 +305,7 @@ }, "simulation/Model_02/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_3layTS].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_3layTS].json index bbddb50e4..6359aa397 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_3layTS].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_3layTS].json @@ -55,9 +55,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -194,7 +194,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -233,18 +233,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -270,7 +270,7 @@ }, "simulation/GWF_1/uzf-1": { "__type__": "Uzf", - "_period_data": "6036 chars 31b90f600e257dda", + "_stress_period_data": "6048 chars 8216feaa0a7b8213", "auxiliary": [ "mult", "conc" diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_3lay].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_3lay].json index adbc61641..41a41de20 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_3lay].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_3lay].json @@ -55,9 +55,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -194,7 +194,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -233,18 +233,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -270,9 +270,9 @@ }, "simulation/GWF_1/uzf-1": { "__type__": "Uzf", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "extdp": "float64[16] 2c1785398a1f77e5", "extwc": "float64[16] 73767cdd81eaa9d2", @@ -285,7 +285,7 @@ "rootact": "float64[16] 0ae4f711ef5d6e9d" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "extdp": "float64[16] 2c1785398a1f77e5", "extwc": "float64[16] 73767cdd81eaa9d2", @@ -298,7 +298,7 @@ "rootact": "float64[16] 0ae4f711ef5d6e9d" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "extdp": "float64[16] 2c1785398a1f77e5", "extwc": "float64[16] 73767cdd81eaa9d2", @@ -311,7 +311,7 @@ "rootact": "float64[16] 0ae4f711ef5d6e9d" }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "extdp": "float64[16] 2c1785398a1f77e5", "extwc": "float64[16] 73767cdd81eaa9d2", @@ -324,7 +324,7 @@ "rootact": "float64[16] 0ae4f711ef5d6e9d" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "extdp": "float64[16] 2c1785398a1f77e5", "extwc": "float64[16] 73767cdd81eaa9d2", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_TS].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_TS].json index 209ade1c2..c53a1ccc0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_TS].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_TS].json @@ -55,9 +55,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -192,7 +192,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -231,18 +231,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -268,9 +268,9 @@ }, "simulation/GWF_1/uzf-1": { "__type__": "Uzf", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [ [ { @@ -436,7 +436,7 @@ } }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [ [ { diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_spring].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_spring].json index 76359bbc9..b2519e55e 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_spring].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_UZF_spring].json @@ -54,9 +54,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -146,7 +146,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -185,18 +185,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -222,9 +222,9 @@ }, "simulation/GWF_1/uzf-1": { "__type__": "Uzf", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[8, 0] da39a3ee5e6b4b0d", "extdp": "float64[8] c8d7d0ef0eedfa82", "extwc": "float64[8] c8d7d0ef0eedfa82", @@ -237,7 +237,7 @@ "rootact": "float64[8] c8d7d0ef0eedfa82" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[8, 0] da39a3ee5e6b4b0d", "extdp": "float64[8] c8d7d0ef0eedfa82", "extwc": "float64[8] c8d7d0ef0eedfa82", @@ -250,7 +250,7 @@ "rootact": "float64[8] c8d7d0ef0eedfa82" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[8, 0] da39a3ee5e6b4b0d", "extdp": "float64[8] c8d7d0ef0eedfa82", "extwc": "float64[8] c8d7d0ef0eedfa82", @@ -263,7 +263,7 @@ "rootact": "float64[8] c8d7d0ef0eedfa82" }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[8, 0] da39a3ee5e6b4b0d", "extdp": "float64[8] c8d7d0ef0eedfa82", "extwc": "float64[8] c8d7d0ef0eedfa82", @@ -276,7 +276,7 @@ "rootact": "float64[8] c8d7d0ef0eedfa82" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[8, 0] da39a3ee5e6b4b0d", "extdp": "float64[8] c8d7d0ef0eedfa82", "extwc": "float64[8] c8d7d0ef0eedfa82", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_noUZF_3lay].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_noUZF_3lay].json index 6eac153c9..87e2ec9c7 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_noUZF_3lay].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001e_noUZF_3lay].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -192,7 +192,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -241,18 +241,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb-xt3d-nwt].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb-xt3d-nwt].json index 3322aa4d3..7713d15c3 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb-xt3d-nwt].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb-xt3d-nwt].json @@ -52,9 +52,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -100,9 +100,9 @@ }, "simulation/flow15/hfb": { "__type__": "Hfb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid1": "int64[1, 3] ba09b3dfd9c42af8", "cellid2": "int64[1, 3] c3f3c4c60f34ba2f", "hydchr": "float64[1] 5cc8d0290382a92c", @@ -171,7 +171,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb-xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb-xt3d].json index 0e65975d1..034f3fce1 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb-xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb-xt3d].json @@ -48,9 +48,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -96,9 +96,9 @@ }, "simulation/flow15/hfb": { "__type__": "Hfb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid1": "int64[1, 3] ba09b3dfd9c42af8", "cellid2": "int64[1, 3] c3f3c4c60f34ba2f", "hydchr": "float64[1] 5cc8d0290382a92c", @@ -167,7 +167,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb].json index 75a848ed5..22cd45f02 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001f_hfb].json @@ -48,9 +48,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -96,9 +96,9 @@ }, "simulation/flow15/hfb": { "__type__": "Hfb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid1": "int64[1, 3] ba09b3dfd9c42af8", "cellid2": "int64[1, 3] c3f3c4c60f34ba2f", "hydchr": "float64[1] 5cc8d0290382a92c", @@ -163,7 +163,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001g_MVR].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001g_MVR].json index 5e888f771..1cb0d9b2c 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001g_MVR].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001g_MVR].json @@ -55,9 +55,9 @@ }, "simulation/flow15/MAW-FIRST": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[2] 031ee8071545c35f", "mawsetting": { "__table__": "Rate", @@ -121,9 +121,9 @@ }, "simulation/flow15/MAW-SECOND": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -185,9 +185,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -249,9 +249,9 @@ }, "simulation/flow15/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[2] 031ee8071545c35f", "id2": "int64[2] e129f27c5103bc5c", "mname1": [ @@ -335,7 +335,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001g_MVR_transient].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001g_MVR_transient].json index 136ec7ca8..efba0d1f5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001g_MVR_transient].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001g_MVR_transient].json @@ -51,9 +51,9 @@ }, "simulation/flow15/MAW-FIRST": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[2] 031ee8071545c35f", "mawsetting": { "__table__": "Rate", @@ -117,9 +117,9 @@ }, "simulation/flow15/MAW-SECOND": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -181,9 +181,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -245,9 +245,9 @@ }, "simulation/flow15/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[2] 031ee8071545c35f", "id2": "int64[2] e129f27c5103bc5c", "mname1": [ @@ -274,7 +274,7 @@ "value": "float64[2] 4ec4d22771b67a41" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": [], "id2": [], "mname1": [], @@ -286,7 +286,7 @@ "value": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[2] 031ee8071545c35f", "id2": "int64[2] e129f27c5103bc5c", "mname1": [ @@ -370,7 +370,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_drn_list4].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_drn_list4].json index 51c9f37ab..e7f550080 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_drn_list4].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_drn_list4].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -97,9 +97,9 @@ }, "simulation/flow15/drn-1": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 2] 295043d3fde81260", "boundname": [ null, @@ -149,7 +149,7 @@ "n": 10 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -158,7 +158,7 @@ "n": 0 }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 2] 1704336043bae9ad", "boundname": [ null, @@ -208,7 +208,7 @@ "n": 10 }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 2] 1704336043bae9ad", "boundname": [ null, @@ -333,7 +333,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array1].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array1].json index 3327f917f..d5f82a05e 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array1].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array1].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -176,7 +176,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array2].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array2].json index e74ba4ff1..c8118934c 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array2].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array2].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -177,7 +177,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array3].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array3].json index 45a647927..6aaebd9c9 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array3].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array3].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -205,7 +205,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array4].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array4].json index aed825452..df005cec2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array4].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_array4].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -255,7 +255,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list1].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list1].json index 608ec73b7..38d5fb13d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list1].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list1].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -97,9 +97,9 @@ }, "simulation/flow15/evt-1": { "__type__": "Evt", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, @@ -199,7 +199,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list2].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list2].json index 5c352dc8d..8173086d5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list2].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list2].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -97,9 +97,9 @@ }, "simulation/flow15/evt-1": { "__type__": "Evt", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, @@ -200,7 +200,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list3].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list3].json index a834d959e..cba1482c4 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list3].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list3].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -97,9 +97,9 @@ }, "simulation/flow15/evt-1": { "__type__": "Evt", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, @@ -149,7 +149,7 @@ "surface": "float64[10] 7880455745addd07" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -162,7 +162,7 @@ "surface": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, @@ -212,7 +212,7 @@ "surface": "float64[10] 7880455745addd07" }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, @@ -345,7 +345,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list4].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list4].json index f650617ae..bbc46433b 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list4].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_evt_list4].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -97,9 +97,9 @@ }, "simulation/flow15/evt-1": { "__type__": "Evt", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [ [ { @@ -210,7 +210,7 @@ "surface": "float64[10] 7880455745addd07" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -223,7 +223,7 @@ "surface": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [ [ { @@ -334,7 +334,7 @@ "surface": "float64[10] 7880455745addd07" }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] d1d742bd20720f18", "boundname": [ null, @@ -474,7 +474,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array1].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array1].json index cb1561dff..9ee865289 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array1].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array1].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array2].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array2].json index 421be3263..3af007f03 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array2].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array2].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array3].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array3].json index 379c08f22..1fd301fe2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array3].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array3].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array4].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array4].json index f270ea6a1..21020f4be 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array4].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_array4].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list1].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list1].json index 2c1f668a8..0eccd6883 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list1].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list1].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -178,9 +178,9 @@ }, "simulation/flow15/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list2].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list2].json index 4037dce42..52348b15b 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list2].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list2].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -178,9 +178,9 @@ }, "simulation/flow15/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list3].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list3].json index b0c39b4ef..0590baf74 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list3].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list3].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -178,9 +178,9 @@ }, "simulation/flow15/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, @@ -214,7 +214,7 @@ } }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -222,7 +222,7 @@ "recharge": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, @@ -256,7 +256,7 @@ } }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] 914861f62b20aea9", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list4].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list4].json index dfe25edb4..6bc4cb1b5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list4].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001h_rch_list4].json @@ -49,9 +49,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -139,7 +139,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -178,9 +178,9 @@ }, "simulation/flow15/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [ [ { @@ -275,7 +275,7 @@ } }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -283,7 +283,7 @@ "recharge": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [ [ { @@ -378,7 +378,7 @@ } }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 1] d1d742bd20720f18", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001i_gwf-gwf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001i_gwf-gwf].json index 4032c3786..bc4927ceb 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001i_gwf-gwf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001i_gwf-gwf].json @@ -66,9 +66,9 @@ }, "simulation/flow-l1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -156,7 +156,7 @@ }, "simulation/flow-l1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -280,7 +280,7 @@ }, "simulation/flow-l10/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -404,7 +404,7 @@ }, "simulation/flow-l2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -528,7 +528,7 @@ }, "simulation/flow-l3/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -652,7 +652,7 @@ }, "simulation/flow-l4/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -776,7 +776,7 @@ }, "simulation/flow-l5/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -900,7 +900,7 @@ }, "simulation/flow-l6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -1024,7 +1024,7 @@ }, "simulation/flow-l7/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -1148,7 +1148,7 @@ }, "simulation/flow-l8/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -1272,7 +1272,7 @@ }, "simulation/flow-l9/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001i_multilayer].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001i_multilayer].json index 4ed11071f..79d022acc 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001i_multilayer].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest001i_multilayer].json @@ -47,9 +47,9 @@ }, "simulation/flow15/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -137,7 +137,7 @@ }, "simulation/flow15/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs].json index 19192f2ff..2c82c0a97 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs].json @@ -48,9 +48,9 @@ }, "simulation/GWF_1/CHD_LEFT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -87,9 +87,9 @@ }, "simulation/GWF_1/CHD_RIGHT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -185,7 +185,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_disv].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_disv].json index abc1c7a83..15e2690e5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_disv].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_disv].json @@ -48,9 +48,9 @@ }, "simulation/GWF_1/CHD_LEFT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -86,9 +86,9 @@ }, "simulation/GWF_1/CHD_RIGHT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -200,7 +200,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_disv_xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_disv_xt3d].json index 36e151992..fa1f6cf67 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_disv_xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_disv_xt3d].json @@ -48,9 +48,9 @@ }, "simulation/GWF_1/CHD_LEFT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -86,9 +86,9 @@ }, "simulation/GWF_1/CHD_RIGHT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -201,7 +201,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_obs].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_obs].json index 19192f2ff..2c82c0a97 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_obs].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_obs].json @@ -48,9 +48,9 @@ }, "simulation/GWF_1/CHD_LEFT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -87,9 +87,9 @@ }, "simulation/GWF_1/CHD_RIGHT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -185,7 +185,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_reduced].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_reduced].json index 5b0001dfc..d08c99fac 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_reduced].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_reduced].json @@ -48,9 +48,9 @@ }, "simulation/GWF_1/CHD_LEFT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[28, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -105,9 +105,9 @@ }, "simulation/GWF_1/CHD_RIGHT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -224,7 +224,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_tr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_tr].json index 08b4ba04f..8fc2e1e55 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_tr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest003_gwfs_tr].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/CHD_LEFT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ "CHD_LEFT", @@ -138,9 +138,9 @@ }, "simulation/GWF_1/CHD_RIGHT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -236,7 +236,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -275,18 +275,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_bcfss].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_bcfss].json index cf89f4aa9..e688d31ee 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_bcfss].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_bcfss].json @@ -117,7 +117,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -199,9 +199,9 @@ }, "simulation/GWF_1/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -241,9 +241,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 3] 5d743b3a72f75e8e", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss].json index 3a0679b97..7e5f0cca5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss].json @@ -166,7 +166,7 @@ }, "simulation/test004_lpfss/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -232,9 +232,9 @@ }, "simulation/test004_lpfss/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -274,9 +274,9 @@ }, "simulation/test004_lpfss/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss_disv].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss_disv].json index 1db2382b4..e873fb092 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss_disv].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss_disv].json @@ -160,7 +160,7 @@ }, "simulation/t4_disv/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -224,9 +224,9 @@ }, "simulation/t4_disv/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -265,9 +265,9 @@ }, "simulation/t4_disv/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss_nr].json index 8a9c918f7..69364219b 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest004_lpfss_nr].json @@ -166,7 +166,7 @@ }, "simulation/test004_lpfss_nr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -232,9 +232,9 @@ }, "simulation/test004_lpfss_nr/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -274,9 +274,9 @@ }, "simulation/test004_lpfss_nr/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest005_advgw_tidal].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest005_advgw_tidal].json index 99933d21e..31a2a207f 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest005_advgw_tidal].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest005_advgw_tidal].json @@ -60,9 +60,9 @@ }, "simulation/GWF_1/EVT": { "__type__": "Evt", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[150, 0] da39a3ee5e6b4b0d", "boundname": "900 chars dadc720a94af07cd", "cellid": "int64[150, 3] 682f58cd913c7892", @@ -96,9 +96,9 @@ }, "simulation/GWF_1/GHB-TIDAL": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "bhead": { "__table__": "TimeSeriesRef", @@ -229,9 +229,9 @@ }, "simulation/GWF_1/RCH-ZONE_1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[84, 1] 2fd8c8204a745a8a", "boundname": "519 chars ef8d6e62e7fe88d5", "cellid": "int64[84, 3] e36a580a2cb5ecc8", @@ -299,9 +299,9 @@ }, "simulation/GWF_1/RCH-ZONE_2": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[20, 1] 9dc3ae7e6232a6ef", "boundname": [ null, @@ -411,9 +411,9 @@ }, "simulation/GWF_1/RCH-ZONE_3": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[54, 1] 83371e6a8740e19c", "boundname": "324 chars 8642ba1b5ea57b28", "cellid": "int64[54, 3] f96bb4e037db5c49", @@ -481,9 +481,9 @@ }, "simulation/GWF_1/RIV": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[20, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -688,9 +688,9 @@ }, "simulation/GWF_1/WEL": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 3] bf0885c47eb4ae12", "boundname": [ null, @@ -712,7 +712,7 @@ ] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 3] 5d743b3a72f75e8e", "boundname": [ "well_2", @@ -730,7 +730,7 @@ } }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[5, 3] 9975910ffde7e0ef", "boundname": [ "well_1", @@ -956,7 +956,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -1010,18 +1010,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models-XT3D].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models-XT3D].json index 0f23e8305..0680ff8d2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models-XT3D].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models-XT3D].json @@ -50,9 +50,9 @@ }, "simulation/GWF_Model_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -154,7 +154,7 @@ }, "simulation/GWF_Model_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -283,7 +283,7 @@ }, "simulation/GWF_Model_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models].json index ecb823dc3..0886f6580 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models].json @@ -50,9 +50,9 @@ }, "simulation/GWF_Model_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -154,7 +154,7 @@ }, "simulation/GWF_Model_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -279,7 +279,7 @@ }, "simulation/GWF_Model_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_gnc].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_gnc].json index 9feeced27..c2dd74a70 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_gnc].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_gnc].json @@ -50,9 +50,9 @@ }, "simulation/GWF_Model_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -154,7 +154,7 @@ }, "simulation/GWF_Model_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -281,7 +281,7 @@ }, "simulation/GWF_Model_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_mvr_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_mvr_dev].json index b00926ffb..d7362b1af 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_mvr_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_mvr_dev].json @@ -87,9 +87,9 @@ }, "simulation/CHILD/maw-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -178,7 +178,7 @@ }, "simulation/CHILD/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -251,9 +251,9 @@ }, "simulation/PARENT/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -328,9 +328,9 @@ }, "simulation/PARENT/maw-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -419,7 +419,7 @@ }, "simulation/PARENT/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -570,9 +570,9 @@ }, "simulation/gwfgwf-1/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[1] 05fe405753166f12", "id2": "int64[1] 05fe405753166f12", "mname1": [ diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf].json index 61d26b924..fd41b75cd 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf].json @@ -50,9 +50,9 @@ }, "simulation/GWF_Model_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -154,7 +154,7 @@ }, "simulation/GWF_Model_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -279,7 +279,7 @@ }, "simulation/GWF_Model_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_nr].json index e40d123c0..9a926ba35 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_nr].json @@ -54,9 +54,9 @@ }, "simulation/GWF_Model_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -158,7 +158,7 @@ }, "simulation/GWF_Model_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -287,7 +287,7 @@ }, "simulation/GWF_Model_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_nr_gnc].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_nr_gnc].json index d3653583b..6daa99657 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_nr_gnc].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_nr_gnc].json @@ -54,9 +54,9 @@ }, "simulation/GWF_Model_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -158,7 +158,7 @@ }, "simulation/GWF_Model_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -287,7 +287,7 @@ }, "simulation/GWF_Model_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_tr_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_tr_nr].json index cabc33273..abf4a8374 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_tr_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_2models_unconf_tr_nr].json @@ -55,9 +55,9 @@ }, "simulation/GWF_Model_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -159,7 +159,7 @@ }, "simulation/GWF_Model_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -310,7 +310,7 @@ }, "simulation/GWF_Model_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3].json index 1da4c04f5..7d7129de1 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -146,7 +146,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -182,9 +182,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv].json index a4667a2fd..cabe58b5b 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv].json @@ -51,9 +51,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -190,7 +190,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -228,9 +228,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_ext].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_ext].json index 7f9edd4d3..c599945a3 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_ext].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_ext].json @@ -50,9 +50,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -189,7 +189,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -227,9 +227,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_hani].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_hani].json index c8b052470..123a896ed 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_hani].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_hani].json @@ -50,9 +50,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -191,7 +191,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -229,9 +229,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2-3D_xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2-3D_xt3d].json index 889225b9c..b3008efde 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2-3D_xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2-3D_xt3d].json @@ -47,9 +47,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[508, 0] da39a3ee5e6b4b0d", "boundname": "3048 chars eca5009298f24b43", "cellid": "int64[508, 2] 36c721c11cf7639f", @@ -154,7 +154,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2].json index 39af49abd..6abaa25af 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2].json @@ -47,9 +47,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -161,7 +161,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2_xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2_xt3d].json index 8ce7dc81e..99303e13d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2_xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh2_xt3d].json @@ -47,9 +47,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -165,7 +165,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh].json index 10035cece..285d791e2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh].json @@ -50,9 +50,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -189,7 +189,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -227,9 +227,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh_xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh_xt3d].json index 766724c96..7c4989205 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh_xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_trimesh_xt3d].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -167,7 +167,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -205,9 +205,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_xt3d].json index da0eb38da..cea3c1dda 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_disv_xt3d].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -167,7 +167,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -205,9 +205,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_gnc].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_gnc].json index 9404f42f9..6b1d72df1 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_gnc].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_gnc].json @@ -48,9 +48,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -168,7 +168,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_gnc_nr_mfusg].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_gnc_nr_mfusg].json index 06db9a590..073d699ca 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_gnc_nr_mfusg].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_gnc_nr_mfusg].json @@ -52,9 +52,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -173,7 +173,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_nr_mfusg].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_nr_mfusg].json index d585b9abf..c6bb99b71 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_nr_mfusg].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_nr_mfusg].json @@ -51,9 +51,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -149,7 +149,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_tr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_tr].json index f31181040..e13d0f7fe 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_tr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_tr].json @@ -48,9 +48,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -145,7 +145,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_tr_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_tr_nr].json index 3a0fbbfb5..090f638cb 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_tr_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_tr_nr].json @@ -52,9 +52,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -149,7 +149,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_unconf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_unconf].json index 3524e17c2..da57134fc 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_unconf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006_gwf3_unconf].json @@ -47,9 +47,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -144,7 +144,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006a_gwf3_disv_thickstrt].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006a_gwf3_disv_thickstrt].json index aed319247..fdcadfdec 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006a_gwf3_disv_thickstrt].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest006a_gwf3_disv_thickstrt].json @@ -50,9 +50,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -189,7 +189,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -227,9 +227,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest007_75x75].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest007_75x75].json index 72bd05260..d270bede6 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest007_75x75].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest007_75x75].json @@ -80,9 +80,9 @@ }, "simulation/mf6/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[150, 0] da39a3ee5e6b4b0d", "boundname": "900 chars dadc720a94af07cd", "cellid": "int64[150, 3] 3d1f4ed1a4085831", @@ -169,7 +169,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -247,25 +247,25 @@ }, "simulation/mf6/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] } @@ -291,9 +291,9 @@ }, "simulation/mf6/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -303,7 +303,7 @@ "q": "float64[1] 05fe405753166f12" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest007_75x75_confined].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest007_75x75_confined].json index 5e04c0d74..57dc77145 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest007_75x75_confined].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest007_75x75_confined].json @@ -80,9 +80,9 @@ }, "simulation/mf6/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[150, 0] da39a3ee5e6b4b0d", "boundname": "900 chars dadc720a94af07cd", "cellid": "int64[150, 3] 3d1f4ed1a4085831", @@ -169,7 +169,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -247,25 +247,25 @@ }, "simulation/mf6/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] } @@ -291,9 +291,9 @@ }, "simulation/mf6/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -303,7 +303,7 @@ "q": "float64[1] 05fe405753166f12" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest009_3lay-disu].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest009_3lay-disu].json index d0d8d7a6e..0aa9128d1 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest009_3lay-disu].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest009_3lay-disu].json @@ -48,9 +48,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[48, 0] da39a3ee5e6b4b0d", "boundname": "288 chars eeed6a4a7f08cb7b", "cellid": "int64[48, 1] 5f725679ad97a89c", @@ -153,7 +153,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest011_mflgr_ex3].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest011_mflgr_ex3].json index 2208dca07..150925862 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest011_mflgr_ex3].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest011_mflgr_ex3].json @@ -112,7 +112,7 @@ }, "simulation/CHILD/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -151,9 +151,9 @@ }, "simulation/CHILD/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[89, 3] 3aca41a086c76933", "boundname": "534 chars fcb3d31bc76b1a7d", "cellid": "int64[89, 3] 268fd0216b575b0e", @@ -218,9 +218,9 @@ }, "simulation/PARENT/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[45, 0] da39a3ee5e6b4b0d", "boundname": "270 chars 03a0378c149a4d8b", "cellid": "int64[45, 3] 7ad911d6fdea24d5", @@ -246,9 +246,9 @@ }, "simulation/PARENT/chd-2": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[45, 0] da39a3ee5e6b4b0d", "boundname": "270 chars 03a0378c149a4d8b", "cellid": "int64[45, 3] 4f0b4b59304c3e0d", @@ -335,7 +335,7 @@ }, "simulation/PARENT/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -374,9 +374,9 @@ }, "simulation/PARENT/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[18, 3] 7a7357510f064f2c", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest011_mflgr_ex3_sfr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest011_mflgr_ex3_sfr].json index 32933f341..8702346bb 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest011_mflgr_ex3_sfr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest011_mflgr_ex3_sfr].json @@ -110,7 +110,7 @@ }, "simulation/CHILD/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -149,9 +149,9 @@ }, "simulation/CHILD/sfr-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[356] 4481f2a9b17c7e7b", "n": 356, "sfrsetting": "15842 chars 09dd39bbfa1d7e84" @@ -235,9 +235,9 @@ }, "simulation/PARENT/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[45, 0] da39a3ee5e6b4b0d", "boundname": "270 chars 03a0378c149a4d8b", "cellid": "int64[45, 3] 7ad911d6fdea24d5", @@ -263,9 +263,9 @@ }, "simulation/PARENT/chd-2": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[45, 0] da39a3ee5e6b4b0d", "boundname": "270 chars 03a0378c149a4d8b", "cellid": "int64[45, 3] 4f0b4b59304c3e0d", @@ -352,7 +352,7 @@ }, "simulation/PARENT/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -391,9 +391,9 @@ }, "simulation/PARENT/sfr-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[72] 7feb4a81a73fc62e", "n": 72, "sfrsetting": [ @@ -802,9 +802,9 @@ }, "simulation/gwfgwf-1/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[2] 1881cda810558dfe", "id2": "int64[2] e88d9e1ac6adb38b", "mname1": [ diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest012_WaterTable].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest012_WaterTable].json index 6cec7f9a7..e81b7c89e 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest012_WaterTable].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest012_WaterTable].json @@ -69,9 +69,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] a02d33ee88a12d2f", "boundname": [ @@ -145,7 +145,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest013_Zaidel].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest013_Zaidel].json index 76ab17fa7..f6e31182c 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest013_Zaidel].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest013_Zaidel].json @@ -52,9 +52,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -143,7 +143,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3High].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3High].json index f2c054eb9..f4c52e10d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3High].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3High].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -144,7 +144,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3High_mfusg].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3High_mfusg].json index aa79e93f6..3c175e2d0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3High_mfusg].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3High_mfusg].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -145,7 +145,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low].json index f1239f165..8299e4960 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -144,7 +144,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_MAW].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_MAW].json index 1fc78bfa9..14b65af11 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_MAW].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_MAW].json @@ -55,9 +55,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -119,9 +119,9 @@ }, "simulation/GWF_1/maw-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -210,7 +210,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_MD_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_MD_dev].json index 9e289971a..b68c5a6ca 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_MD_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_MD_dev].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -144,7 +144,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_RCM_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_RCM_dev].json index 397baaa41..50d3a1f48 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_RCM_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_RCM_dev].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -144,7 +144,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_dev].json index 1ed56d292..ea22db328 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest014_NWTP3Low_dev].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -145,7 +145,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike-xt3d-rhs].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike-xt3d-rhs].json index fc40e0bfc..13952d94c 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike-xt3d-rhs].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike-xt3d-rhs].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -148,7 +148,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -187,9 +187,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike-xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike-xt3d].json index d20773368..4406d9d82 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike-xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike-xt3d].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -148,7 +148,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -187,9 +187,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike].json index d77e6872f..e4f2802fa 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -144,7 +144,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -183,9 +183,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike_disu].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike_disu].json index e41b80fdb..0421d6de0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike_disu].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike_disu].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -137,7 +137,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -173,9 +173,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike_disu_mfusg].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike_disu_mfusg].json index d9c673a1c..d8eab22ed 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike_disu_mfusg].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest015_KeatingLike_disu_mfusg].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -138,7 +138,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -174,9 +174,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating].json index 3880e7d48..beca11ccf 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[36, 0] da39a3ee5e6b4b0d", "boundname": "216 chars 36ca99dfb649a830", "cellid": "int64[36, 3] d027636cef698803", @@ -140,7 +140,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -179,9 +179,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[24, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_dev].json index 9528a6f9f..cd85281cf 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_dev].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[36, 0] da39a3ee5e6b4b0d", "boundname": "216 chars 36ca99dfb649a830", "cellid": "int64[36, 3] d027636cef698803", @@ -140,7 +140,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -179,9 +179,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[24, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_250].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_250].json index 476cc0d59..8d0bae0ce 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_250].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_250].json @@ -91,9 +91,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[5, 0] da39a3ee5e6b4b0d", "bhead": "float64[5] 04d99f5c20e110c6", "boundname": [ @@ -187,7 +187,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -224,9 +224,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_250_xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_250_xt3d].json index f042596f3..b56cd14f5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_250_xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_250_xt3d].json @@ -90,9 +90,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[5, 0] da39a3ee5e6b4b0d", "bhead": "float64[5] 04d99f5c20e110c6", "boundname": [ @@ -166,7 +166,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -203,9 +203,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_mfusg].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_mfusg].json index f98ab145f..1a51508e7 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_mfusg].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest016_Keating_disu_mfusg].json @@ -90,9 +90,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[36, 0] da39a3ee5e6b4b0d", "bhead": "float64[36] a47b33a0a40b8ec6", "boundname": "216 chars 36ca99dfb649a830", @@ -181,7 +181,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -218,9 +218,9 @@ }, "simulation/GWF_1/rch-1": { "__type__": "Rch", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[24, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest017_Crinkle].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest017_Crinkle].json index 0e21e09c3..6c36918fb 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest017_Crinkle].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest017_Crinkle].json @@ -56,9 +56,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3200, 0] da39a3ee5e6b4b0d", "boundname": "19200 chars 0a9f4efbdf1ce5f2", "cellid": "int64[3200, 3] 2807ca864e1cfcd5", @@ -101,9 +101,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[6, 0] da39a3ee5e6b4b0d", "bhead": "float64[6] ff666475915064b0", "boundname": [ @@ -181,7 +181,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -252,18 +252,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenGC].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenGC].json index a7a9977c7..798e3aef0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenGC].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenGC].json @@ -109,7 +109,7 @@ }, "simulation/PARENT/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -171,9 +171,9 @@ }, "simulation/PARENT/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[73, 0] da39a3ee5e6b4b0d", "boundname": "438 chars 38547e528b263050", "cellid": "int64[73, 3] e8b3101e32b883ba", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenGF].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenGF].json index dc82aa373..9ebcd7e11 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenGF].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenGF].json @@ -109,7 +109,7 @@ }, "simulation/PARENT/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -171,9 +171,9 @@ }, "simulation/PARENT/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[217, 0] da39a3ee5e6b4b0d", "boundname": "1302 chars 8969c8b27616c96b", "cellid": "int64[217, 3] 92fddd098008a7bb", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenLGR].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenLGR].json index 44119b936..d59b77c0f 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenLGR].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenLGR].json @@ -114,7 +114,7 @@ }, "simulation/CHILD/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -176,9 +176,9 @@ }, "simulation/CHILD/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[123, 0] da39a3ee5e6b4b0d", "boundname": "738 chars 8761383b60507b8d", "cellid": "int64[123, 3] 33bb7ac35b491921", @@ -298,7 +298,7 @@ }, "simulation/PARENT/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -360,9 +360,9 @@ }, "simulation/PARENT/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[33, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenLGR_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenLGR_nr].json index f4c2326c8..9a4b67cc9 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenLGR_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest019_VilhelmsenLGR_nr].json @@ -91,9 +91,9 @@ }, "simulation/CHILD/maw-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[3] ab2fa50ae23ce035", "mawsetting": { "__table__": "Rate", @@ -186,7 +186,7 @@ }, "simulation/CHILD/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -248,9 +248,9 @@ }, "simulation/CHILD/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[123, 0] da39a3ee5e6b4b0d", "boundname": "738 chars 8761383b60507b8d", "cellid": "int64[123, 3] 33bb7ac35b491921", @@ -350,9 +350,9 @@ }, "simulation/PARENT/maw-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[4] 13a5b0f4ed6a1037", "mawsetting": [ { @@ -431,9 +431,9 @@ }, "simulation/PARENT/maw-2": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -522,7 +522,7 @@ }, "simulation/PARENT/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -584,9 +584,9 @@ }, "simulation/PARENT/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[33, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NT_EI].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NT_EI].json index 96c239b24..b566960ce 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NT_EI].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NT_EI].json @@ -55,9 +55,9 @@ }, "simulation/GWF_1/MAW-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -67,7 +67,7 @@ "n": 1 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -193,9 +193,9 @@ }, "simulation/GWF_1/MAW-2": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Status", @@ -207,7 +207,7 @@ "n": 1 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Status", @@ -360,9 +360,9 @@ }, "simulation/GWF_1/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[1] 05fe405753166f12", "id2": "int64[1] 05fe405753166f12", "mname1": [ @@ -493,7 +493,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransientTS2].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransientTS2].json index 95176b344..4e83a57c0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransientTS2].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransientTS2].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[6] 09bbad0f697a2e15", "mawsetting": [ { @@ -108,7 +108,7 @@ "n": 6 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 3da89ee273be1343", "mawsetting": { "__table__": "Rate", @@ -124,7 +124,7 @@ "n": 1 }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[2] 031ee8071545c35f", "mawsetting": { "__table__": "Rate", @@ -484,7 +484,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransientTS].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransientTS].json index 214bf3fb7..d17ab8ff8 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransientTS].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransientTS].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -71,7 +71,7 @@ "n": 1 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[3] d3399b7262fb56cb", "mawsetting": [ { @@ -98,7 +98,7 @@ "n": 3 }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -387,7 +387,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient].json index 2ec4e3f1a..7c9ab81de 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -389,7 +389,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_aniso].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_aniso].json index c65c2dbb6..69ef7187f 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_aniso].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_aniso].json @@ -83,9 +83,9 @@ }, "simulation/mf6/MAW_1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -209,7 +209,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_constantMAW].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_constantMAW].json index d10d66e6b..73c4c9e85 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_constantMAW].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_constantMAW].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Status", @@ -359,7 +359,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_cumcond].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_cumcond].json index 74a8ce6e2..5de093d57 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_cumcond].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_cumcond].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -300,7 +300,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_cumcond_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_cumcond_dev].json index 74a8ce6e2..5de093d57 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_cumcond_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_cumcond_dev].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -300,7 +300,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_thickstrt].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_thickstrt].json index b7f1db718..fd8fb1a77 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_thickstrt].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_NevilleTonkinTransient_thickstrt].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -300,7 +300,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_mawconfined].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_mawconfined].json index ddb0c7741..5144fd63a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_mawconfined].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_mawconfined].json @@ -78,9 +78,9 @@ }, "simulation/mawconf/MAW_1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -207,7 +207,7 @@ }, "simulation/mawconf/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_mawconfined_openclose].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_mawconfined_openclose].json index ddb0c7741..5144fd63a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_mawconfined_openclose].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest020_mawconfined_openclose].json @@ -78,9 +78,9 @@ }, "simulation/mawconf/MAW_1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -207,7 +207,7 @@ }, "simulation/mawconf/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest021_twri].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest021_twri].json index 31b1e5452..eaf2ec9c0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest021_twri].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest021_twri].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -128,9 +128,9 @@ }, "simulation/GWF_1/drn-1": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[9, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -215,7 +215,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -269,9 +269,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[15, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest023_FlowingWell].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest023_FlowingWell].json index 2d6fe8a01..11f734e50 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest023_FlowingWell].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest023_FlowingWell].json @@ -53,9 +53,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[2] e129f27c5103bc5c", "mawsetting": [ { @@ -340,7 +340,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest024_Reilly].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest024_Reilly].json index c45d7b174..2d28ac4f7 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest024_Reilly].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest024_Reilly].json @@ -56,9 +56,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -200,9 +200,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1312, 0] da39a3ee5e6b4b0d", "boundname": "7872 chars 12dedcbf3fab4584", "cellid": "int64[1312, 3] cbdf645579523178", @@ -365,7 +365,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest024_Reilly_ext].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest024_Reilly_ext].json index de12a0b29..81a0cbd9a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest024_Reilly_ext].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest024_Reilly_ext].json @@ -56,9 +56,9 @@ }, "simulation/GWF_1/MAW-NT_Well": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "mawsetting": { "__table__": "Rate", @@ -200,9 +200,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1312, 0] da39a3ee5e6b4b0d", "boundname": "7872 chars 12dedcbf3fab4584", "cellid": "int64[1312, 3] cbdf645579523178", @@ -365,7 +365,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_ConstantCV].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_ConstantCV].json index af1184389..d45b002b9 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_ConstantCV].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_ConstantCV].json @@ -114,7 +114,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -174,9 +174,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -186,7 +186,7 @@ "q": "float64[1] 7a2f901f23c2c8ca" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_ConstantCV_perched].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_ConstantCV_perched].json index b4f00d65c..197212aa3 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_ConstantCV_perched].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_ConstantCV_perched].json @@ -114,7 +114,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -174,9 +174,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -186,7 +186,7 @@ "q": "float64[1] 7a2f901f23c2c8ca" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_VariableCV].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_VariableCV].json index b6ec9f469..8f1a2198c 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_VariableCV].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_VariableCV].json @@ -118,7 +118,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -178,9 +178,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -190,7 +190,7 @@ "q": "float64[1] 7a2f901f23c2c8ca" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_Vertically_Staggered].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_Vertically_Staggered].json index e92f0cea1..ff93e59d6 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_Vertically_Staggered].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest025_Vertically_Staggered].json @@ -51,9 +51,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -136,7 +136,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest026_WellReduction].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest026_WellReduction].json index d4ca47c31..1268225a7 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest026_WellReduction].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest026_WellReduction].json @@ -157,7 +157,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -221,9 +221,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ "well1" diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest027_TimeseriesTest].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest027_TimeseriesTest].json index 052a57c60..e6d86029f 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest027_TimeseriesTest].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest027_TimeseriesTest].json @@ -71,9 +71,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[102, 0] da39a3ee5e6b4b0d", "bhead": { "__table__": "TimeSeriesRef", @@ -237,7 +237,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -346,18 +346,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] } @@ -383,9 +383,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 3] 13fe6b83ce302f3b", "boundname": [ "well_1" @@ -401,7 +401,7 @@ } }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 3] c59d523d209b4ac5", "boundname": [ "well_1" @@ -411,7 +411,7 @@ "q": "float64[1] 638942eb5136433e" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 3] f4808ad5793e72bc", "boundname": [ "well_1" diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest027_TimeseriesTest_idomain].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest027_TimeseriesTest_idomain].json index ff9242435..81dfc622e 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest027_TimeseriesTest_idomain].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest027_TimeseriesTest_idomain].json @@ -71,9 +71,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[102, 0] da39a3ee5e6b4b0d", "bhead": { "__table__": "TimeSeriesRef", @@ -237,7 +237,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -346,18 +346,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] } @@ -383,9 +383,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 3] 13fe6b83ce302f3b", "boundname": [ "well_1" @@ -401,7 +401,7 @@ } }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 3] c59d523d209b4ac5", "boundname": [ "well_1" @@ -411,7 +411,7 @@ "q": "float64[1] 638942eb5136433e" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 3] f4808ad5793e72bc", "boundname": [ "well_1" diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr].json index ee59aa643..b7a2ffe37 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr].json @@ -140,9 +140,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -216,7 +216,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -290,9 +290,9 @@ }, "simulation/GWF_1/sfr-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[4] b3027245114724b2", "n": 4, "sfrsetting": [ @@ -542,9 +542,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ "w01", @@ -563,7 +563,7 @@ "q": "float64[10] 0ff76dfb0237f562" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_mvr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_mvr].json index 6d7a7fef4..035c88e1e 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_mvr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_mvr].json @@ -57,9 +57,9 @@ }, "simulation/GWF_1/SFR-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[4] b3027245114724b2", "n": 4, "sfrsetting": [ @@ -194,9 +194,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -243,9 +243,9 @@ }, "simulation/GWF_1/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[1] 3da89ee273be1343", "id2": "int64[1] b0aa4b549f325cca", "mname1": [ @@ -322,7 +322,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -417,9 +417,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ "w01", @@ -438,7 +438,7 @@ "q": "float64[10] 0ff76dfb0237f562" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_mvr_openclose].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_mvr_openclose].json index 7313fbb1b..311b635d8 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_mvr_openclose].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_mvr_openclose].json @@ -57,9 +57,9 @@ }, "simulation/GWF_1/SFR-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[4] b3027245114724b2", "n": 4, "sfrsetting": [ @@ -187,9 +187,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -236,9 +236,9 @@ }, "simulation/GWF_1/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[1] 3da89ee273be1343", "id2": "int64[1] b0aa4b549f325cca", "mname1": [ @@ -315,7 +315,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -401,9 +401,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ "w01", @@ -422,7 +422,7 @@ "q": "float64[10] 0ff76dfb0237f562" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet].json index 406a4591a..463ca9554 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet].json @@ -78,9 +78,9 @@ }, "simulation/mf6/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "n": 1, "sfrsetting": { @@ -296,7 +296,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_drain].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_drain].json index d847a1a4e..396cf21a5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_drain].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_drain].json @@ -79,9 +79,9 @@ }, "simulation/mf6/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "n": 1, "sfrsetting": { @@ -91,7 +91,7 @@ } }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[21] 00eef150977c3560", "n": 21, "sfrsetting": { @@ -127,7 +127,7 @@ } }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[22] 6f683556bd9b0bb8", "n": 22, "sfrsetting": [ @@ -608,7 +608,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_nr].json index e2afcfa42..8012b8bc4 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_nr].json @@ -83,9 +83,9 @@ }, "simulation/mf6/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "n": 1, "sfrsetting": { @@ -354,7 +354,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_simple].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_simple].json index 770d7060f..552fead2b 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_simple].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_rewet_simple].json @@ -79,9 +79,9 @@ }, "simulation/mf6/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[43] 943aaef14a256960", "n": 43, "sfrsetting": [ @@ -524,7 +524,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_simple].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_simple].json index 7172337ef..9f88bbb4c 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_simple].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest028_sfr_simple].json @@ -86,9 +86,9 @@ }, "simulation/mf6/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[16] 53adecf90f64da2c", "n": 16, "sfrsetting": [ @@ -333,9 +333,9 @@ }, "simulation/mf6/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -412,7 +412,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -551,9 +551,9 @@ }, "simulation/mf6/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -572,7 +572,7 @@ "q": "float64[10] 0ff76dfb0237f562" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgr_parentchild].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgr_parentchild].json index 856c2ffbb..d751fd362 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgr_parentchild].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgr_parentchild].json @@ -115,7 +115,7 @@ }, "simulation/CHILD/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -164,9 +164,9 @@ }, "simulation/CHILD/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -227,9 +227,9 @@ }, "simulation/PARENT/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] db426ed1eadf6437", @@ -320,7 +320,7 @@ }, "simulation/PARENT/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parent].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parent].json index 3626ec014..b2d7d062f 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parent].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parent].json @@ -51,9 +51,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] ee1787ddd2f53bba", @@ -140,7 +140,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -182,9 +182,9 @@ }, "simulation/GWF_1/sfr-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "n": 1, "sfrsetting": { @@ -240,9 +240,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ "w01", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parent_hole].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parent_hole].json index 18f43c7b9..006d4f347 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parent_hole].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parent_hole].json @@ -81,9 +81,9 @@ }, "simulation/sfr_hole/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[432] f3f619d195a30a00", "n": 432, "sfrsetting": "19224 chars c844420adf1bbfa4" @@ -137,9 +137,9 @@ }, "simulation/sfr_hole/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] ee1787ddd2f53bba", @@ -230,7 +230,7 @@ }, "simulation/sfr_hole/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -279,9 +279,9 @@ }, "simulation/sfr_hole/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parentchild].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parentchild].json index abccfa8e4..cdc97adb8 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parentchild].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest029_lgrsfr_parentchild].json @@ -53,9 +53,9 @@ }, "simulation/CHILD/SFR-2": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[576] 72550c40ffe3b113", "n": 576, "sfrsetting": "25632 chars 72e2c73a748cae8b" @@ -172,7 +172,7 @@ }, "simulation/CHILD/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -221,9 +221,9 @@ }, "simulation/CHILD/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -286,9 +286,9 @@ }, "simulation/PARENT/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] db426ed1eadf6437", @@ -314,9 +314,9 @@ }, "simulation/PARENT/SFR-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[368] 9aa67ed187999a63", "n": 368, "sfrsetting": "16376 chars 5cdd7822b74a0ac7" @@ -434,7 +434,7 @@ }, "simulation/PARENT/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -551,9 +551,9 @@ }, "simulation/gwfgwf-1/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[2] 2c6f66e485b0c718", "id2": "int64[2] 6b5875fcf6a7864c", "mname1": [ diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_col].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_col].json index 86b2fa11d..accb25476 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_col].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_col].json @@ -49,9 +49,9 @@ }, "simulation/GWF/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 3] 9888aa62db6f21e5", @@ -137,7 +137,7 @@ }, "simulation/GWF/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -176,9 +176,9 @@ }, "simulation/GWF/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_col_disu].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_col_disu].json index 9ddfba092..602a2f9ee 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_col_disu].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_col_disu].json @@ -49,9 +49,9 @@ }, "simulation/GWF/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 1] 2b01ae9a79721bba", @@ -132,7 +132,7 @@ }, "simulation/GWF/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -168,9 +168,9 @@ }, "simulation/GWF/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_row].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_row].json index 02cb05031..0715c3266 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_row].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_row].json @@ -49,9 +49,9 @@ }, "simulation/GWF/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 3] 9888aa62db6f21e5", @@ -137,7 +137,7 @@ }, "simulation/GWF/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -176,9 +176,9 @@ }, "simulation/GWF/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_row_disu].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_row_disu].json index 42f8d80f7..d958eaf05 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_row_disu].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_row_disu].json @@ -49,9 +49,9 @@ }, "simulation/GWF/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 1] 2b01ae9a79721bba", @@ -132,7 +132,7 @@ }, "simulation/GWF/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -168,9 +168,9 @@ }, "simulation/GWF/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_xt3d].json index 25ea89e01..4b696d1df 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_xt3d].json @@ -49,9 +49,9 @@ }, "simulation/GWF/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 3] 9888aa62db6f21e5", @@ -142,7 +142,7 @@ }, "simulation/GWF/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -181,9 +181,9 @@ }, "simulation/GWF/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_xt3d_disu].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_xt3d_disu].json index 371a8393e..04756050d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_xt3d_disu].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest030_hani_xt3d_disu].json @@ -49,9 +49,9 @@ }, "simulation/GWF/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 1] 2b01ae9a79721bba", @@ -157,7 +157,7 @@ }, "simulation/GWF/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -194,9 +194,9 @@ }, "simulation/GWF/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest031_many_gwf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest031_many_gwf].json index e7fc05c8e..76100b762 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest031_many_gwf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest031_many_gwf].json @@ -55,9 +55,9 @@ }, "simulation/GWF1_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] 60d7686f3b7ab8d6", @@ -142,7 +142,7 @@ }, "simulation/GWF1_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -260,7 +260,7 @@ }, "simulation/GWF1_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -321,9 +321,9 @@ }, "simulation/GWF1_3/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] b6c7b037e7eab65a", @@ -408,7 +408,7 @@ }, "simulation/GWF1_3/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -469,9 +469,9 @@ }, "simulation/GWF2_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] 60d7686f3b7ab8d6", @@ -556,7 +556,7 @@ }, "simulation/GWF2_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -674,7 +674,7 @@ }, "simulation/GWF2_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -735,9 +735,9 @@ }, "simulation/GWF2_3/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] b6c7b037e7eab65a", @@ -822,7 +822,7 @@ }, "simulation/GWF2_3/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -883,9 +883,9 @@ }, "simulation/GWF3_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] 60d7686f3b7ab8d6", @@ -970,7 +970,7 @@ }, "simulation/GWF3_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -1088,7 +1088,7 @@ }, "simulation/GWF3_2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -1149,9 +1149,9 @@ }, "simulation/GWF3_3/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] b6c7b037e7eab65a", @@ -1236,7 +1236,7 @@ }, "simulation/GWF3_3/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest032_sfr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest032_sfr].json index 5e3d3a8e5..caf462d32 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest032_sfr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest032_sfr].json @@ -67,9 +67,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 05d7c5cdc1e3b65d", "boundname": [ @@ -143,7 +143,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -185,9 +185,9 @@ }, "simulation/GWF_1/sfr-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[3] 5c87aa7b7ed93e44", "n": 3, "sfrsetting": [ diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest033_wtdecay].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest033_wtdecay].json index 7a1b9ec32..3ed9bd1ed 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest033_wtdecay].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest033_wtdecay].json @@ -70,9 +70,9 @@ }, "simulation/GWF_1/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[600, 0] da39a3ee5e6b4b0d", "bhead": "float64[600] 649e168b3d527f80", "boundname": "3600 chars f4f1fbf26fdfd458", @@ -143,7 +143,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest034_nwtp2].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest034_nwtp2].json index 8c620e724..148601da8 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest034_nwtp2].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest034_nwtp2].json @@ -109,9 +109,9 @@ }, "simulation/test034_nwtp2/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[395, 0] da39a3ee5e6b4b0d", "boundname": "2370 chars c26df7f4ccda15e9", "cellid": "int64[395, 3] dc8e77b765408033", @@ -243,7 +243,7 @@ }, "simulation/test034_nwtp2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -349,11 +349,11 @@ }, "simulation/test034_nwtp2/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest034_nwtp2_1d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest034_nwtp2_1d].json index 6d618b9a6..926dbc2df 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest034_nwtp2_1d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest034_nwtp2_1d].json @@ -105,9 +105,9 @@ }, "simulation/test034_nwtp2/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[5, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -287,7 +287,7 @@ }, "simulation/test034_nwtp2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -430,11 +430,11 @@ }, "simulation/test034_nwtp2/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest035_fhb].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest035_fhb].json index a5bc1df26..8e341a65b 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest035_fhb].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest035_fhb].json @@ -50,9 +50,9 @@ }, "simulation/fhb2015/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -183,7 +183,7 @@ }, "simulation/fhb2015/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -264,9 +264,9 @@ }, "simulation/fhb2015/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb].json index 0946ce917..13b916b61 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb].json @@ -91,9 +91,9 @@ }, "simulation/twrihfb2015/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -167,9 +167,9 @@ }, "simulation/twrihfb2015/drn-1": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[9, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -207,9 +207,9 @@ }, "simulation/twrihfb2015/hfb": { "__type__": "Hfb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid1": "int64[8, 3] 02dceaba8b46f882", "cellid2": "int64[8, 3] 72e6bd24c0aff195", "hydchr": "float64[8] 0b5723e83d65ca4a", @@ -274,7 +274,7 @@ }, "simulation/twrihfb2015/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -340,9 +340,9 @@ }, "simulation/twrihfb2015/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[15, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_5lay].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_5lay].json index 9c3212ad9..216b69c64 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_5lay].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_5lay].json @@ -97,9 +97,9 @@ }, "simulation/twrihfb_5lay/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -156,9 +156,9 @@ }, "simulation/twrihfb_5lay/DRN": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[9, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -196,9 +196,9 @@ }, "simulation/twrihfb_5lay/HFB": { "__type__": "Hfb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid1": "int64[8, 3] 02dceaba8b46f882", "cellid2": "int64[8, 3] 72e6bd24c0aff195", "hydchr": "float64[8] 0b5723e83d65ca4a", @@ -303,7 +303,7 @@ }, "simulation/twrihfb_5lay/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -346,9 +346,9 @@ }, "simulation/twrihfb_5lay/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[15, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_lpf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_lpf].json index 19af2490d..8dc15b7fe 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_lpf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_lpf].json @@ -97,9 +97,9 @@ }, "simulation/test036_twrihfb/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -156,9 +156,9 @@ }, "simulation/test036_twrihfb/DRN": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[9, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -196,9 +196,9 @@ }, "simulation/test036_twrihfb/HFB": { "__type__": "Hfb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid1": "int64[8, 3] 02dceaba8b46f882", "cellid2": "int64[8, 3] 72e6bd24c0aff195", "hydchr": "float64[8] 0b5723e83d65ca4a", @@ -303,7 +303,7 @@ }, "simulation/test036_twrihfb/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -346,9 +346,9 @@ }, "simulation/test036_twrihfb/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[15, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_nr].json index 922a5cb6e..5264e6f1e 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_nr].json @@ -103,9 +103,9 @@ }, "simulation/twrihfb_nr/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -162,9 +162,9 @@ }, "simulation/twrihfb_nr/DRN": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[9, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -202,9 +202,9 @@ }, "simulation/twrihfb_nr/HFB": { "__type__": "Hfb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid1": "int64[8, 3] 02dceaba8b46f882", "cellid2": "int64[8, 3] 72e6bd24c0aff195", "hydchr": "float64[8] 0b5723e83d65ca4a", @@ -309,7 +309,7 @@ }, "simulation/twrihfb_nr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -352,9 +352,9 @@ }, "simulation/twrihfb_nr/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[15, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_openclose].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_openclose].json index 0946ce917..13b916b61 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_openclose].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest036_twrihfb_openclose].json @@ -91,9 +91,9 @@ }, "simulation/twrihfb2015/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -167,9 +167,9 @@ }, "simulation/twrihfb2015/drn-1": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[9, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -207,9 +207,9 @@ }, "simulation/twrihfb2015/hfb": { "__type__": "Hfb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid1": "int64[8, 3] 02dceaba8b46f882", "cellid2": "int64[8, 3] 72e6bd24c0aff195", "hydchr": "float64[8] 0b5723e83d65ca4a", @@ -274,7 +274,7 @@ }, "simulation/twrihfb2015/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -340,9 +340,9 @@ }, "simulation/twrihfb2015/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[15, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest037_mfcp3].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest037_mfcp3].json index 393a597da..2f7827c46 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest037_mfcp3].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest037_mfcp3].json @@ -91,9 +91,9 @@ }, "simulation/test037/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 0] da39a3ee5e6b4b0d", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] a202b9aa37f2855f", @@ -183,7 +183,7 @@ }, "simulation/test037/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -283,9 +283,9 @@ }, "simulation/test037/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[21, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -336,25 +336,25 @@ }, "simulation/test037/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] } @@ -380,9 +380,9 @@ }, "simulation/test037/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest038_idomain].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest038_idomain].json index ebbfcdefe..4c7dcf4e2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest038_idomain].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest038_idomain].json @@ -49,9 +49,9 @@ }, "simulation/GWF/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 3] 9888aa62db6f21e5", @@ -137,7 +137,7 @@ }, "simulation/GWF/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -176,9 +176,9 @@ }, "simulation/GWF/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert].json index afb5251cd..6ca5493dc 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert].json @@ -47,9 +47,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[102, 0] da39a3ee5e6b4b0d", "boundname": "612 chars bd03048f91bd943a", "cellid": "int64[102, 3] 3148b5fa658099f5", @@ -141,7 +141,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_mfusg].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_mfusg].json index 78330765c..0cb30c93b 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_mfusg].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_mfusg].json @@ -51,9 +51,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[102, 0] da39a3ee5e6b4b0d", "boundname": "612 chars bd03048f91bd943a", "cellid": "int64[102, 3] 3148b5fa658099f5", @@ -139,7 +139,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_nr].json index a21be1c86..a7360edd9 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_nr].json @@ -51,9 +51,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[102, 0] da39a3ee5e6b4b0d", "boundname": "612 chars bd03048f91bd943a", "cellid": "int64[102, 3] 3148b5fa658099f5", @@ -138,7 +138,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_nwt_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_nwt_dev].json index a51f32acf..53bd551a5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_nwt_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest041_flowdivert_nwt_dev].json @@ -51,9 +51,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[102, 0] da39a3ee5e6b4b0d", "boundname": "612 chars bd03048f91bd943a", "cellid": "int64[102, 3] 3148b5fa658099f5", @@ -139,7 +139,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_dev].json index f2ba7a506..393ceff03 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_dev].json @@ -79,9 +79,9 @@ }, "simulation/lake0/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -158,7 +158,7 @@ }, "simulation/lake0/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -259,7 +259,7 @@ }, "simulation/lake0/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh].json index 7af99ed7f..996cf1fb2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh].json @@ -84,9 +84,9 @@ }, "simulation/lake0_e/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -217,7 +217,7 @@ }, "simulation/lake0_e/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Rainfall", "lakeno": "int64[3] ab2fa50ae23ce035", @@ -536,7 +536,7 @@ }, "simulation/lake0_e/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh_conf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh_conf].json index 5ca91bde6..5c5acd539 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh_conf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh_conf].json @@ -81,9 +81,9 @@ }, "simulation/lake0_e/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -214,7 +214,7 @@ }, "simulation/lake0_e/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Rainfall", "lakeno": "int64[3] ab2fa50ae23ce035", @@ -540,7 +540,7 @@ }, "simulation/lake0_e/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh_openclose].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh_openclose].json index 7af99ed7f..996cf1fb2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh_openclose].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedh_openclose].json @@ -84,9 +84,9 @@ }, "simulation/lake0_e/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -217,7 +217,7 @@ }, "simulation/lake0_e/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Rainfall", "lakeno": "int64[3] ab2fa50ae23ce035", @@ -536,7 +536,7 @@ }, "simulation/lake0_e/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv].json index 64cca7f0d..b115079de 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv].json @@ -80,9 +80,9 @@ }, "simulation/lake0_e/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -213,7 +213,7 @@ }, "simulation/lake0_e/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Rainfall", "lakeno": "int64[3] ab2fa50ae23ce035", @@ -539,7 +539,7 @@ }, "simulation/lake0_e/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv_conf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv_conf].json index 121d999b3..2bf127b32 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv_conf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv_conf].json @@ -80,9 +80,9 @@ }, "simulation/lake0_e/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -213,7 +213,7 @@ }, "simulation/lake0_e/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Rainfall", "lakeno": "int64[3] ab2fa50ae23ce035", @@ -539,7 +539,7 @@ }, "simulation/lake0_e/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv_dev].json index 64cca7f0d..b115079de 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest042_lake0_embeddedv_dev].json @@ -80,9 +80,9 @@ }, "simulation/lake0_e/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -213,7 +213,7 @@ }, "simulation/lake0_e/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Rainfall", "lakeno": "int64[3] ab2fa50ae23ce035", @@ -539,7 +539,7 @@ }, "simulation/lake0_e/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest043_drylake_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest043_drylake_dev].json index 26fd9f394..bd47462e4 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest043_drylake_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest043_drylake_dev].json @@ -79,9 +79,9 @@ }, "simulation/ls/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[16, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -158,7 +158,7 @@ }, "simulation/ls/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -321,7 +321,7 @@ }, "simulation/ls/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest044_lakebotfill_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest044_lakebotfill_dev].json index 137a7e8d7..c729c4efa 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest044_lakebotfill_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest044_lakebotfill_dev].json @@ -116,7 +116,7 @@ }, "simulation/lbf/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -313,7 +313,7 @@ }, "simulation/lbf/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss].json index 0d8096de6..c2401c0c0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss].json @@ -81,9 +81,9 @@ }, "simulation/lakeex1b/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[320, 0] da39a3ee5e6b4b0d", "boundname": "1920 chars 265ce500d599b872", "cellid": "int64[320, 3] 6d91cda5abf34789", @@ -172,7 +172,7 @@ }, "simulation/lakeex1b/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -267,7 +267,7 @@ }, "simulation/lakeex1b/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_alt_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_alt_dev].json index 263948827..63bab1ad8 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_alt_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_alt_dev].json @@ -112,7 +112,7 @@ }, "simulation/lakeex1b_1layerb/LAK_1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -206,9 +206,9 @@ }, "simulation/lakeex1b_1layerb/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[64, 0] da39a3ee5e6b4b0d", "boundname": "384 chars 5f890a6e24f4ab19", "cellid": "int64[64, 3] 38a9f81b60694a57", @@ -301,7 +301,7 @@ }, "simulation/lakeex1b_1layerb/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_dev].json index cf212a45e..5317d09d2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_dev].json @@ -112,7 +112,7 @@ }, "simulation/lakeex1b_1layer/LAK_1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -238,9 +238,9 @@ }, "simulation/lakeex1b_1layer/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[64, 0] da39a3ee5e6b4b0d", "boundname": "384 chars 5f890a6e24f4ab19", "cellid": "int64[64, 3] 38a9f81b60694a57", @@ -334,7 +334,7 @@ }, "simulation/lakeex1b_1layer/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_thickstrt_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_thickstrt_dev].json index 734aa9ddc..1ed438402 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_thickstrt_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_1layer_thickstrt_dev].json @@ -112,7 +112,7 @@ }, "simulation/lakeex1b_1layerc/LAK_1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -238,9 +238,9 @@ }, "simulation/lakeex1b_1layerc/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[64, 0] da39a3ee5e6b4b0d", "boundname": "384 chars 5f890a6e24f4ab19", "cellid": "int64[64, 3] 38a9f81b60694a57", @@ -327,7 +327,7 @@ }, "simulation/lakeex1b_1layerc/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_dev].json index aef6626c2..bd98f2a65 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_dev].json @@ -81,9 +81,9 @@ }, "simulation/lakeex1b/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[320, 0] da39a3ee5e6b4b0d", "boundname": "1920 chars 265ce500d599b872", "cellid": "int64[320, 3] 6d91cda5abf34789", @@ -172,7 +172,7 @@ }, "simulation/lakeex1b/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -267,7 +267,7 @@ }, "simulation/lakeex1b/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_none_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_none_dev].json index 394e84c93..6f326bb5b 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_none_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_none_dev].json @@ -81,9 +81,9 @@ }, "simulation/lakeex1b/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[320, 0] da39a3ee5e6b4b0d", "boundname": "1920 chars 265ce500d599b872", "cellid": "int64[320, 3] 6d91cda5abf34789", @@ -172,7 +172,7 @@ }, "simulation/lakeex1b/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -267,7 +267,7 @@ }, "simulation/lakeex1b/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_table_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_table_dev].json index 06aff8f36..3c270bfd4 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_table_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1ss_table_dev].json @@ -81,9 +81,9 @@ }, "simulation/lakeex1b/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[320, 0] da39a3ee5e6b4b0d", "boundname": "1920 chars 265ce500d599b872", "cellid": "int64[320, 3] 6d91cda5abf34789", @@ -172,7 +172,7 @@ }, "simulation/lakeex1b/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -299,7 +299,7 @@ }, "simulation/lakeex1b/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1tr_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1tr_dev].json index 69b0a3179..9ccd49968 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1tr_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1tr_dev].json @@ -82,9 +82,9 @@ }, "simulation/lakeex1a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[320, 0] da39a3ee5e6b4b0d", "boundname": "1920 chars 265ce500d599b872", "cellid": "int64[320, 3] 6d91cda5abf34789", @@ -173,7 +173,7 @@ }, "simulation/lakeex1a/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -365,7 +365,7 @@ }, "simulation/lakeex1a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1tr_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1tr_nr].json index 485db4c06..807e7b4b8 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1tr_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake1tr_nr].json @@ -91,9 +91,9 @@ }, "simulation/lakeex1a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[320, 0] da39a3ee5e6b4b0d", "boundname": "1920 chars 265ce500d599b872", "cellid": "int64[320, 3] 6d91cda5abf34789", @@ -182,7 +182,7 @@ }, "simulation/lakeex1a/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -317,7 +317,7 @@ }, "simulation/lakeex1a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_dev].json index 59a3c3e51..8b266eaf4 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_dev].json @@ -86,9 +86,9 @@ }, "simulation/lakeex2a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[420, 0] da39a3ee5e6b4b0d", "boundname": "2520 chars a78a0caf1acc69ad", "cellid": "int64[420, 3] 84b252e9035246fd", @@ -177,7 +177,7 @@ }, "simulation/lakeex2a/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -498,9 +498,9 @@ }, "simulation/lakeex2a/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[10] 33289ba0144e115a", "id2": "int64[10] 2b364d0bc669282e", "mname1": [ @@ -631,7 +631,7 @@ }, "simulation/lakeex2a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -706,7 +706,7 @@ }, "simulation/lakeex2a/sfr-1": { "__type__": "Sfr", - "_period_data": "4018 chars 00a5518152a916b7", + "_stress_period_data": "4024 chars 1fed8e19976fffbf", "boundnames": false, "connectiondata": { "__table__": "Connectiondata", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_il_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_il_dev].json index bbc82708a..14a7ca39a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_il_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_il_dev].json @@ -79,9 +79,9 @@ }, "simulation/lakeex2a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[420, 0] da39a3ee5e6b4b0d", "boundname": "2520 chars a78a0caf1acc69ad", "cellid": "int64[420, 3] 84b252e9035246fd", @@ -141,7 +141,7 @@ }, "simulation/lakeex2a/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -359,7 +359,7 @@ }, "simulation/lakeex2a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_nr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_nr].json index b77053377..211fdde0d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_nr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_nr].json @@ -94,9 +94,9 @@ }, "simulation/lakeex2a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[420, 0] da39a3ee5e6b4b0d", "boundname": "2520 chars a78a0caf1acc69ad", "cellid": "int64[420, 3] 84b252e9035246fd", @@ -185,7 +185,7 @@ }, "simulation/lakeex2a/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -354,9 +354,9 @@ }, "simulation/lakeex2a/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[4] af37caf866e937ca", "id2": "int64[4] 335aaba9938c8b01", "mname1": [ @@ -450,7 +450,7 @@ }, "simulation/lakeex2a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -525,7 +525,7 @@ }, "simulation/lakeex2a/sfr-1": { "__type__": "Sfr", - "_period_data": "4018 chars 00a5518152a916b7", + "_stress_period_data": "4024 chars 1fed8e19976fffbf", "boundnames": false, "connectiondata": { "__table__": "Connectiondata", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfra_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfra_dev].json index 1c8b06778..ba1e4f088 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfra_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfra_dev].json @@ -83,7 +83,7 @@ }, "simulation/lakeex2a/LAK_XSFR": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -324,9 +324,9 @@ }, "simulation/lakeex2a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[420, 0] da39a3ee5e6b4b0d", "boundname": "2520 chars a78a0caf1acc69ad", "cellid": "int64[420, 3] 84b252e9035246fd", @@ -449,7 +449,7 @@ }, "simulation/lakeex2a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrb_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrb_dev].json index 926c5f531..f7abddf96 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrb_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrb_dev].json @@ -83,7 +83,7 @@ }, "simulation/lakeex2a/LAK_XSFR": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -316,9 +316,9 @@ }, "simulation/lakeex2a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[420, 0] da39a3ee5e6b4b0d", "boundname": "2520 chars a78a0caf1acc69ad", "cellid": "int64[420, 3] 84b252e9035246fd", @@ -441,7 +441,7 @@ }, "simulation/lakeex2a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrc_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrc_dev].json index a83414fd6..6fa1ad0a0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrc_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrc_dev].json @@ -83,7 +83,7 @@ }, "simulation/lakeex2a/LAK_XSFR": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -302,9 +302,9 @@ }, "simulation/lakeex2a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[420, 0] da39a3ee5e6b4b0d", "boundname": "2520 chars a78a0caf1acc69ad", "cellid": "int64[420, 3] 84b252e9035246fd", @@ -427,7 +427,7 @@ }, "simulation/lakeex2a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrd_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrd_dev].json index ccad034bf..ace53fe5a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrd_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfrd_dev].json @@ -83,7 +83,7 @@ }, "simulation/lakeex2a/LAK_XSFR": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -302,9 +302,9 @@ }, "simulation/lakeex2a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[420, 0] da39a3ee5e6b4b0d", "boundname": "2520 chars a78a0caf1acc69ad", "cellid": "int64[420, 3] 84b252e9035246fd", @@ -427,7 +427,7 @@ }, "simulation/lakeex2a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfre_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfre_dev].json index a7e4359af..b4f947380 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfre_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake2tr_xsfre_dev].json @@ -84,7 +84,7 @@ }, "simulation/lakeex2a/LAK_XSFR": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -303,9 +303,9 @@ }, "simulation/lakeex2a/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[420, 0] da39a3ee5e6b4b0d", "boundname": "2520 chars a78a0caf1acc69ad", "cellid": "int64[420, 3] 84b252e9035246fd", @@ -394,9 +394,9 @@ }, "simulation/lakeex2a/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[1] 05fe405753166f12", "id2": "int64[1] 3da89ee273be1343", "mname1": [ @@ -481,7 +481,7 @@ }, "simulation/lakeex2a/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss].json index a8fdb45ca..9a981bfbc 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss].json @@ -76,9 +76,9 @@ }, "simulation/lakeex4/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[352, 0] da39a3ee5e6b4b0d", "boundname": "2112 chars 9ceac4e25648e11c", "cellid": "int64[352, 3] 03a632afe5a5a1bd", @@ -138,7 +138,7 @@ }, "simulation/lakeex4/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -280,7 +280,7 @@ }, "simulation/lakeex4/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_cl_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_cl_dev].json index d116287ad..c669523ad 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_cl_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_cl_dev].json @@ -76,9 +76,9 @@ }, "simulation/lakeex4/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[352, 0] da39a3ee5e6b4b0d", "boundname": "2112 chars 9ceac4e25648e11c", "cellid": "int64[352, 3] 03a632afe5a5a1bd", @@ -138,7 +138,7 @@ }, "simulation/lakeex4/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Status", "lakeno": "int64[2] 031ee8071545c35f", @@ -277,7 +277,7 @@ }, "simulation/lakeex4/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_dev].json index a8fdb45ca..9a981bfbc 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_dev].json @@ -76,9 +76,9 @@ }, "simulation/lakeex4/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[352, 0] da39a3ee5e6b4b0d", "boundname": "2112 chars 9ceac4e25648e11c", "cellid": "int64[352, 3] 03a632afe5a5a1bd", @@ -138,7 +138,7 @@ }, "simulation/lakeex4/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -280,7 +280,7 @@ }, "simulation/lakeex4/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_il_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_il_dev].json index 1f13b292f..d9959cacc 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_il_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_il_dev].json @@ -76,9 +76,9 @@ }, "simulation/lakeex4/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[352, 0] da39a3ee5e6b4b0d", "boundname": "2112 chars 9ceac4e25648e11c", "cellid": "int64[352, 3] 03a632afe5a5a1bd", @@ -138,7 +138,7 @@ }, "simulation/lakeex4/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Status", "lakeno": "int64[1] 3da89ee273be1343", @@ -276,7 +276,7 @@ }, "simulation/lakeex4/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_nr_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_nr_dev].json index 8aff1fa79..3ad740e7d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_nr_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_nr_dev].json @@ -80,9 +80,9 @@ }, "simulation/lakeex4/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[352, 0] da39a3ee5e6b4b0d", "boundname": "2112 chars 9ceac4e25648e11c", "cellid": "int64[352, 3] 03a632afe5a5a1bd", @@ -142,7 +142,7 @@ }, "simulation/lakeex4/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -284,7 +284,7 @@ }, "simulation/lakeex4/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_nr_embedded].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_nr_embedded].json index 81a01d75f..d976613bd 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_nr_embedded].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest045_lake4ss_nr_embedded].json @@ -81,9 +81,9 @@ }, "simulation/lakeex4/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[352, 0] da39a3ee5e6b4b0d", "boundname": "2112 chars 9ceac4e25648e11c", "cellid": "int64[352, 3] 03a632afe5a5a1bd", @@ -143,7 +143,7 @@ }, "simulation/lakeex4/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -399,7 +399,7 @@ }, "simulation/lakeex4/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest046_periodic_bc].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest046_periodic_bc].json index 5d0cc825f..99a34591a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest046_periodic_bc].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest046_periodic_bc].json @@ -98,9 +98,9 @@ }, "simulation/pbc/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] 7bec12cb7fbe198c", @@ -186,7 +186,7 @@ }, "simulation/pbc/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest046_periodic_bc_openclose].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest046_periodic_bc_openclose].json index 5d0cc825f..99a34591a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest046_periodic_bc_openclose].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest046_periodic_bc_openclose].json @@ -98,9 +98,9 @@ }, "simulation/pbc/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[100, 0] da39a3ee5e6b4b0d", "boundname": "600 chars e0fe10b4d6d4dd10", "cellid": "int64[100, 3] 7bec12cb7fbe198c", @@ -186,7 +186,7 @@ }, "simulation/pbc/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_conf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_conf].json index d4fa2ba48..920f63c9e 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_conf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_conf].json @@ -112,7 +112,7 @@ }, "simulation/child/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -524,9 +524,9 @@ }, "simulation/parent/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -632,7 +632,7 @@ }, "simulation/parent/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfB].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfB].json index 0bdf9762b..8096d0fbf 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfB].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfB].json @@ -112,7 +112,7 @@ }, "simulation/child/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -524,9 +524,9 @@ }, "simulation/parent/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -632,7 +632,7 @@ }, "simulation/parent/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfC].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfC].json index 9287cb709..63d715fbf 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfC].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfC].json @@ -112,7 +112,7 @@ }, "simulation/child/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -524,9 +524,9 @@ }, "simulation/parent/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -632,7 +632,7 @@ }, "simulation/parent/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfD].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfD].json index 6b5b4c9ac..bc57e287c 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfD].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconfD].json @@ -112,7 +112,7 @@ }, "simulation/child/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -528,9 +528,9 @@ }, "simulation/parent/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -632,7 +632,7 @@ }, "simulation/parent/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconf].json index 16c35705b..516df97fa 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest048_lgr3d_unconf].json @@ -112,7 +112,7 @@ }, "simulation/child/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -524,9 +524,9 @@ }, "simulation/parent/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[14, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -632,7 +632,7 @@ }, "simulation/parent/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest049_gwfexgrewet].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest049_gwfexgrewet].json index 82c84c47e..17e4bc086 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest049_gwfexgrewet].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest049_gwfexgrewet].json @@ -52,9 +52,9 @@ }, "simulation/Model_01/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -64,7 +64,7 @@ "n": 1 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -74,7 +74,7 @@ "n": 1 }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -162,7 +162,7 @@ }, "simulation/Model_01/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -294,7 +294,7 @@ }, "simulation/Model_02/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -361,9 +361,9 @@ }, "simulation/Model_03/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -373,7 +373,7 @@ "n": 1 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -383,7 +383,7 @@ "n": 1 }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -471,7 +471,7 @@ }, "simulation/Model_03/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest050_circle_island].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest050_circle_island].json index 4ef19efd8..524d0ef16 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest050_circle_island].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest050_circle_island].json @@ -80,9 +80,9 @@ }, "simulation/CI/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3173, 0] da39a3ee5e6b4b0d", "bhead": "float64[3173] 9c843e222292bb19", "boundname": "19038 chars 1022679bc88b0d64", @@ -150,7 +150,7 @@ }, "simulation/CI/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2TS].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2TS].json index 4e392bf2d..16f11f90a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2TS].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2TS].json @@ -103,9 +103,9 @@ }, "simulation/uzfp2/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[145] a7e128fdbd870a91", "n": 145, "sfrsetting": "6468 chars aea9e0115b6e5036" @@ -169,9 +169,9 @@ }, "simulation/uzfp2/UZF_1": { "__type__": "Uzf", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "11136 chars eab255b702f0467e", "extdp": { "__table__": "TimeSeriesRef", @@ -447,9 +447,9 @@ }, "simulation/uzfp2/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -527,7 +527,7 @@ }, "simulation/uzfp2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -598,18 +598,18 @@ }, "simulation/uzfp2/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -635,9 +635,9 @@ }, "simulation/uzfp2/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -656,7 +656,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -675,7 +675,7 @@ "q": "float64[10] fefe62be516873d9" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -683,7 +683,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -702,7 +702,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -721,7 +721,7 @@ "q": "float64[10] fefe62be516873d9" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -729,7 +729,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -748,7 +748,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -756,7 +756,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -775,7 +775,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2].json index 592b81720..8d669a4a2 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2].json @@ -103,9 +103,9 @@ }, "simulation/uzfp2/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[145] a7e128fdbd870a91", "n": 145, "sfrsetting": "6468 chars aea9e0115b6e5036" @@ -169,7 +169,7 @@ }, "simulation/uzfp2/UZF_1": { "__type__": "Uzf", - "_period_data": "4994 chars 7444dac954dd151e", + "_stress_period_data": "5066 chars dc207a40e01b463d", "boundnames": true, "budget_file": "uzf.cbc", "dims": { @@ -314,9 +314,9 @@ }, "simulation/uzfp2/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -394,7 +394,7 @@ }, "simulation/uzfp2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -465,18 +465,18 @@ }, "simulation/uzfp2/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -502,9 +502,9 @@ }, "simulation/uzfp2/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -523,7 +523,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -542,7 +542,7 @@ "q": "float64[10] fefe62be516873d9" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -550,7 +550,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -569,7 +569,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -588,7 +588,7 @@ "q": "float64[10] fefe62be516873d9" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -596,7 +596,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -615,7 +615,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -623,7 +623,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -642,7 +642,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_mvr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_mvr].json index 364669919..5838c8929 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_mvr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_mvr].json @@ -101,9 +101,9 @@ }, "simulation/uzfp2_mvr/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[145] 3c23a39afefd23c8", "n": 145, "sfrsetting": "6468 chars 40cea7d4554e1c8f" @@ -167,7 +167,7 @@ }, "simulation/uzfp2_mvr/UZF_1": { "__type__": "Uzf", - "_period_data": "4994 chars acb3a52253ac69f8", + "_stress_period_data": "5066 chars 5f189b01dcaa3fd9", "boundnames": false, "dims": { "ncelldim": 3, @@ -229,9 +229,9 @@ }, "simulation/uzfp2_mvr/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -278,9 +278,9 @@ }, "simulation/uzfp2_mvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[116] f103951c1567c165", "id2": "int64[116] 240740fedddc775a", "mname1": "696 chars 0ec7f83c2d7a9629", @@ -353,7 +353,7 @@ }, "simulation/uzfp2_mvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -424,18 +424,18 @@ }, "simulation/uzfp2_mvr/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -461,9 +461,9 @@ }, "simulation/uzfp2_mvr/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -482,7 +482,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -501,7 +501,7 @@ "q": "float64[10] fefe62be516873d9" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -509,7 +509,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -528,7 +528,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -547,7 +547,7 @@ "q": "float64[10] fefe62be516873d9" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -555,7 +555,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -574,7 +574,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -582,7 +582,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -601,7 +601,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_nouzf].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_nouzf].json index cb0c38081..23a255eb4 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_nouzf].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_nouzf].json @@ -155,9 +155,9 @@ }, "simulation/uzfp2_nouzf/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[145] 3c23a39afefd23c8", "n": 145, "sfrsetting": "6468 chars 40cea7d4554e1c8f" @@ -239,9 +239,9 @@ }, "simulation/uzfp2_nouzf/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -319,7 +319,7 @@ }, "simulation/uzfp2_nouzf/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -379,18 +379,18 @@ }, "simulation/uzfp2_nouzf/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -416,9 +416,9 @@ }, "simulation/uzfp2_nouzf/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -437,7 +437,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -456,7 +456,7 @@ "q": "float64[10] fefe62be516873d9" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -464,7 +464,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -483,7 +483,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -502,7 +502,7 @@ "q": "float64[10] fefe62be516873d9" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -510,7 +510,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -529,7 +529,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -537,7 +537,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -556,7 +556,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_openclose].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_openclose].json index 753670964..1e8d613d8 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_openclose].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp2_openclose].json @@ -103,9 +103,9 @@ }, "simulation/uzfp2/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[145] a7e128fdbd870a91", "n": 145, "sfrsetting": "6468 chars aea9e0115b6e5036" @@ -169,7 +169,7 @@ }, "simulation/uzfp2/UZF_1": { "__type__": "Uzf", - "_period_data": "4994 chars 7444dac954dd151e", + "_stress_period_data": "5066 chars dc207a40e01b463d", "boundnames": true, "dims": { "ncelldim": 3, @@ -313,9 +313,9 @@ }, "simulation/uzfp2/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -393,7 +393,7 @@ }, "simulation/uzfp2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -464,18 +464,18 @@ }, "simulation/uzfp2/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -501,9 +501,9 @@ }, "simulation/uzfp2/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -522,7 +522,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -541,7 +541,7 @@ "q": "float64[10] fefe62be516873d9" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -549,7 +549,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -568,7 +568,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -587,7 +587,7 @@ "q": "float64[10] fefe62be516873d9" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -595,7 +595,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -614,7 +614,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -622,7 +622,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -641,7 +641,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_aeET_lakmvr_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_aeET_lakmvr_dev].json index 44e35994d..3341a80de 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_aeET_lakmvr_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_aeET_lakmvr_dev].json @@ -104,7 +104,7 @@ }, "simulation/uzfp3_lakmvr/LAK_1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -215,9 +215,9 @@ }, "simulation/uzfp3_lakmvr/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[125] 7fe61607eba9945c", "n": 125, "sfrsetting": "5578 chars 395dbece313511c3" @@ -313,7 +313,7 @@ }, "simulation/uzfp3_lakmvr/UZF_1": { "__type__": "Uzf", - "_period_data": "4994 chars f952becf1db5c6bc", + "_stress_period_data": "5066 chars 739c5b572ac3943d", "boundnames": false, "budget_file": "uzf.cbc", "dims": { @@ -376,9 +376,9 @@ }, "simulation/uzfp3_lakmvr/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -425,9 +425,9 @@ }, "simulation/uzfp3_lakmvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[104] 294d02ba9aefb89a", "id2": "int64[104] 93de698407eb6371", "mname1": "624 chars c20d2bcef7082b5b", @@ -499,7 +499,7 @@ }, "simulation/uzfp3_lakmvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -570,18 +570,18 @@ }, "simulation/uzfp3_lakmvr/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -607,9 +607,9 @@ }, "simulation/uzfp3_lakmvr/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -628,7 +628,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -647,7 +647,7 @@ "q": "float64[10] fefe62be516873d9" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -655,7 +655,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -674,7 +674,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -693,7 +693,7 @@ "q": "float64[10] fefe62be516873d9" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -701,7 +701,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -720,7 +720,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -728,7 +728,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -747,7 +747,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_2uzfmodels_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_2uzfmodels_dev].json index 7cb3b56eb..0d03ea3c1 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_2uzfmodels_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_2uzfmodels_dev].json @@ -101,7 +101,7 @@ }, "simulation/uzfp3_lakmvr/LAK_1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -212,9 +212,9 @@ }, "simulation/uzfp3_lakmvr/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[125] 7fe61607eba9945c", "n": 125, "sfrsetting": "5578 chars 395dbece313511c3" @@ -310,7 +310,7 @@ }, "simulation/uzfp3_lakmvr/UZF_1": { "__type__": "Uzf", - "_period_data": "4874 chars 13267af3e1d8ed2b", + "_stress_period_data": "4946 chars fc041ec0f846aa55", "boundnames": false, "dims": { "ncelldim": 3, @@ -354,7 +354,7 @@ }, "simulation/uzfp3_lakmvr/UZF_2": { "__type__": "Uzf", - "_period_data": "4874 chars 8ffe2aab34b59a5d", + "_stress_period_data": "4946 chars 9fc27f8945625280", "boundnames": false, "dims": { "ncelldim": 3, @@ -416,9 +416,9 @@ }, "simulation/uzfp3_lakmvr/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -465,9 +465,9 @@ }, "simulation/uzfp3_lakmvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[104] 33baf2d7749cb2e7", "id2": "int64[104] 93de698407eb6371", "mname1": "624 chars c20d2bcef7082b5b", @@ -544,7 +544,7 @@ }, "simulation/uzfp3_lakmvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -615,18 +615,18 @@ }, "simulation/uzfp3_lakmvr/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -652,9 +652,9 @@ }, "simulation/uzfp3_lakmvr/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -673,7 +673,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -692,7 +692,7 @@ "q": "float64[10] fefe62be516873d9" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -700,7 +700,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -719,7 +719,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -738,7 +738,7 @@ "q": "float64[10] fefe62be516873d9" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -746,7 +746,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -765,7 +765,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -773,7 +773,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -792,7 +792,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_dev].json index 730b76cc9..60beb3058 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_dev].json @@ -100,7 +100,7 @@ }, "simulation/uzfp3_lakmvr/LAK_1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -211,9 +211,9 @@ }, "simulation/uzfp3_lakmvr/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[125] 7fe61607eba9945c", "n": 125, "sfrsetting": "5578 chars 395dbece313511c3" @@ -309,7 +309,7 @@ }, "simulation/uzfp3_lakmvr/UZF_1": { "__type__": "Uzf", - "_period_data": "4994 chars b12280fe9341261b", + "_stress_period_data": "5066 chars 671331d7499acead", "boundnames": false, "dims": { "ncelldim": 3, @@ -371,9 +371,9 @@ }, "simulation/uzfp3_lakmvr/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -420,9 +420,9 @@ }, "simulation/uzfp3_lakmvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[104] 294d02ba9aefb89a", "id2": "int64[104] 93de698407eb6371", "mname1": "624 chars c20d2bcef7082b5b", @@ -497,7 +497,7 @@ }, "simulation/uzfp3_lakmvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -568,18 +568,18 @@ }, "simulation/uzfp3_lakmvr/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -605,9 +605,9 @@ }, "simulation/uzfp3_lakmvr/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -626,7 +626,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -645,7 +645,7 @@ "q": "float64[10] fefe62be516873d9" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -653,7 +653,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -672,7 +672,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -691,7 +691,7 @@ "q": "float64[10] fefe62be516873d9" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -699,7 +699,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -718,7 +718,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -726,7 +726,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -745,7 +745,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_nouzf_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_nouzf_dev].json index e65fd80e9..47b1f4d17 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_nouzf_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_nouzf_dev].json @@ -119,7 +119,7 @@ }, "simulation/lakmvr_nouzf/LAK_1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -251,9 +251,9 @@ }, "simulation/lakmvr_nouzf/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[125] 7fe61607eba9945c", "n": 125, "sfrsetting": "5578 chars 395dbece313511c3" @@ -367,9 +367,9 @@ }, "simulation/lakmvr_nouzf/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -416,9 +416,9 @@ }, "simulation/lakmvr_nouzf/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[4] 01e8d91ee559ed02", "id2": "int64[4] 8419408831aecfc6", "mname1": [ @@ -516,7 +516,7 @@ }, "simulation/lakmvr_nouzf/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -576,18 +576,18 @@ }, "simulation/lakmvr_nouzf/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -613,9 +613,9 @@ }, "simulation/lakmvr_nouzf/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -634,7 +634,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -653,7 +653,7 @@ "q": "float64[10] fefe62be516873d9" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -661,7 +661,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -680,7 +680,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -699,7 +699,7 @@ "q": "float64[10] fefe62be516873d9" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -707,7 +707,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -726,7 +726,7 @@ "q": "float64[10] fc2f474a3ffea575" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -734,7 +734,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -753,7 +753,7 @@ "q": "float64[10] 0a6920c55d9f43f5" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_v2_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_v2_dev].json index 3df018593..c8f35326a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_v2_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_lakmvr_v2_dev].json @@ -102,7 +102,7 @@ }, "simulation/uzfp3_lakmvr/LAK_1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -272,9 +272,9 @@ }, "simulation/uzfp3_lakmvr/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[125] 7fe61607eba9945c", "n": 125, "sfrsetting": "5578 chars 395dbece313511c3" @@ -565,7 +565,7 @@ }, "simulation/uzfp3_lakmvr/UZF_1": { "__type__": "Uzf", - "_period_data": "9998 chars 718fb4389b842405", + "_stress_period_data": "10142 chars c1b65f59cfe75884", "boundnames": true, "budget_file": "uzf.cbc", "dims": { @@ -753,9 +753,9 @@ }, "simulation/uzfp3_lakmvr/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -802,9 +802,9 @@ }, "simulation/uzfp3_lakmvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[104] 294d02ba9aefb89a", "id2": "int64[104] 93de698407eb6371", "mname1": "624 chars c20d2bcef7082b5b", @@ -923,7 +923,7 @@ }, "simulation/uzfp3_lakmvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -994,18 +994,18 @@ }, "simulation/uzfp3_lakmvr/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_wellakmvr_v2].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_wellakmvr_v2].json index 9ee17d45c..70aa622cd 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_wellakmvr_v2].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest051_uzfp3_wellakmvr_v2].json @@ -104,7 +104,7 @@ }, "simulation/uzfp3_lakmvr/LAK-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -274,9 +274,9 @@ }, "simulation/uzfp3_lakmvr/SFR-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[125] 7fe61607eba9945c", "n": 125, "sfrsetting": "5578 chars 395dbece313511c3" @@ -567,7 +567,7 @@ }, "simulation/uzfp3_lakmvr/UZF-1": { "__type__": "Uzf", - "_period_data": "9998 chars 718fb4389b842405", + "_stress_period_data": "10142 chars c1b65f59cfe75884", "boundnames": true, "budget_file": "uzf.cbc", "dims": { @@ -685,9 +685,9 @@ }, "simulation/uzfp3_lakmvr/WEL-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -706,7 +706,7 @@ "q": "float64[10] 8fc36a50d0ba5aab" }, "10": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -725,7 +725,7 @@ "q": "float64[10] 5a2536e675985b27" }, "11": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -733,7 +733,7 @@ "q": [] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -752,7 +752,7 @@ "q": "float64[10] 23859eb00ce8c537" }, "4": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -771,7 +771,7 @@ "q": "float64[10] 94cd9ffcb724ea34" }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -779,7 +779,7 @@ "q": [] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -798,7 +798,7 @@ "q": "float64[10] 23859eb00ce8c537" }, "7": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -806,7 +806,7 @@ "q": [] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[10, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -825,7 +825,7 @@ "q": "float64[10] 23859eb00ce8c537" }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -871,9 +871,9 @@ }, "simulation/uzfp3_lakmvr/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -920,9 +920,9 @@ }, "simulation/uzfp3_lakmvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[114] c5e20e1adf65ed73", "id2": "int64[114] 601bbf474d1b2f6d", "mname1": "684 chars 4d42695ad710d98d", @@ -1043,7 +1043,7 @@ }, "simulation/uzfp3_lakmvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -1114,18 +1114,18 @@ }, "simulation/uzfp3_lakmvr/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest052_uzf_3col].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest052_uzf_3col].json index a9e4e5214..4dcb1d36a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest052_uzf_3col].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest052_uzf_3col].json @@ -80,9 +80,9 @@ }, "simulation/mf6/CHD-IB": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -111,9 +111,9 @@ }, "simulation/mf6/UZF_1": { "__type__": "Uzf", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "extdp": "float64[1] 05fe405753166f12", "extwc": "float64[1] 05fe405753166f12", @@ -237,7 +237,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-a].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-a].json index c7f5c37bb..b2da896ab 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-a].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-a].json @@ -100,9 +100,9 @@ }, "simulation/mf6/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "bhead": "float64[1] 4012bb3ed12fff68", "boundname": [ @@ -179,7 +179,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -251,9 +251,9 @@ }, "simulation/mf6/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -284,9 +284,9 @@ }, "simulation/mf6/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-a_mfusg].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-a_mfusg].json index 366ebed89..6e0c6eb46 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-a_mfusg].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-a_mfusg].json @@ -108,9 +108,9 @@ }, "simulation/mf6/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "bhead": "float64[1] 4012bb3ed12fff68", "boundname": [ @@ -184,7 +184,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -256,9 +256,9 @@ }, "simulation/mf6/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -289,9 +289,9 @@ }, "simulation/mf6/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-b].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-b].json index 9b50c1b3b..283c84182 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-b].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-b].json @@ -100,9 +100,9 @@ }, "simulation/mf6/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "bhead": "float64[1] 4012bb3ed12fff68", "boundname": [ @@ -180,7 +180,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -252,9 +252,9 @@ }, "simulation/mf6/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -285,9 +285,9 @@ }, "simulation/mf6/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-b_mfusg].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-b_mfusg].json index a4d2ce762..ddf1861be 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-b_mfusg].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest053_npf-b_mfusg].json @@ -104,9 +104,9 @@ }, "simulation/mf6/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "bhead": "float64[1] 4012bb3ed12fff68", "boundname": [ @@ -181,7 +181,7 @@ }, "simulation/mf6/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -253,9 +253,9 @@ }, "simulation/mf6/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -286,9 +286,9 @@ }, "simulation/mf6/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsA].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsA].json index 2cbdd0a9a..b43d12519 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsA].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsA].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -146,7 +146,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -185,9 +185,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 3] 0a0b8e56448e4e1e", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsB].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsB].json index 43867a345..ebf275656 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsB].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsB].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -146,7 +146,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -185,9 +185,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 3] 0a0b8e56448e4e1e", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsC].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsC].json index 2fa110809..304e20a36 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsC].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest054_xt3d_whirlsC].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -146,7 +146,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -185,9 +185,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 3] 0a0b8e56448e4e1e", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest055_xt3d_lvda-doc-test1].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest055_xt3d_lvda-doc-test1].json index 25e5c42ae..85534fb94 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest055_xt3d_lvda-doc-test1].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest055_xt3d_lvda-doc-test1].json @@ -49,9 +49,9 @@ }, "simulation/GWF_1/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -144,7 +144,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -183,9 +183,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[200, 0] da39a3ee5e6b4b0d", "boundname": "1200 chars 2cb650e6c16490c7", "cellid": "int64[200, 3] f342dbf055a01c85", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest056_mt3dms_usgs_gwtex_IR_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest056_mt3dms_usgs_gwtex_IR_dev].json index 3da090770..c1933974f 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest056_mt3dms_usgs_gwtex_IR_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest056_mt3dms_usgs_gwtex_IR_dev].json @@ -84,9 +84,9 @@ }, "simulation/m1/CHD-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[322, 0] da39a3ee5e6b4b0d", "boundname": "1932 chars 97abcc9eec8dbd60", "cellid": "int64[322, 3] d27c3a72f0d729e6", @@ -112,7 +112,7 @@ }, "simulation/m1/LAK-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -223,9 +223,9 @@ }, "simulation/m1/SFR-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[7] e81c67c0c8c3e53b", "n": 7, "sfrsetting": [ @@ -260,7 +260,7 @@ ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[7] e81c67c0c8c3e53b", "n": 7, "sfrsetting": [ @@ -295,7 +295,7 @@ ] }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[7] e81c67c0c8c3e53b", "n": 7, "sfrsetting": [ @@ -412,9 +412,9 @@ }, "simulation/m1/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[2] 4b9722225a75f1ba", "id2": "int64[2] 2c41883f58ce1c76", "mname1": [ @@ -502,7 +502,7 @@ }, "simulation/m1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest056_mt3dms_usgs_gwtex_dev].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest056_mt3dms_usgs_gwtex_dev].json index 31398f04e..ebd254be7 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest056_mt3dms_usgs_gwtex_dev].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest056_mt3dms_usgs_gwtex_dev].json @@ -84,9 +84,9 @@ }, "simulation/m1/CHD-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[322, 0] da39a3ee5e6b4b0d", "boundname": "1932 chars 97abcc9eec8dbd60", "cellid": "int64[322, 3] d27c3a72f0d729e6", @@ -112,7 +112,7 @@ }, "simulation/m1/LAK-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Rainfall", @@ -223,9 +223,9 @@ }, "simulation/m1/SFR-1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "n": 1, "sfrsetting": { @@ -235,7 +235,7 @@ } }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[1] 05fe405753166f12", "n": 1, "sfrsetting": { @@ -329,9 +329,9 @@ }, "simulation/m1/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[2] 4b9722225a75f1ba", "id2": "int64[2] 2c41883f58ce1c76", "mname1": [ @@ -420,7 +420,7 @@ }, "simulation/m1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest057_transientchd].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest057_transientchd].json index 9557ae9d8..ac10b558d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest057_transientchd].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest057_transientchd].json @@ -48,9 +48,9 @@ }, "simulation/GWF_1/CHD_UL-LR": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -63,7 +63,7 @@ "n": 4 }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -71,7 +71,7 @@ "n": 0 }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -84,7 +84,7 @@ "n": 4 }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -110,9 +110,9 @@ }, "simulation/GWF_1/CHD_UR-LL": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -125,7 +125,7 @@ "n": 4 }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": [], "boundname": [], "cellid": [], @@ -133,7 +133,7 @@ "n": 0 }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -223,7 +223,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest059_mvlake_lak_ss].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest059_mvlake_lak_ss].json index 8e151db95..546219610 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest059_mvlake_lak_ss].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest059_mvlake_lak_ss].json @@ -111,7 +111,7 @@ }, "simulation/mv/lak-1": { "__type__": "Lak", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Status", @@ -205,7 +205,7 @@ }, "simulation/mv/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -277,9 +277,9 @@ }, "simulation/mv/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[18, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -327,9 +327,9 @@ }, "simulation/mv/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -341,7 +341,7 @@ "q": "float64[3] d3399b7262fb56cb" }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -353,7 +353,7 @@ "q": "float64[3] 1c7c6fbd21bec6b6" }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest061_csub_holly].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest061_csub_holly].json index 0672a1c64..278f5b839 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest061_csub_holly].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest061_csub_holly].json @@ -53,9 +53,9 @@ }, "simulation/holly/chd": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -440,7 +440,7 @@ }, "simulation/holly/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "352": { "__table__": "Save", "n": 2, @@ -469,11 +469,11 @@ }, "simulation/holly/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest061_csub_jacob].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest061_csub_jacob].json index 087c52cfa..198237090 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest061_csub_jacob].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest061_csub_jacob].json @@ -51,9 +51,9 @@ }, "simulation/fig4_base/csub": { "__type__": "Csub", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "cellid": "int64[1, 3] d3399b7262fb56cb", "n": 1, "sig0": { @@ -305,7 +305,7 @@ }, "simulation/fig4_base/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -354,18 +354,18 @@ }, "simulation/fig4_base/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "STEADY-STATE" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest100_ss_ic].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest100_ss_ic].json index bd0d42ee2..71b430cb5 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest100_ss_ic].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest100_ss_ic].json @@ -98,9 +98,9 @@ }, "simulation/test1ss_ic/SFR_1": { "__type__": "Sfr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "ifno": "int64[145] a7e128fdbd870a91", "n": 145, "sfrsetting": "6468 chars aea9e0115b6e5036" @@ -211,9 +211,9 @@ }, "simulation/test1ss_ic/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "bhead": "float64[2] 5c05b40737dca5f1", "boundname": [ @@ -291,7 +291,7 @@ }, "simulation/test1ss_ic/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest101_fhb].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest101_fhb].json index b43f9810e..8e19e1360 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest101_fhb].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest101_fhb].json @@ -97,9 +97,9 @@ }, "simulation/test_fhb/CHD-HEAD(FHB)": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -174,9 +174,9 @@ }, "simulation/test_fhb/WEL-FLOWS(FHB)": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -264,9 +264,9 @@ }, "simulation/test_fhb/drn-1": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[2, 0] da39a3ee5e6b4b0d", "boundname": [ "drain_r1", @@ -390,7 +390,7 @@ }, "simulation/test_fhb/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest102_wel_mvr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest102_wel_mvr].json index c02abe80d..8c19eca27 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest102_wel_mvr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest102_wel_mvr].json @@ -96,9 +96,9 @@ }, "simulation/welmvr/CHD-FROM-IBOUND": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -159,7 +159,7 @@ }, "simulation/welmvr/maw-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": [] }, "boundnames": false, @@ -220,9 +220,9 @@ }, "simulation/welmvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[1] b0aa4b549f325cca", "id2": "int64[1] ef4862c8fb031cd5", "mname1": [ @@ -305,7 +305,7 @@ }, "simulation/welmvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -354,9 +354,9 @@ }, "simulation/welmvr/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "boundname": [ "W1", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest103_drn_mvr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest103_drn_mvr].json index d4508090b..2e8e36c2a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest103_drn_mvr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest103_drn_mvr].json @@ -53,9 +53,9 @@ }, "simulation/drnmvr/CHD-FROM-IBOUND": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -100,9 +100,9 @@ }, "simulation/drnmvr/drn-1": { "__type__": "Drn", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ "DRN1" @@ -206,7 +206,7 @@ }, "simulation/drnmvr/maw-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": [] }, "boundnames": false, @@ -267,9 +267,9 @@ }, "simulation/drnmvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[1] 05fe405753166f12", "id2": "int64[1] ef4862c8fb031cd5", "mname1": [ @@ -352,7 +352,7 @@ }, "simulation/drnmvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest104_riv_mvr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest104_riv_mvr].json index 903ffae3f..137ccfd09 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest104_riv_mvr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest104_riv_mvr].json @@ -81,9 +81,9 @@ }, "simulation/rivmvr/CHD-FROM-IBOUND": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -144,7 +144,7 @@ }, "simulation/rivmvr/maw-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": [] }, "boundnames": false, @@ -205,9 +205,9 @@ }, "simulation/rivmvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[1] b0aa4b549f325cca", "id2": "int64[1] ef4862c8fb031cd5", "mname1": [ @@ -290,7 +290,7 @@ }, "simulation/rivmvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -333,9 +333,9 @@ }, "simulation/rivmvr/riv-1": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "boundname": [ "riv2", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest105_ghb_mvr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest105_ghb_mvr].json index 6903438f0..71ea8ed7c 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest105_ghb_mvr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest105_ghb_mvr].json @@ -53,9 +53,9 @@ }, "simulation/ghbmvr/CHD-FROM-IBOUND": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ null @@ -100,9 +100,9 @@ }, "simulation/ghbmvr/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "bhead": "float64[4] 12d6ceb9b133be62", "boundname": [ @@ -228,7 +228,7 @@ }, "simulation/ghbmvr/maw-1": { "__type__": "Maw", - "_period_data": { + "_stress_period_data": { "0": [] }, "boundnames": false, @@ -289,9 +289,9 @@ }, "simulation/ghbmvr/mvr": { "__type__": "Mvr", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "id1": "int64[1] b0aa4b549f325cca", "id2": "int64[1] ef4862c8fb031cd5", "mname1": [ @@ -374,7 +374,7 @@ }, "simulation/ghbmvr/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest106_tsnodata].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest106_tsnodata].json index 943183f2a..3dc5d2a73 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest106_tsnodata].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest106_tsnodata].json @@ -51,9 +51,9 @@ }, "simulation/GWF_1/CHD_LEFT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 0] da39a3ee5e6b4b0d", "boundname": "480 chars 09c21ce678c9edd6", "cellid": "int64[40, 3] f0a363c352cc617a", @@ -129,9 +129,9 @@ }, "simulation/GWF_1/CHD_RIGHT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 0] da39a3ee5e6b4b0d", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] e91c6b3d1e011af8", @@ -216,7 +216,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -255,18 +255,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] } @@ -292,9 +292,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ "well_4" @@ -310,7 +310,7 @@ } }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ "well_2", @@ -330,7 +330,7 @@ } }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -352,7 +352,7 @@ } }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[5, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -376,7 +376,7 @@ } }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[6, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -413,7 +413,7 @@ ] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[7, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -455,7 +455,7 @@ ] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[6, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -492,7 +492,7 @@ ] }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[5, 0] da39a3ee5e6b4b0d", "boundname": [ "well_2", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest106_tsnodataalt_model].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest106_tsnodataalt_model].json index 189240ec0..878fca083 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest106_tsnodataalt_model].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest106_tsnodataalt_model].json @@ -51,9 +51,9 @@ }, "simulation/GWF_1/CHD_LEFT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 0] da39a3ee5e6b4b0d", "boundname": "480 chars 09c21ce678c9edd6", "cellid": "int64[40, 3] f0a363c352cc617a", @@ -129,9 +129,9 @@ }, "simulation/GWF_1/CHD_RIGHT": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 0] da39a3ee5e6b4b0d", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] e91c6b3d1e011af8", @@ -216,7 +216,7 @@ }, "simulation/GWF_1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Print", @@ -255,18 +255,18 @@ }, "simulation/GWF_1/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "steady-state" ] }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "transient" ] } @@ -292,9 +292,9 @@ }, "simulation/GWF_1/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[1, 0] da39a3ee5e6b4b0d", "boundname": [ "well_4" @@ -310,7 +310,7 @@ } }, "1": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[3, 0] da39a3ee5e6b4b0d", "boundname": [ "well_2", @@ -330,7 +330,7 @@ } }, "2": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -352,7 +352,7 @@ } }, "3": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[5, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -376,7 +376,7 @@ } }, "5": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[6, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -413,7 +413,7 @@ ] }, "6": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[7, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -455,7 +455,7 @@ ] }, "8": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[6, 0] da39a3ee5e6b4b0d", "boundname": [ "well_1", @@ -492,7 +492,7 @@ ] }, "9": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[5, 0] da39a3ee5e6b4b0d", "boundname": [ "well_2", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_dis-lgr].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_dis-lgr].json index db221ac7f..8330e5a9c 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_dis-lgr].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_dis-lgr].json @@ -113,7 +113,7 @@ }, "simulation/child/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -185,9 +185,9 @@ }, "simulation/child/riv_0": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[30, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -323,9 +323,9 @@ }, "simulation/mv/chd_0": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[65, 0] da39a3ee5e6b4b0d", "boundname": "390 chars 68127652e53348d9", "cellid": "int64[65, 3] c3b303d294db114a", @@ -411,7 +411,7 @@ }, "simulation/mv/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Save", "n": 2, @@ -463,9 +463,9 @@ }, "simulation/mv/riv_0": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[8, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_dis-lgr_3models].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_dis-lgr_3models].json index 1d74095b5..505f4d6b4 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_dis-lgr_3models].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_dis-lgr_3models].json @@ -116,7 +116,7 @@ }, "simulation/child1/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -188,9 +188,9 @@ }, "simulation/child1/riv_0": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[15, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -327,7 +327,7 @@ }, "simulation/child2/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -399,9 +399,9 @@ }, "simulation/child2/riv_0": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[15, 0] da39a3ee5e6b4b0d", "boundname": [ null, @@ -585,9 +585,9 @@ }, "simulation/mv/chd_0": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[65, 0] da39a3ee5e6b4b0d", "boundname": "390 chars 68127652e53348d9", "cellid": "int64[65, 3] c3b303d294db114a", @@ -673,7 +673,7 @@ }, "simulation/mv/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": { "__table__": "Save", "n": 2, @@ -725,9 +725,9 @@ }, "simulation/mv/riv_0": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[8, 0] da39a3ee5e6b4b0d", "boundname": [ null, diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_disv_xt3d].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_disv_xt3d].json index d09af175b..7fd324db0 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_disv_xt3d].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest120_mv_disv_xt3d].json @@ -62,9 +62,9 @@ }, "simulation/model/chd_0": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[4212, 0] da39a3ee5e6b4b0d", "boundname": "25272 chars 50dc3fe0f08dad7c", "cellid": "int64[4212, 2] 7cf35b0512ca4da3", @@ -164,7 +164,7 @@ }, "simulation/model/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -224,9 +224,9 @@ }, "simulation/model/riv_0": { "__type__": "Riv", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[288, 0] da39a3ee5e6b4b0d", "boundname": "1728 chars 5adfdf746e461827", "cellid": "int64[288, 2] 948779055e9e06b5", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest201_gwtbuy-henryCHD].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest201_gwtbuy-henryCHD].json index dd08225ad..60c14861a 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest201_gwtbuy-henryCHD].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest201_gwtbuy-henryCHD].json @@ -83,9 +83,9 @@ }, "simulation/gwf_henry/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 1] b9838cbae6f2cf78", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] 149568cd2fa52a6a", @@ -172,7 +172,7 @@ }, "simulation/gwf_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -221,9 +221,9 @@ }, "simulation/gwf_henry/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 1] 1aa0cb9b7917d445", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] 6cbd93e97319537a", @@ -304,9 +304,9 @@ }, "simulation/gwt_henry/cnc": { "__type__": "Cnc", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 0] da39a3ee5e6b4b0d", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] 149568cd2fa52a6a", @@ -401,7 +401,7 @@ }, "simulation/gwt_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest202_gwtbuy-henryCHDm].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest202_gwtbuy-henryCHDm].json index 992394e8c..f89fa1f86 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest202_gwtbuy-henryCHDm].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest202_gwtbuy-henryCHDm].json @@ -83,9 +83,9 @@ }, "simulation/gwf_henry/chd-1": { "__type__": "Chd", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 1] b9838cbae6f2cf78", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] 149568cd2fa52a6a", @@ -172,7 +172,7 @@ }, "simulation/gwf_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -221,9 +221,9 @@ }, "simulation/gwf_henry/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 1] 1aa0cb9b7917d445", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] 6cbd93e97319537a", @@ -304,9 +304,9 @@ }, "simulation/gwt_henry/cnc": { "__type__": "Cnc", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 0] da39a3ee5e6b4b0d", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] 149568cd2fa52a6a", @@ -401,7 +401,7 @@ }, "simulation/gwt_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest203_gwtbuy-henryGHB].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest203_gwtbuy-henryGHB].json index 3f30b7a80..cb2c2725d 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest203_gwtbuy-henryGHB].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest203_gwtbuy-henryGHB].json @@ -99,9 +99,9 @@ }, "simulation/gwf_henry/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 2] f319bd5f01990db0", "bhead": "float64[40] ddbd774456e1d0a7", "boundname": "240 chars 65361fa17dffc6e6", @@ -175,7 +175,7 @@ }, "simulation/gwf_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -224,9 +224,9 @@ }, "simulation/gwf_henry/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 1] 1aa0cb9b7917d445", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] 6cbd93e97319537a", @@ -374,7 +374,7 @@ }, "simulation/gwt_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest204_gwtbuy-henryGHBm].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest204_gwtbuy-henryGHBm].json index c5c2a05b1..a47dd8abb 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest204_gwtbuy-henryGHBm].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest204_gwtbuy-henryGHBm].json @@ -99,9 +99,9 @@ }, "simulation/gwf_henry/ghb-1": { "__type__": "Ghb", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 2] f319bd5f01990db0", "bhead": "float64[40] ddbd774456e1d0a7", "boundname": "240 chars 65361fa17dffc6e6", @@ -175,7 +175,7 @@ }, "simulation/gwf_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -224,9 +224,9 @@ }, "simulation/gwf_henry/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 1] 1aa0cb9b7917d445", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] 6cbd93e97319537a", @@ -374,7 +374,7 @@ }, "simulation/gwt_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest205_gwtbuy-henrytidal].json b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest205_gwtbuy-henrytidal].json index 766fc1033..fc3a318bb 100644 --- a/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest205_gwtbuy-henrytidal].json +++ b/test/mf6/__snapshots__/test_mf6_load_all_models/test_load_simulation[mf6testtest205_gwtbuy-henrytidal].json @@ -107,7 +107,7 @@ }, "simulation/gwf_henry/drn-1": { "__type__": "Drn", - "_period_data": "275142 chars 3c3019997629777a", + "_stress_period_data": "280764 chars 252fa3d80715f79c", "auxiliary": [ "CONCENTRATION" ], @@ -130,7 +130,7 @@ }, "simulation/gwf_henry/ghb-1": { "__type__": "Ghb", - "_period_data": "329603 chars 373b2c5212ccad37", + "_stress_period_data": "335609 chars 45b6b0f7db21250a", "auxiliary": [ "CONCENTRATION", "DENSITY" @@ -196,7 +196,7 @@ }, "simulation/gwf_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", @@ -245,11 +245,11 @@ }, "simulation/gwf_henry/sto": { "__type__": "Sto", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "n": 1, - "period_data": [ + "stress_period_data": [ "TRANSIENT" ] } @@ -275,9 +275,9 @@ }, "simulation/gwf_henry/wel-1": { "__type__": "Wel", - "_period_data": { + "_stress_period_data": { "0": { - "__table__": "PeriodData", + "__table__": "StressPeriodData", "aux": "float64[40, 1] 1aa0cb9b7917d445", "boundname": "240 chars 65361fa17dffc6e6", "cellid": "int64[40, 3] 6cbd93e97319537a", @@ -442,7 +442,7 @@ }, "simulation/gwt_henry/oc": { "__type__": "Oc", - "_period_data": { + "_stress_period_data": { "0": [ { "__type__": "Save", diff --git a/test/mf6/test_mf6_adapters.py b/test/mf6/test_mf6_adapters.py index c595b38b9..3bd229858 100644 --- a/test/mf6/test_mf6_adapters.py +++ b/test/mf6/test_mf6_adapters.py @@ -30,13 +30,13 @@ def quickstart_model(): npf = Npf(parent=gwf, save_specific_discharge=True) chd = Chd( parent=gwf, - period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}, ) oc = Oc( parent=gwf, budget_file=f"{name}.bud", head_file=f"{name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) return gwf @@ -74,9 +74,9 @@ def test_flopy3_model(tmp_path): ims.inner_hclose = 1e-6 ims.inner_rclose = 0.1000000 ic = Ic(dims=dims) - oc = Oc(dims=dims, period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}) + oc = Oc(dims=dims, stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}) npf = Npf(dims=dims) - chd = Chd(name="north", dims=dims, period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}) + chd = Chd(name="north", dims=dims, stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}) gwf = Gwf( dis=dis, @@ -361,14 +361,14 @@ def test_flopy3_list_data(tmp_path): from flopy.export.utils import mflist_export, package_export from flopy.plot import PlotMapView - S = Chd.PeriodData + S = Chd.StressPeriodData dims = {"nlay": 2, "nrow": 3, "ncol": 4, "nper": 4} chd = Chd( name="c", auxiliary=["conc"], boundnames=True, dims=dims, - period_data={ + stress_period_data={ # a repeated cell, averaged; period 1 repeats period 0 0: [ S(cellid=(0, 1, 2), head=1.0, aux=(5.0,), boundname="a"), diff --git a/test/mf6/test_mf6_codec.py b/test/mf6/test_mf6_codec.py index 99ff84a45..aed07e987 100644 --- a/test/mf6/test_mf6_codec.py +++ b/test/mf6/test_mf6_codec.py @@ -317,7 +317,7 @@ def test_load_bare_exponents(tmp_path): "BEGIN DIMENSIONS\n MAXBOUND 1\nEND DIMENSIONS\n" "BEGIN PERIOD 1\n 1 1 1 1.0+1\nEND PERIOD\n" ) - (row,) = Chd.load(path, context=context).period_data[0] + (row,) = Chd.load(path, context=context).stress_period_data[0] assert row.head == 10.0 @@ -389,7 +389,7 @@ def test_dumps_sto(): from flopy4.mf6.gwf import Sto sto = Sto( - period_data={ + stress_period_data={ 0: [("TRANSIENT",)], 1: [("STEADY-STATE",)], 2: [("TRANSIENT",)], @@ -422,7 +422,7 @@ def test_dumps_oc(): dims={"nper": 1}, budget_file="test.bud", head_file="test.hds", - period_data={ + stress_period_data={ 0: [ ("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL"), @@ -453,7 +453,7 @@ def test_dumps_oc2(): dims={"nper": 1}, budget_file="test.bud", head_file="test.hds", - period_data={ + stress_period_data={ 0: [ ("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "FIRST"), @@ -802,7 +802,7 @@ def test_evt_segments_round_trip(): from flopy4.mf6.gwf import Evt evt = Evt( - period_data={ + stress_period_data={ 0: [ ((0, 0, 0), 59.0, 0.01, 6.0, (0.5, 0.9), (1.0, 0.7)), ((0, 0, 1), 59.0, "etrate", 6.0, (0.4, "pxdp2"), (0.9, 0.6)), @@ -815,7 +815,7 @@ def test_evt_segments_round_trip(): evt2 = structure_component( raw, Evt, context=LoadContext(dims={"nlay": 1, "nrow": 1, "ncol": 2}) ) - assert evt2.period_data == evt.period_data + assert evt2.stress_period_data == evt.stress_period_data def test_ts_round_trip(): @@ -863,22 +863,24 @@ def ts(name): chd = Chd( auxiliary=["conc"], - period_data={0: [Chd.PeriodData(cellid=(0, 0, 0), head="HeadSeries")]}, + stress_period_data={0: [Chd.StressPeriodData(cellid=(0, 0, 0), head="HeadSeries")]}, ts=[ts("headseries")], filename=function_tmpdir / "gwf.chd", ) chd.write() - chd.period_data = {0: [Chd.PeriodData(cellid=(0, 0, 0), head=1.0, aux=("concseries",))]} + chd.stress_period_data = { + 0: [Chd.StressPeriodData(cellid=(0, 0, 0), head=1.0, aux=("concseries",))] + } with pytest.raises( - ValueError, match=r"period_data: period 0 names .*'concseries'.*\['headseries'\]" + ValueError, match=r"stress_period_data: period 0 names .*'concseries'.*\['headseries'\]" ): chd.write() maw = Maw( packagedata=[(0, 0.1, -10.0, 5.0, "THIEM", 1)], connectiondata=[(0, 0, (0, 0, 0), 0.0, -10.0, 1.0, 0.2)], - period_data={0: [Maw.PeriodData(ifno=0, mawsetting=Maw.Rate(rate="pumping"))]}, + stress_period_data={0: [Maw.StressPeriodData(ifno=0, mawsetting=Maw.Rate(rate="pumping"))]}, filename=function_tmpdir / "gwf.maw", ) with pytest.raises(ValueError, match=r"'pumping'.*none"): @@ -897,7 +899,7 @@ def test_ts_reference_typed(function_tmpdir, monkeypatch): from flopy4.mf6.utl import Ts monkeypatch.chdir(function_tmpdir) - row = Chd.PeriodData(cellid=(0, 0, 0), head="HeadSeries", aux=["conc", "1.5", 2.0]) + row = Chd.StressPeriodData(cellid=(0, 0, 0), head="HeadSeries", aux=["conc", "1.5", 2.0]) assert row.head == TimeSeriesRef("HeadSeries") assert row.aux == (TimeSeriesRef("conc"), 1.5, 2.0) row.aux = (2.0,) @@ -915,11 +917,11 @@ def test_ts_reference_typed(function_tmpdir, monkeypatch): chd = Chd( auxiliary=["conc"], boundnames=True, - period_data={0: [row, ((0, 0, 1), 1.0, "conc", "edge")]}, + stress_period_data={0: [row, ((0, 0, 1), 1.0, "conc", "edge")]}, ts=[ts], filename=function_tmpdir / "gwf.chd", ) - rows = chd.period_data[0] + rows = chd.stress_period_data[0] assert rows[1].aux == (TimeSeriesRef("conc"),) assert rows[1].boundname == "edge" chd.write() @@ -927,12 +929,12 @@ def test_ts_reference_typed(function_tmpdir, monkeypatch): assert ["1", "1", "1", "headseries", "2.0"] in lines assert ["1", "1", "2", "1.0", "conc", "edge"] in lines loaded = Chd.load(function_tmpdir / "gwf.chd") - assert loaded.period_data[0] == rows + assert loaded.stress_period_data[0] == rows df = chd.to_dataframe() assert df["head"].tolist() == [TimeSeriesRef("headseries"), 1.0] chd.from_dataframe(df) - assert chd.period_data[0] == rows + assert chd.stress_period_data[0] == rows def test_series_attributes_from_values(): @@ -957,7 +959,7 @@ def test_series_attributes_from_values(): ["METHODS", "linear", "stepwise"], ["SFAC", 2.0], ] - Chd(period_data={0: [((0, 0, 0), "a")]}, ts=[ts])._check_ts_refs() + Chd(stress_period_data={0: [((0, 0, 0), "a")]}, ts=[ts])._check_ts_refs() tas = Tas(time_series_name="rch", interpolation_method="linear", tas_array={0.0: [1.0]}) assert tas.time_series_name == Tas.TimeSeriesName(time_series_name=("rch",)) @@ -1050,7 +1052,7 @@ def test_union_field_takes_arm_values(): or takes one of its words; anything else raises.""" from flopy4.mf6.gwf import Maw, Oc - row = Maw.PeriodData(ifno=0, mawsetting=("status", "active")) + row = Maw.StressPeriodData(ifno=0, mawsetting=("status", "active")) assert row.mawsetting == Maw.Status(status="active") assert row.to_tokens() == (1, "STATUS", "active") row.mawsetting = ("RATE", -1.0) @@ -1058,7 +1060,7 @@ def test_union_field_takes_arm_values(): assert Oc.Save(rtype="HEAD", ocsetting="all").ocsetting == "ALL" assert Oc.Save(rtype="HEAD", ocsetting=("frequency", 2)).ocsetting == Oc.Frequency(2) with pytest.raises(ValueError, match="no arm"): - Maw.PeriodData(ifno=0, mawsetting=("bogus", 1)) + Maw.StressPeriodData(ifno=0, mawsetting=("bogus", 1)) def test_union_field_rows_from_dicts(): @@ -1068,21 +1070,21 @@ def test_union_field_rows_from_dicts(): from flopy4.mf6.gwt import Lkt maw = Maw( - period_data={ + stress_period_data={ 0: [ {"ifno": 0, "mawsetting": ("rate", -1.0)}, {"ifno": 1, "mawsetting": Maw.Status(status="INACTIVE")}, ] } ) - assert maw.period_data[0] == [ - Maw.PeriodData(ifno=0, mawsetting=Maw.Rate(rate=-1.0)), - Maw.PeriodData(ifno=1, mawsetting=Maw.Status(status="INACTIVE")), + assert maw.stress_period_data[0] == [ + Maw.StressPeriodData(ifno=0, mawsetting=Maw.Rate(rate=-1.0)), + Maw.StressPeriodData(ifno=1, mawsetting=Maw.Status(status="INACTIVE")), ] - lkt = Lkt(period_data={0: [{"ifno": 0, "laksetting": ("concentration", 1.5)}]}) - assert lkt.period_data[0][0].laksetting == Lkt.Concentration(concentration=1.5) + lkt = Lkt(stress_period_data={0: [{"ifno": 0, "laksetting": ("concentration", 1.5)}]}) + assert lkt.stress_period_data[0][0].laksetting == Lkt.Concentration(concentration=1.5) with pytest.raises(ValueError, match="no arm"): - Maw(period_data={0: [{"ifno": 0, "mawsetting": ("bogus", 1)}]}) + Maw(stress_period_data={0: [{"ifno": 0, "mawsetting": ("bogus", 1)}]}) def test_maw_round_trip(): @@ -1097,10 +1099,10 @@ def test_maw_round_trip(): (0, 1, (1, 0, 0), 0.0, -10.0, 1.0, 0.2), (1, 0, (0, 0, 1), 0.0, -10.0, 1.0, 0.2), ], - period_data={ + stress_period_data={ 0: [ - Maw.PeriodData(ifno=0, mawsetting=Maw.Rate(rate=-100.0)), - Maw.PeriodData(ifno=1, mawsetting=Maw.Status(status="INACTIVE")), + Maw.StressPeriodData(ifno=0, mawsetting=Maw.Rate(rate=-100.0)), + Maw.StressPeriodData(ifno=1, mawsetting=Maw.Status(status="INACTIVE")), ] }, ) @@ -1111,7 +1113,7 @@ def test_maw_round_trip(): ) assert maw2.packagedata == maw.packagedata assert maw2.connectiondata == maw.connectiondata - assert maw2.period_data == maw.period_data + assert maw2.stress_period_data == maw.stress_period_data def test_hfb_round_trip(): @@ -1119,14 +1121,16 @@ def test_hfb_round_trip(): from flopy4.mf6.converter.ingress.structure import structure_component from flopy4.mf6.gwf import Hfb - hfb = Hfb(period_data={0: [((0, 0, 0), (0, 0, 1), 0.001), ((0, 1, 0), (0, 1, 1), 0.002)]}) + hfb = Hfb( + stress_period_data={0: [((0, 0, 0), (0, 0, 1), 0.001), ((0, 1, 0), (0, 1, 1), 0.002)]} + ) assert hfb.maxhfb == 2 raw = loads(dumps(unstructure_component(hfb))) assert _numbers(raw["PERIOD 1"][0]) == [1, 1, 1, 1, 1, 2, 0.001] hfb2 = structure_component( raw, Hfb, context=LoadContext(dims={"nlay": 1, "nrow": 2, "ncol": 2}) ) - assert hfb2.period_data == hfb.period_data + assert hfb2.stress_period_data == hfb.stress_period_data def test_uzf_round_trip(): @@ -1139,14 +1143,14 @@ def test_uzf_round_trip(): (0, (0,), 1, 1, 0.001, 1.0, 0.05, 0.25, 0.05, 4.0), (1, (1,), 0, None, 0.001, 1.0, 0.05, 0.25, 0.05, 4.0), ], - period_data={0: [(0, 0.01, 0.001, 2.25, 0.05, 0.0, 0.0, 0.0)]}, + stress_period_data={0: [(0, 0.01, 0.001, 2.25, 0.05, 0.0, 0.0, 0.0)]}, ) raw = loads(dumps(unstructure_component(uzf))) # ivertcon 1 -> 2; None (no underlying cell) -> 0 assert [r[3] for r in _numbers(raw["PACKAGEDATA"])] == [2, 0] uzf2 = structure_component(raw, Uzf, context=LoadContext(dims={"nodes": 2})) assert uzf2.packagedata == uzf.packagedata - assert uzf2.period_data == uzf.period_data + assert uzf2.stress_period_data == uzf.stress_period_data def test_sfr_connections_round_trip(): @@ -1195,9 +1199,9 @@ def test_sfr_diversion_row(): from flopy4.mf6.gwf import Sfr # the row's ifno, then the setting: its keyword, then its own index - row = Sfr.PeriodData(ifno=0, sfrsetting=Sfr.Diversion(idv=1, divflow=0.5)) + row = Sfr.StressPeriodData(ifno=0, sfrsetting=Sfr.Diversion(idv=1, divflow=0.5)) assert row.to_tokens() == (1, "DIVERSION", 2, 0.5) - assert Sfr.PeriodData.from_tokens([1, "diversion", 2, 0.5]) == row + assert Sfr.StressPeriodData.from_tokens([1, "diversion", 2, 0.5]) == row def test_sfr_unconnected_reach_round_trip(): @@ -1305,7 +1309,7 @@ def test_cellid_no_cell_needs_allow_zero(): from flopy4.mf6.gwf import Chd with pytest.raises(ValueError, match="no cellid given"): - Chd.PeriodData(None, 1.0).to_tokens() + Chd.StressPeriodData(None, 1.0).to_tokens() def test_loads_block_header_remark(): @@ -1426,7 +1430,7 @@ def test_dumps_chd(): chd = Chd( save_flows=True, print_input=True, - period_data={0: [((0, 0, 0), 10.0), ((0, 9, 9), 20.0)]}, + stress_period_data={0: [((0, 0, 0), 10.0), ((0, 9, 9), 20.0)]}, ) dumped = dumps(COMPONENT_CONVERTER.unstructure(chd)) @@ -1475,7 +1479,7 @@ def test_chd_spd_input_styles(style): elif style == "list_of_dicts": spd = {0: [{"cellid": (0, 0, 0), "head": 1.0}, {"cellid": (0, 9, 9), "head": 0.0}]} - chd = Chd(period_data=spd) + chd = Chd(stress_period_data=spd) dumped = dumps(COMPONENT_CONVERTER.unstructure(chd)) # All styles must produce the same period block @@ -1486,7 +1490,7 @@ def test_chd_spd_input_styles(style): # Round-trip: reload and verify recarray contents loaded = loads(dumped) chd2 = structure_component(loaded, Chd) - rec = chd2.period_data[0] + rec = chd2.stress_period_data[0] assert len(rec) == 2 assert tuple(rec[0].cellid) == (0, 0, 0) assert float(rec[0].head) == 1.0 @@ -1814,15 +1818,15 @@ def test_wel_empty_period_round_trip(): """ dims = {"nlay": 1, "nrow": 1, "ncol": 2, "ncpl": 2, "nodes": 2} wel = structure_component(loads(text), Wel, context=LoadContext(dims=dims)) - assert list(wel.period_data) == [0, 2] - assert wel.period_data[2] == [] + assert list(wel.stress_period_data) == [0, 2] + assert wel.stress_period_data[2] == [] out = dumps(unstructure_component(wel)) cleared = out.upper().split("BEGIN PERIOD 3")[1].split("END PERIOD")[0] assert cleared.strip() == "" - assert structure_component(loads(out), Wel, context=LoadContext(dims=dims)).period_data == ( - wel.period_data - ) + assert structure_component( + loads(out), Wel, context=LoadContext(dims=dims) + ).stress_period_data == (wel.stress_period_data) def test_dumps_wel(): @@ -1831,7 +1835,7 @@ def test_dumps_wel(): wel = Wel( print_input=True, save_flows=True, - period_data={ + stress_period_data={ 0: [ ((0, 2, 3), -100.0), ((1, 5, 7), -50.0), @@ -1867,7 +1871,7 @@ def test_dumps_drn(): drn = Drn( print_flows=True, - period_data={ + stress_period_data={ 0: [((0, 0, 4), 10.0, 1.0), ((1, 4, 0), 8.0, 2.0)], 1: [((0, 1, 1), 12.0, 1.5), ((0, 2, 3), 9.0, 0.8), ((1, 3, 2), 7.0, 2.2)], }, @@ -1929,7 +1933,7 @@ def test_dumps_chd_2(): rows_bottom = [((0, 19, col), 98.0) for col in range(10, 20)] all_rows = rows_left + rows_right + rows_bottom - chd = Chd(print_input=True, save_flows=True, period_data={0: all_rows}) + chd = Chd(print_input=True, save_flows=True, stress_period_data={0: all_rows}) dumped = dumps(COMPONENT_CONVERTER.unstructure(chd)) print("CHD dump:") @@ -1956,7 +1960,7 @@ def test_dumps_wel_with_aux(): wel = Wel( auxiliary=["well_id"], print_input=True, - period_data={ + stress_period_data={ 0: [ ((0, 1, 2), -75.0, 1.0), ((1, 3, 4), -25.0, 2.0), @@ -1988,7 +1992,7 @@ def test_dumps_wel_double_aux(): wel = Wel( auxiliary=["well_id", "temp"], - period_data={ + stress_period_data={ 0: [ ((0, 1, 2), -75.0, 1.0, 25.0), ] @@ -2229,14 +2233,14 @@ def test_dumps_zero_field_exg(): def test_dumps_gwt_oc_per_period(): - """gwt-oc period_data writes SAVE CONCENTRATION and SAVE BUDGET per period.""" + """gwt-oc stress_period_data writes SAVE CONCENTRATION and SAVE BUDGET per period.""" from flopy4.mf6.gwt.oc import Oc oc = Oc( dims={"nper": 2}, budget_file="gwt.bud", concentration_file="gwt.conc", - period_data={ + stress_period_data={ 0: [("SAVE", "CONCENTRATION", "LAST"), ("SAVE", "BUDGET", "LAST")], 1: [("SAVE", "CONCENTRATION", "ALL")], }, @@ -2255,7 +2259,7 @@ def test_dumps_gwt_oc_wildcard(): oc = Oc( budget_file="gwt.bud", concentration_file="gwt.conc", - period_data={"*": [("SAVE", "CONCENTRATION", "LAST"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={"*": [("SAVE", "CONCENTRATION", "LAST"), ("SAVE", "BUDGET", "ALL")]}, ) dumped = dumps(COMPONENT_CONVERTER.unstructure(oc)) @@ -2264,7 +2268,7 @@ def test_dumps_gwt_oc_wildcard(): def test_dumps_prt_prp_release_setting(): - """prt-prp period release settings write correct MF6 keywords via period_data. + """prt-prp period release settings write correct MF6 keywords via stress_period_data. PRP's `releasesetting` union has no per-row index (unlike LAK/ LKE/SFR) -- the v1 DFN declares it a bare `recarray releasesetting` with @@ -2276,7 +2280,7 @@ def test_dumps_prt_prp_release_setting(): prp = Prp( dims={"nper": 2}, - period_data={ + stress_period_data={ 0: [("FREQUENCY", 2)], 1: [("FIRST",)], }, @@ -2296,13 +2300,13 @@ def test_prt_prp_period_roundtrip(): prp = Prp( dims={"nper": 3}, - period_data={ + stress_period_data={ 0: [("FREQUENCY", 2), "all"], 1: [("FIRST",)], 2: [{"keyword": "last"}, Prp.Steps(steps=(1, 3))], }, ) - assert prp.period_data == { + assert prp.stress_period_data == { 0: [Prp.Frequency(frequency=2), "ALL"], 1: ["FIRST"], 2: ["LAST", Prp.Steps(steps=(1, 3))], @@ -2310,7 +2314,7 @@ def test_prt_prp_period_roundtrip(): text = dumps(unstructure_component(prp)) assert "BEGIN PERIOD 2\n FIRST\nEND PERIOD 2" in text prp2 = structure_component(loads(text), Prp) - assert prp2.period_data == prp.period_data + assert prp2.stress_period_data == prp.stress_period_data def test_union_list_rejects_rows_no_arm_takes(): @@ -2319,9 +2323,9 @@ def test_union_list_rejects_rows_no_arm_takes(): from flopy4.mf6.prt.prp import Prp with pytest.raises(ValueError, match="no arm"): - Prp(dims={"nper": 1}, period_data={0: ["bogus"]}) + Prp(dims={"nper": 1}, stress_period_data={0: ["bogus"]}) with pytest.raises(ValueError, match="no arm"): - Prp(dims={"nper": 1}, period_data={0: [("BOGUS", 1)]}) + Prp(dims={"nper": 1}, stress_period_data={0: [("BOGUS", 1)]}) def test_oc_ocsetting_typed_dispatch(): @@ -2335,7 +2339,7 @@ def test_oc_ocsetting_typed_dispatch(): oc = Oc( dims={"nper": 1}, - period_data={ + stress_period_data={ 0: [ ("SAVE", "BUDGET", "STEPS", 1, 3, 5), ("PRINT", "HEAD", "ALL"), @@ -2346,7 +2350,7 @@ def test_oc_ocsetting_typed_dispatch(): raw = loads(text) oc2 = structure_component(raw, Oc) - spd = oc2.period_data + spd = oc2.stress_period_data assert spd is not None and 0 in spd rows = spd[0] assert len(rows) == 2 @@ -2364,8 +2368,8 @@ def test_oc_ocsetting_from_values_positional(): ocsetting the same way from_tokens does.""" from flopy4.mf6.gwf import Oc - oc = Oc(period_data={0: [("SAVE", "HEAD", "all"), ("PRINT", "BUDGET", "FREQUENCY", 2)]}) - save, print_ = oc.period_data[0] + oc = Oc(stress_period_data={0: [("SAVE", "HEAD", "all"), ("PRINT", "BUDGET", "FREQUENCY", 2)]}) + save, print_ = oc.stress_period_data[0] assert isinstance(save, Oc.Save) assert save.ocsetting == "ALL" assert isinstance(print_.ocsetting, Oc.Frequency) @@ -2378,10 +2382,10 @@ def test_row_flat_or_tupled(): makes room for.""" from flopy4.mf6.gwf import Chd, Wel - chd = Chd(period_data={0: [(0, 0, 0, 1.0), ((0, 0, 1), 2.0)]}) - assert [r.cellid for r in chd.period_data[0]] == [(0, 0, 0), (0, 0, 1)] - wel = Wel(auxiliary=["a", "b"], period_data={0: [(0, 0, 0, -5.0, 0.1, 0.2)]}) - assert wel.period_data[0][0].aux == (0.1, 0.2) + chd = Chd(stress_period_data={0: [(0, 0, 0, 1.0), ((0, 0, 1), 2.0)]}) + assert [r.cellid for r in chd.stress_period_data[0]] == [(0, 0, 0), (0, 0, 1)] + wel = Wel(auxiliary=["a", "b"], stress_period_data={0: [(0, 0, 0, -5.0, 0.1, 0.2)]}) + assert wel.stress_period_data[0][0].aux == (0.1, 0.2) def test_row_ambiguous_widths_raise(): @@ -2400,10 +2404,10 @@ def test_row_boundname_sets_option(): boundname, whatever its type, and the package then sets BOUNDNAMES.""" from flopy4.mf6.gwf import Wel - wel = Wel(period_data={0: [((0, 0, 0), -5.0, 5)]}) - assert wel.period_data[0][0].boundname == "5" + wel = Wel(stress_period_data={0: [((0, 0, 0), -5.0, 5)]}) + assert wel.stress_period_data[0][0].boundname == "5" assert wel.boundnames - assert not Wel(period_data={0: [((0, 0, 0), -5.0)]}).boundnames + assert not Wel(stress_period_data={0: [((0, 0, 0), -5.0)]}).boundnames @pytest.mark.parametrize("boundnames", [True, False]) @@ -2415,7 +2419,7 @@ def test_row_boundname_by_option(boundnames): from flopy4.mf6.item import RowContext context = RowContext(ncelldim=3, enabled=frozenset({"boundnames"} if boundnames else ())) - row = Wel.PeriodData.from_tokens([1, 1, 1, -5.0, 5], context) + row = Wel.StressPeriodData.from_tokens([1, 1, 1, -5.0, 5], context) assert row.boundname == ("5" if boundnames else None) @@ -2446,7 +2450,7 @@ def test_row_conditional_field_or_boundname(boundnames, surf_rate, tokens, petm0 } ), ) - row = Evt.PeriodData.from_tokens([1, 1, 1, 10.0, 0.001, 2.0, *tokens], context) + row = Evt.StressPeriodData.from_tokens([1, 1, 1, 10.0, 0.001, 2.0, *tokens], context) assert (row.petm0, row.boundname) == (petm0, boundname) @@ -2455,17 +2459,17 @@ def test_row_conditional_field_sets_option(): needs to read it; then a row's last value is its boundname.""" from flopy4.mf6.gwf import Evt - evt = Evt(period_data={0: [((0, 0, 0), 10.0, 0.001, 2.0, 0.5)]}) - assert evt.period_data[0][0].petm0 == 0.5 + evt = Evt(stress_period_data={0: [((0, 0, 0), 10.0, 0.001, 2.0, 0.5)]}) + assert evt.stress_period_data[0][0].petm0 == 0.5 assert evt.surf_rate_specified - assert not Evt(period_data={0: [((0, 0, 0), 10.0, 0.001, 2.0)]}).surf_rate_specified + assert not Evt(stress_period_data={0: [((0, 0, 0), 10.0, 0.001, 2.0)]}).surf_rate_specified evt = Evt( boundnames=True, surf_rate_specified=True, - period_data={0: [((0, 0, 0), 10.0, 0.001, 2.0, 0.5, 7)]}, + stress_period_data={0: [((0, 0, 0), 10.0, 0.001, 2.0, 0.5, 7)]}, ) - row = evt.period_data[0][0] + row = evt.stress_period_data[0][0] assert (row.petm0, row.boundname) == (0.5, "7") @@ -2491,7 +2495,7 @@ def test_evt_load_petm0_without_boundname(): END PERIOD 1 """ evt = structure_component(loads(text), Evt) - rows = evt.period_data[0] + rows = evt.stress_period_data[0] assert [(r.petm0, r.boundname) for r in rows] == [(0.5, None), (0.25, "well")] @@ -2533,8 +2537,8 @@ def test_union_rows_as_each_row_reads(): [3, "auxiliary", "conc", 1.5], [4, "upstream_fraction", 0.5], ] - items = Sfr.PeriodData.from_rows(rows, context) - assert items == [Sfr.PeriodData.from_tokens(row, context) for row in rows] + items = Sfr.StressPeriodData.from_rows(rows, context) + assert items == [Sfr.StressPeriodData.from_tokens(row, context) for row in rows] assert [type(item.sfrsetting).__name__ for item in items] == [ "Inflow", "Rainfall", @@ -2609,7 +2613,7 @@ def test_table_declines(item_cls, text): from flopy4.mf6.item import RowContext from flopy4.mf6.item_table import read_rows - cls = {"Riv": Riv.PeriodData, "Gnc": Gnc.Gncdata}[item_cls] + cls = {"Riv": Riv.StressPeriodData, "Gnc": Gnc.Gncdata}[item_cls] context = RowContext(ncelldim=1, sizes={"auxiliary": 0, "numalphaj": 1}) assert read_rows(cls, text, context) is None @@ -2676,7 +2680,7 @@ def test_table_rows(): from flopy4.mf6.item import RowContext from flopy4.mf6.item_table import read_rows - cls = Riv.PeriodData + cls = Riv.StressPeriodData text = "1 5 1.0 2.0 0.5\n2 7 3.0 4.0 0.25\n" context = RowContext(ncelldim=2, sizes={"auxiliary": 0}) table = read_rows(cls, text, context) @@ -2708,11 +2712,13 @@ def test_package_rows_as_table(): from flopy4.mf6.gwf import Riv from flopy4.mf6.item_table import ItemTable - riv = Riv(period_data={0: [((0, 0, 0), 1.0, 2.0, 0.5, "b")]}) - rows = riv.period_data[0] + riv = Riv(stress_period_data={0: [((0, 0, 0), 1.0, 2.0, 0.5, "b")]}) + rows = riv.stress_period_data[0] assert isinstance(rows, ItemTable) assert riv.boundnames - assert rows[0] == Riv.PeriodData(cellid=(0, 0, 0), stage=1.0, cond=2.0, rbot=0.5, boundname="b") + assert rows[0] == Riv.StressPeriodData( + cellid=(0, 0, 0), stage=1.0, cond=2.0, rbot=0.5, boundname="b" + ) @pytest.mark.parametrize("boundname", [None, "b"]) @@ -2721,12 +2727,14 @@ def test_row_positional_trailing_boundname(boundname): not, rather than another value of the aux array before it.""" from flopy4.mf6.gwf import Evt, Wel - wel = Wel(period_data={0: [((0, 0, 0), 1.0, (), boundname)]}) - assert wel.period_data[0][0] == Wel.PeriodData(cellid=(0, 0, 0), q=1.0, boundname=boundname) + wel = Wel(stress_period_data={0: [((0, 0, 0), 1.0, (), boundname)]}) + assert wel.stress_period_data[0][0] == Wel.StressPeriodData( + cellid=(0, 0, 0), q=1.0, boundname=boundname + ) row = ((0, 0, 0), 10.0, 0.001, 2.0, (0.3, 0.6), (0.7, 0.4), None, (), boundname) - evt = Evt(period_data={0: [row]}) - assert evt.period_data[0][0].aux == () - assert evt.period_data[0][0].boundname == boundname + evt = Evt(stress_period_data={0: [row]}) + assert evt.stress_period_data[0][0].aux == () + assert evt.stress_period_data[0][0].boundname == boundname def test_empty_boundname_is_none(): @@ -2734,9 +2742,9 @@ def test_empty_boundname_is_none(): or without its aux, so None is the only "no boundname".""" from flopy4.mf6.gwf import Wel - assert Wel.PeriodData(cellid=(0, 0, 0), q=1.0, boundname="").boundname is None - wel = Wel(period_data={0: [((0, 0, 0), 1.0, ""), ((0, 0, 1), 1.0, (), "")]}) - assert [r.boundname for r in wel.period_data[0]] == [None, None] + assert Wel.StressPeriodData(cellid=(0, 0, 0), q=1.0, boundname="").boundname is None + wel = Wel(stress_period_data={0: [((0, 0, 0), 1.0, ""), ((0, 0, 1), 1.0, (), "")]}) + assert [r.boundname for r in wel.stress_period_data[0]] == [None, None] @pytest.mark.parametrize( @@ -2787,11 +2795,11 @@ def test_oc_period_string_int_keys(): dims = {"nper": 3} oc_int = Oc( dims=dims, - period_data={0: [("SAVE", "BUDGET", "ALL")], 1: [("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "BUDGET", "ALL")], 1: [("SAVE", "BUDGET", "LAST")]}, ) oc_str = Oc( dims=dims, - period_data={"0": [("SAVE", "BUDGET", "ALL")], "1": [("SAVE", "BUDGET", "LAST")]}, + stress_period_data={"0": [("SAVE", "BUDGET", "ALL")], "1": [("SAVE", "BUDGET", "LAST")]}, ) pb_int = _period_blocks(oc_int) @@ -2809,7 +2817,9 @@ def test_oc_period_wildcard_fillforward(): from flopy4.mf6.gwf import Oc oc = Oc( - period_data={i: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "LAST")] for i in range(4)}, + stress_period_data={ + i: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "LAST")] for i in range(4) + }, ) pb = _period_blocks(oc) @@ -2824,7 +2834,7 @@ def test_oc_period_steps_syntax(): oc = Oc( dims={"nper": 2}, - period_data={ + stress_period_data={ 0: [("SAVE", "BUDGET", "STEPS", 1, 3, 5), ("PRINT", "BUDGET", "STEPS", 1)], 1: [("PRINT", "BUDGET", "LAST")], }, @@ -2840,13 +2850,13 @@ def test_oc_period_steps_syntax(): def test_oc_period_stop_sentinel(): """Omitting a setting from a later period's list is how it "stops" -- - no special empty-string sentinel needed under period_data, unlike + no special empty-string sentinel needed under stress_period_data, unlike the old per-rtype dict API. Matches every other stress-period-data package's semantics: each kper's list is exactly what gets written.""" from flopy4.mf6.gwf import Oc oc = Oc( - period_data={ + stress_period_data={ 0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "STEPS", 1)], 1: [("SAVE", "HEAD", "ALL")], 2: [("SAVE", "HEAD", "ALL")], @@ -2869,7 +2879,7 @@ def test_oc_period_mixed_keys_no_silent_drop(): oc = Oc( dims={"nper": 3}, - period_data={ + stress_period_data={ "0": [("SAVE", "HEAD", "FIRST")], 1: [("SAVE", "HEAD", "LAST")], 2: [("SAVE", "HEAD", "ALL")], @@ -2889,7 +2899,7 @@ def test_oc_dumps_steps_in_output(): oc = Oc( budget_file="t.bud", head_file="t.hds", - period_data={ + stress_period_data={ 0: [ ("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "STEPS", 1, 5), @@ -2915,7 +2925,7 @@ def test_oc_period_frequency(): from flopy4.mf6.gwf import Oc oc = Oc( - period_data={ + stress_period_data={ 0: [("SAVE", "HEAD", "FREQUENCY", 2), ("SAVE", "BUDGET", "ALL")], 1: [("SAVE", "HEAD", "FREQUENCY", 2)], 2: [("SAVE", "HEAD", "FREQUENCY", 2)], @@ -2946,7 +2956,7 @@ def test_lak_period_lake_keywords(): from flopy4.mf6.gwf.lak import Lak lak = Lak( - period_data={ + stress_period_data={ 0: [ (0, "STATUS", "ACTIVE"), (1, "STATUS", "CONSTANT"), @@ -2970,7 +2980,7 @@ def test_lak_period_outlet_keywords(): from flopy4.mf6.gwf.lak import Lak lak = Lak( - period_data={ + stress_period_data={ 0: [ (0, "RATE", 100.0), (1, "RATE", 200.0), @@ -2994,7 +3004,7 @@ def test_lak_period_dumps(): from flopy4.mf6.gwf.lak import Lak lak = Lak( - period_data={ + stress_period_data={ 0: [ (0, "STATUS", "ACTIVE"), (1, "STATUS", "CONSTANT"), @@ -3382,7 +3392,7 @@ def test_ssm_fileinput_children(tmp_path): assert isinstance(wel.spc, Spc) and wel.mixed assert isinstance(rch.spc, Spca) assert wel.spc.filename == Path("wel.spc") - assert [r.spcsetting.concentration for r in wel.spc.period_data[0]] == [100.0] + assert [r.spcsetting.concentration for r in wel.spc.stress_period_data[0]] == [100.0] assert sorted(ssm._children) == ["spc-1", "spc-2"] assert wel.spc.parent is ssm @@ -3413,8 +3423,8 @@ def test_sfr_period_cross_section_children(tmp_path, monkeypatch): ) sfr = Sfr.load(tmp_path / "gwf.sfr", dims={"nlay": 1, "nrow": 1, "ncol": 1}) a = sfr.crosssections[0].sfrtab - (b_row,) = (r.sfrsetting for r in sfr.period_data[1]) - (a_row,) = (r.sfrsetting for r in sfr.period_data[2]) + (b_row,) = (r.sfrsetting for r in sfr.stress_period_data[1]) + (a_row,) = (r.sfrsetting for r in sfr.stress_period_data[2]) assert isinstance(b_row.sfrtab, Sfrtab) assert b_row.sfrtab.filename == Path("b.tab") assert b_row.sfrtab.table[0].height == 2.0 @@ -3614,7 +3624,7 @@ def test_lak_status_input(): "connlen": np.zeros(nconn), "connwidth": np.zeros(nconn), }, - period_data={ + stress_period_data={ 0: [(0, "RAINFALL", 0.1)], 1: [(0, "STATUS", "inactive")], 2: [(0, "STATUS", "active")], @@ -3816,7 +3826,7 @@ def test_lak_period_roundtrip(): lak = Lak( nlakes=2, - period_data={ + stress_period_data={ 0: [ (0, "STATUS", "ACTIVE"), (0, "RAINFALL", 0.1), @@ -3842,7 +3852,7 @@ def test_lak_period_roundtrip(): raw = loads(text) lak2 = structure_component(raw, Lak) - spd = lak2.period_data + spd = lak2.stress_period_data assert spd is not None assert set(spd.keys()) == {0, 1, 2} @@ -3998,7 +4008,7 @@ def test_lkt_period_keywords(): from flopy4.mf6.gwt.lkt import Lkt lkt = Lkt( - period_data={ + stress_period_data={ 0: [ (0, "STATUS", "ACTIVE"), (1, "STATUS", "CONSTANT"), @@ -4021,7 +4031,7 @@ def test_lkt_period_dumps(): from flopy4.mf6.gwt.lkt import Lkt lkt = Lkt( - period_data={ + stress_period_data={ 0: [ (0, "STATUS", "ACTIVE"), (1, "STATUS", "CONSTANT"), @@ -4044,7 +4054,7 @@ def test_lkt_period_roundtrip(): from flopy4.mf6.gwt.lkt import Lkt lkt = Lkt( - period_data={ + stress_period_data={ 0: [ (0, "STATUS", "ACTIVE"), (1, "STATUS", "CONSTANT"), @@ -4059,7 +4069,7 @@ def test_lkt_period_roundtrip(): raw = loads(text) lkt2 = structure_component(raw, Lkt) - spd = lkt2.period_data + spd = lkt2.stress_period_data assert spd is not None assert set(spd.keys()) == {0, 1} @@ -4114,7 +4124,7 @@ def test_lke_period_keywords(): from flopy4.mf6.gwe.lke import Lke lke = Lke( - period_data={ + stress_period_data={ 0: [ (0, "STATUS", "ACTIVE"), (1, "STATUS", "CONSTANT"), @@ -4137,7 +4147,7 @@ def test_lke_period_dumps(): from flopy4.mf6.gwe.lke import Lke lke = Lke( - period_data={ + stress_period_data={ 0: [ (0, "TEMPERATURE", 18.5), ] @@ -4155,7 +4165,7 @@ def test_lke_period_roundtrip(): from flopy4.mf6.gwe.lke import Lke lke = Lke( - period_data={ + stress_period_data={ 0: [ (0, "STATUS", "ACTIVE"), (1, "STATUS", "CONSTANT"), @@ -4170,7 +4180,7 @@ def test_lke_period_roundtrip(): raw = loads(text) lke2 = structure_component(raw, Lke) - spd = lke2.period_data + spd = lke2.stress_period_data assert spd is not None assert set(spd.keys()) == {0, 1} @@ -4269,7 +4279,7 @@ def test_chd_period_roundtrip(): from flopy4.mf6.gwf import Chd chd = Chd( - period_data={ + stress_period_data={ 0: [((0, 0, 0), 10.0), ((0, 9, 9), 0.0)], } ) @@ -4278,7 +4288,7 @@ def test_chd_period_roundtrip(): raw = loads(text) chd2 = structure_component(raw, Chd) - spd = chd2.period_data + spd = chd2.stress_period_data assert spd is not None and 0 in spd rows = spd[0] head_by_cellid = {tuple(rows[i].cellid): float(rows[i].head) for i in range(len(rows))} @@ -4293,7 +4303,7 @@ def test_chd_period_multi_stress_period_roundtrip(): from flopy4.mf6.gwf import Chd chd = Chd( - period_data={ + stress_period_data={ 0: [((0, 0, 0), 10.0), ((0, 4, 4), 5.0)], 1: [((0, 0, 0), 8.0), ((0, 4, 4), 3.0)], } @@ -4303,7 +4313,7 @@ def test_chd_period_multi_stress_period_roundtrip(): raw = loads(text) chd2 = structure_component(raw, Chd) - spd = chd2.period_data + spd = chd2.stress_period_data assert spd is not None for kper, expected in { 0: {(0, 0, 0): 10.0, (0, 4, 4): 5.0}, @@ -4354,7 +4364,7 @@ def test_structure_component_reads_binary_period_rows_without_aux(tmp_path): context = LoadContext(workspace=tmp_path, dims={"nlay": 1, "nrow": 2, "ncol": 2}) chd = structure_component(raw, Chd, context=context) - rows = chd.period_data[0] + rows = chd.stress_period_data[0] assert len(rows) == 2 assert tuple(rows[0].cellid) == (0, 0, 0) assert rows[0].head == pytest.approx(1.0) @@ -4374,7 +4384,7 @@ def test_structure_component_reads_binary_period_rows_with_aux(tmp_path): context = LoadContext(workspace=tmp_path, dims={"nlay": 1, "nrow": 2, "ncol": 2}) chd = structure_component(raw, Chd, context=context) - rows = chd.period_data[0] + rows = chd.stress_period_data[0] assert len(rows) == 2 assert tuple(rows[0].cellid) == (0, 0, 0) assert rows[0].head == pytest.approx(1.0) @@ -4389,9 +4399,9 @@ def test_binary_list_row_spec_rejects_complex_layout(): from flopy4.mf6.gwf import Maw context = LoadContext(dims={"nlay": 1, "nrow": 1, "ncol": 1}) - # MAW's period_data row has a union field (mawsetting) -- + # MAW's stress_period_data row has a union field (mawsetting) -- # not representable in MF6's fixed-width binary list format - assert _binary_list_row_spec(Maw.PeriodData, context, {}) is None + assert _binary_list_row_spec(Maw.StressPeriodData, context, {}) is None def test_binary_list_row_spec_simple_chd(): @@ -4400,13 +4410,13 @@ def test_binary_list_row_spec_simple_chd(): context = LoadContext(dims={"nlay": 1, "nrow": 1, "ncol": 1}) # cellid (3 ints), head (1 double), aux (1 double, from sizes) - assert _binary_list_row_spec(Chd.PeriodData, context, {"auxiliary": 1}) == [ + assert _binary_list_row_spec(Chd.StressPeriodData, context, {"auxiliary": 1}) == [ (" single _period_data field with a period item class - assert "PeriodData" in {ic.class_name for ic in spec.item_classes} - assert "_period_data" in field_map - spd_field = field_map["_period_data"] - assert spd_field.type_annotation == "Optional[dict[int, list[PeriodData]]]" + # Period data -> single _stress_period_data field with a period item class + assert "StressPeriodData" in {ic.class_name for ic in spec.item_classes} + assert "_stress_period_data" in field_map + spd_field = field_map["_stress_period_data"] + assert spd_field.type_annotation == "Optional[dict[int, list[StressPeriodData]]]" # Packages block → single list field assert "packages" in field_map @@ -1482,7 +1482,7 @@ def test_oc_tier_generates_importable_files(tmp_path, all_dfns): assert arm_names.count("Frequency") == 1, ( f"{dfn_name}: ocsetting arms must not be duplicated" ) - (period_union,) = [u for u in spec.item_unions if u.alias == "_PeriodDataItem"] + (period_union,) = [u for u in spec.item_unions if u.alias == "_StressPeriodDataItem"] top_level_names = set(period_union.members) assert top_level_names == {"Save", "Print"}, ( f"{dfn_name}: only Save/Print may be top_level (dispatch union) arms" @@ -1540,7 +1540,7 @@ def test_aux_columns_follow_dfn(): from flopy4.mf6.gwf import Buy, Lak, Wel - assert attrs.fields_dict(Wel.PeriodData)["aux"].metadata["shape"] == ("auxiliary",) + assert attrs.fields_dict(Wel.StressPeriodData)["aux"].metadata["shape"] == ("auxiliary",) assert attrs.fields_dict(Lak.Packagedata)["aux"].metadata["shape"] == ("auxiliary",) # BUY has no AUXILIARY option and its packagedata no aux column assert "aux" not in attrs.fields_dict(Buy.Packagedata) @@ -1553,7 +1553,7 @@ def test_sized_column_from_tokens(): tokens = [1, 2, 3, -5.0, 0.1, 0.2, "well1"] context = RowContext(ncelldim=3, sizes={"auxiliary": 2}, enabled=frozenset({"boundnames"})) - item = Wel.PeriodData.from_tokens(tokens, context) + item = Wel.StressPeriodData.from_tokens(tokens, context) assert item.cellid == (0, 1, 2) assert item.q == -5.0 assert item.aux == (0.1, 0.2) @@ -1572,7 +1572,7 @@ def test_optional_leading_columns(tokens, mnames): """MVR's optional model name columns come before its required ones.""" from flopy4.mf6.gwf import Mvr - item = Mvr.PeriodData.from_tokens(tokens) + item = Mvr.StressPeriodData.from_tokens(tokens) assert (item.mname1, item.mname2) == mnames assert (item.pname1, item.id1, item.pname2, item.id2) == ("sfr-1", 7, "sfr-2", 0) assert (item.mvrtype, item.value) == ("FACTOR", 1.0) @@ -1656,9 +1656,9 @@ def test_number_or_word_in_union_arm(): """MAW's HEAD_LIMIT takes OFF or a number.""" from flopy4.mf6.gwf import Maw - off = Maw.PeriodData.from_tokens([1, "head_limit", "off"]) + off = Maw.StressPeriodData.from_tokens([1, "head_limit", "off"]) assert (off.ifno, off.mawsetting) == (0, Maw.HeadLimit(head_limit="OFF")) - limit = Maw.PeriodData.from_tokens([1, "HEAD_LIMIT", 2.5]) + limit = Maw.StressPeriodData.from_tokens([1, "HEAD_LIMIT", 2.5]) assert limit.mawsetting.head_limit == 2.5 assert limit.to_tokens() == (1, "HEAD_LIMIT", 2.5) @@ -1680,7 +1680,7 @@ def test_number_or_word_validated(): def test_legacy_period_kwargs_match_dfns(all_dfns): """flopy3 names a period list after its v1 DFN field. Where the DFNs still give that name, it's the legacy keyword. Once they name every - list period_data, the table stands on its own.""" + list stress_period_data, the table stands on its own.""" from flopy4.mf6.utils.codegen import filters from flopy4.mf6.utils.codegen.make import _LEGACY_PERIOD_KWARGS @@ -1697,11 +1697,11 @@ def test_legacy_period_kwargs_match_dfns(all_dfns): def test_legacy_kwargs_spec(all_dfns): lak = build_component_spec(all_dfns["gwf-lak"], root=Path("."), dfns=all_dfns) - assert lak.legacy_kwargs == {"perioddata": 'Legacy("period_data")'} + assert lak.legacy_kwargs == {"perioddata": 'Legacy("stress_period_data")'} oc = build_component_spec(all_dfns["gwf-oc"], root=Path("."), dfns=all_dfns) assert oc.legacy_kwargs == { - "saverecord": 'Legacy("period_data", oc_period_data)', - "printrecord": 'Legacy("period_data", oc_period_data)', + "saverecord": 'Legacy("stress_period_data", oc_period_data)', + "printrecord": 'Legacy("stress_period_data", oc_period_data)', } assert "from flopy4.mf6.legacy import Legacy, oc_period_data" in oc.imports["flopy4"] ic = build_component_spec(all_dfns["gwf-ic"], root=Path("."), dfns=all_dfns) diff --git a/test/mf6/test_mf6_component.py b/test/mf6/test_mf6_component.py index 51f0b8c09..4b559fcf4 100644 --- a/test/mf6/test_mf6_component.py +++ b/test/mf6/test_mf6_component.py @@ -276,7 +276,7 @@ def test_init_sim_explicit_dims(): oc = Oc(dims=dims) npf = Npf(dims=dims) chd = Chd( - period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}, + stress_period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}, ) gwf = Gwf( dis=dis, @@ -364,7 +364,7 @@ def test_sim_children_setitem_delitem(): def _wel(**kwargs): from flopy4.mf6.gwf import Wel - return Wel(period_data={0: [((0, 0, 0), -1.0)]}, **kwargs) + return Wel(stress_period_data={0: [((0, 0, 0), -1.0)]}, **kwargs) def test_child_names_by_class(): @@ -646,8 +646,8 @@ def test_unresolvable_dimensions_raise_on_write(function_tmpdir): def test_bad_period_key_raises_on_write(function_tmpdir, kper, match): from flopy4.mf6.gwf import Wel - sim = _wel_sim(function_tmpdir, [Wel(period_data={kper: [((0, 0, 0), -1.0)]})]) - with pytest.raises(ValueError, match=f"Wel.period_data: {match}"): + sim = _wel_sim(function_tmpdir, [Wel(stress_period_data={kper: [((0, 0, 0), -1.0)]})]) + with pytest.raises(ValueError, match=f"Wel.stress_period_data: {match}"): sim.write() @@ -656,8 +656,10 @@ def test_period_key_past_nper_warns_on_write(function_tmpdir): this is a warning, not an error -- see Package._check_periods.""" from flopy4.mf6.gwf import Wel - sim = _wel_sim(function_tmpdir, [Wel(period_data={1: [((0, 0, 0), -1.0)]})]) - with pytest.warns(UserWarning, match=r"Wel.period_data: MF6 period 2 is past NPER \(1\)"): + sim = _wel_sim(function_tmpdir, [Wel(stress_period_data={1: [((0, 0, 0), -1.0)]})]) + with pytest.warns( + UserWarning, match=r"Wel.stress_period_data: MF6 period 2 is past NPER \(1\)" + ): sim.write() @@ -673,7 +675,7 @@ def test_period_array_past_nper_warns_on_write(function_tmpdir): def test_period_key_numpy_integer_writes(function_tmpdir): from flopy4.mf6.gwf import Wel - wel = Wel(period_data={np.int64(0): [((0, 0, 0), -1.0)]}) + wel = Wel(stress_period_data={np.int64(0): [((0, 0, 0), -1.0)]}) _wel_sim(function_tmpdir, [wel]).write() assert "BEGIN PERIOD 1" in (function_tmpdir / "model.wel-1.wel").read_text() @@ -1255,7 +1257,7 @@ def test_init_big_sim(): npf = Npf(parent=gwf) chd = Chd( parent=gwf, - period_data={0: [[(0, 0, 0), 1.0], [(0, 9999, 9999), 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 9999, 9999), 0.0]]}, ) assert sim["gwf-1"] is gwf @@ -1269,7 +1271,7 @@ def test_init_big_sim(): assert sim["gwf-1"].npf.k == 1.0 # SPD is a recarray with only 2 rows — no full-grid allocation - spd = chd.period_data[0] + spd = chd.stress_period_data[0] assert len(spd) == 2 assert tuple(spd[0].cellid) == (0, 0, 0) assert float(spd[0].head) == 1.0 @@ -1313,7 +1315,7 @@ def test_write_ascii(function_tmpdir): ic = Ic(parent=gwf) oc = Oc(parent=gwf) npf = Npf(parent=gwf) - chd = Chd(parent=gwf, period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}) + chd = Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}) sim.write() @@ -1340,13 +1342,13 @@ def test_to_dict_fields(): "nodes": grid.nnodes, } - chd = Chd(dims=dims, period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}) + chd = Chd(dims=dims, stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}) result = chd.to_dict() - assert "period_data" in result - assert 0 in result["period_data"] - assert result["period_data"][0][0].head == 1.0 - assert result["period_data"][0][1].head == 0.0 + assert "stress_period_data" in result + assert 0 in result["stress_period_data"] + assert result["stress_period_data"][0][0].head == 1.0 + assert result["stress_period_data"][0][1].head == 0.0 npf = Npf(dims=dims, k=5.0) result = npf.to_dict() @@ -1372,7 +1374,7 @@ def test_to_dict_blocks(): chd = Chd( dims=dims, print_flows=True, - period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}, ) result = chd.to_dict(blocks=True) @@ -1380,9 +1382,9 @@ def test_to_dict_blocks(): assert "period" in result assert "print_flows" in result["options"] assert result["options"]["print_flows"] is True - assert "period_data" in result["period"] - assert result["period"]["period_data"][0][0].head == 1.0 - assert result["period"]["period_data"][0][1].head == 0.0 + assert "stress_period_data" in result["period"] + assert result["period"]["stress_period_data"][0][0].head == 1.0 + assert result["period"]["stress_period_data"][0][1].head == 0.0 npf = Npf(dims=dims, save_flows=True, k=2.0) result = npf.to_dict(blocks=True) @@ -2285,9 +2287,9 @@ def test_several_packages_of_a_type_default_filenames(): """Several packages of one type get a file each, named for the package; adding one doesn't change the others'.""" gwf = Gwf(name="gwf") - chd = Chd(parent=gwf, period_data={0: [((0, 0, 0), 1.0)]}) + chd = Chd(parent=gwf, stress_period_data={0: [((0, 0, 0), 1.0)]}) assert chd.default_filename() == "gwf.chd-1.chd" - chd2 = Chd(parent=gwf, period_data={0: [((0, 0, 1), 0.0)]}) + chd2 = Chd(parent=gwf, stress_period_data={0: [((0, 0, 1), 0.0)]}) assert chd.default_filename() == "gwf.chd-1.chd" assert chd2.default_filename() == "gwf.chd-2.chd" @@ -3421,7 +3423,7 @@ def make(head): dis=Dis(nlay=1, nrow=1, ncol=3, top=1.0, botm=[0.0], idomain=1), npf=Npf(k=2.0), ic=Ic(strt=1.0), - chd=[Chd(period_data={0: [[(0, 0, 0), head]]})], + chd=[Chd(stress_period_data={0: [[(0, 0, 0), head]]})], ) return Simulation(tdis=Tdis(nper=1), models=[gwf], solutiongroup=[Ims(name="ims")]) diff --git a/test/mf6/test_mf6_external_arrays.py b/test/mf6/test_mf6_external_arrays.py index 762a07aec..11bccdd47 100644 --- a/test/mf6/test_mf6_external_arrays.py +++ b/test/mf6/test_mf6_external_arrays.py @@ -477,8 +477,8 @@ def _sim(workspace: Path) -> Simulation: gwf = Gwf(parent=sim, name="gwf", dis=dis) Ic(parent=gwf, strt=10.0) Npf(parent=gwf, k=np.linspace(1.0, 2.0, 24), icelltype=0) - Chd(parent=gwf, period_data={0: [[(0, 0, 0), 10.0], [(1, 2, 3), 2.0]]}) - Oc(parent=gwf, head_file="gwf.hds", period_data={0: [("SAVE", "HEAD", "LAST")]}) + Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 10.0], [(1, 2, 3), 2.0]]}) + Oc(parent=gwf, head_file="gwf.hds", stress_period_data={0: [("SAVE", "HEAD", "LAST")]}) return sim diff --git a/test/mf6/test_mf6_external_lists.py b/test/mf6/test_mf6_external_lists.py index 698943cf8..dc516af4e 100644 --- a/test/mf6/test_mf6_external_lists.py +++ b/test/mf6/test_mf6_external_lists.py @@ -36,7 +36,7 @@ def _chd_rows(path: Path) -> list: def _chd(tmp_path: Path, **kwargs) -> Chd: chd = Chd( auxiliary=["c"], - period_data={ + stress_period_data={ 0: [[(0, 0, 0), 10.0, 1.5], [(0, 0, 2), 2.0, 2.5]], 2: [[(0, 0, 2), 3.0, 0.0]], }, @@ -53,30 +53,30 @@ def test_list_format_binary_writes_period_files(tmp_path): chd = _chd(tmp_path) chd.write(context=WriteContext(list_format="binary")) assert _lines(chd.path, "OPEN/CLOSE") == [ - "OPEN/CLOSE m_chd_period_data_p1.bin (BINARY)", - "OPEN/CLOSE m_chd_period_data_p3.bin (BINARY)", + "OPEN/CLOSE m_chd_stress_period_data_p1.bin (BINARY)", + "OPEN/CLOSE m_chd_stress_period_data_p3.bin (BINARY)", ] - assert _chd_rows(tmp_path / "m_chd_period_data_p1.bin") == [ + assert _chd_rows(tmp_path / "m_chd_stress_period_data_p1.bin") == [ ((1, 1, 1), 10.0, 1.5), ((1, 1, 3), 2.0, 2.5), ] again = Chd.load(chd.path, dims=DIMS, context=LoadContext(workspace=tmp_path)) - assert again.period_data == chd.period_data + assert again.stress_period_data == chd.stress_period_data def test_list_format_open_close_writes_text_files(tmp_path): chd = _chd(tmp_path) chd.write(context=WriteContext(list_format="open/close")) assert _lines(chd.path, "OPEN/CLOSE") == [ - "OPEN/CLOSE m_chd_period_data_p1.txt", - "OPEN/CLOSE m_chd_period_data_p3.txt", + "OPEN/CLOSE m_chd_stress_period_data_p1.txt", + "OPEN/CLOSE m_chd_stress_period_data_p3.txt", ] - assert (tmp_path / "m_chd_period_data_p1.txt").read_text().splitlines() == [ + assert (tmp_path / "m_chd_stress_period_data_p1.txt").read_text().splitlines() == [ "1 1 1 10.0 1.5", "1 1 3 2.0 2.5", ] again = Chd.load(chd.path, dims=DIMS, context=LoadContext(workspace=tmp_path)) - assert again.period_data == chd.period_data + assert again.stress_period_data == chd.stress_period_data def test_list_io_path_and_format(tmp_path): @@ -87,16 +87,16 @@ def test_list_io_path_and_format(tmp_path): context=WriteContext( list_format="internal", lists={ - ("period_data", 0): ListIO(path="p1.dat"), - ("period_data", 2): ListIO(format="binary"), + ("stress_period_data", 0): ListIO(path="p1.dat"), + ("stress_period_data", 2): ListIO(format="binary"), }, ) ) assert _lines(chd.path, "OPEN/CLOSE") == [ "OPEN/CLOSE p1.dat", - "OPEN/CLOSE m_chd_period_data_p3.bin (BINARY)", + "OPEN/CLOSE m_chd_stress_period_data_p3.bin (BINARY)", ] - chd.write(context=WriteContext(lists={"period_data": ListIO(format="open/close")})) + chd.write(context=WriteContext(lists={"stress_period_data": ListIO(format="open/close")})) assert len(_lines(chd.path, "OPEN/CLOSE")) == 2 @@ -106,7 +106,7 @@ def test_binary_threshold(tmp_path): chd = _chd(tmp_path) chd.write(context=WriteContext(list_format="binary", binary_threshold=28)) assert _lines(chd.path, "OPEN/CLOSE") == [ - "OPEN/CLOSE m_chd_period_data_p1.bin (BINARY)", + "OPEN/CLOSE m_chd_stress_period_data_p1.bin (BINARY)", ] @@ -153,12 +153,12 @@ def test_load_records_list_files(loaded_chd): chd, _ = loaded_chd lists = chd.write_context.lists assert lists == { - ("period_data", 0): ListIO(path=Path("p1.txt"), format="open/close"), - ("period_data", 1): ListIO(path=Path("p2.bin"), format="binary"), - ("period_data", 2): ListIO(path=Path("shared.txt"), format="open/close"), - ("period_data", 3): ListIO(path=Path("shared.txt"), format="open/close"), + ("stress_period_data", 0): ListIO(path=Path("p1.txt"), format="open/close"), + ("stress_period_data", 1): ListIO(path=Path("p2.bin"), format="binary"), + ("stress_period_data", 2): ListIO(path=Path("shared.txt"), format="open/close"), + ("stress_period_data", 3): ListIO(path=Path("shared.txt"), format="open/close"), } - assert lists[("period_data", 1)].hash == list_hash([[1, 1, 2, 4.0, 0.5]]) + assert lists[("stress_period_data", 1)].hash == list_hash([[1, 1, 2, 4.0, 0.5]]) def test_write_keeps_list_files(loaded_chd): @@ -173,7 +173,7 @@ def test_write_keeps_list_files(loaded_chd): assert (out / "p1.txt").read_text().splitlines() == ["1 1 1 10.0 1.5", "1 1 3 2.0 2.5"] assert _chd_rows(out / "p2.bin") == [((1, 1, 2), 4.0, 0.5)] again = Chd.load(chd.path, dims=DIMS, context=LoadContext(workspace=out)) - assert again.period_data == chd.period_data + assert again.stress_period_data == chd.stress_period_data def test_internal_beats_loaded_list_files(loaded_chd): @@ -194,7 +194,7 @@ def test_shared_list_file_kept_by_unchanged_period(loaded_chd): """Edit one period of a shared file and it's written inline, with a warning naming it; the unchanged period keeps the file.""" chd, out = loaded_chd - chd.period_data[2] = [Chd.PeriodData(cellid=(0, 0, 1), head=6.0, aux=(0.0,))] + chd.stress_period_data[2] = [Chd.StressPeriodData(cellid=(0, 0, 1), head=6.0, aux=(0.0,))] with pytest.warns(UserWarning, match="period 3 changed since loaded"): chd.write() assert _lines(chd.path, "OPEN/CLOSE")[2:] == ["OPEN/CLOSE shared.txt"] @@ -204,7 +204,7 @@ def test_shared_list_file_kept_by_unchanged_period(loaded_chd): def test_strict_raises_on_disagreeing_shared_list_file(loaded_chd): chd, out = loaded_chd - chd.period_data[2] = [Chd.PeriodData(cellid=(0, 0, 1), head=6.0, aux=(0.0,))] + chd.stress_period_data[2] = [Chd.StressPeriodData(cellid=(0, 0, 1), head=6.0, aux=(0.0,))] with pytest.raises(ExternalFileError, match="changed since loaded"): chd.write(context=WriteContext(strict=True)) assert not (out / "shared.txt").exists() @@ -215,17 +215,17 @@ def test_boundnames_written_as_text(tmp_path): writes such rows as text, and a list's own "binary" warns too.""" chd = Chd( boundnames=True, - period_data={0: [[(0, 0, 0), 10.0, "east"]], 1: [[(0, 0, 0), 9.0]]}, + stress_period_data={0: [[(0, 0, 0), 10.0, "east"]], 1: [[(0, 0, 0), 9.0]]}, ) chd.filename = str(tmp_path / "m.chd") with warnings.catch_warnings(): warnings.simplefilter("error") chd.write(context=WriteContext(list_format="binary")) assert _lines(chd.path, "OPEN/CLOSE") == [ - "OPEN/CLOSE m_chd_period_data_p1.txt", - "OPEN/CLOSE m_chd_period_data_p2.txt", + "OPEN/CLOSE m_chd_stress_period_data_p1.txt", + "OPEN/CLOSE m_chd_stress_period_data_p2.txt", ] - context = WriteContext(lists={"period_data": ListIO(format="binary")}) + context = WriteContext(lists={"stress_period_data": ListIO(format="binary")}) with pytest.warns(UserWarning, match="period 1: MF6 can't read these rows from a binary"): chd.write(context=context) with pytest.raises(ExternalFileError, match="period 1: MF6 can't read"): @@ -237,17 +237,19 @@ def test_time_series_names_written_as_text(tmp_path): file, makes the rows text.""" rows = Rows( 3, - field="period_data", - item_cls=Chd.PeriodData, + field="stress_period_data", + item_cls=Chd.StressPeriodData, layout=lambda: ({}, frozenset()), ) - rows.append([Chd.PeriodData(cellid=(0, 0, 0), head="myts")]) + rows.append([Chd.StressPeriodData(cellid=(0, 0, 0), head="myts")]) data = {"period 1": {"period": rows}} - context = WriteContext.resolve(WriteContext(lists={"period_data": ListIO(format="binary")})) + context = WriteContext.resolve( + WriteContext(lists={"stress_period_data": ListIO(format="binary")}) + ) with pytest.warns(UserWarning, match="MF6 can't read these rows from a binary"): out = write_external_lists(data, tmp_path, Path("m.chd"), "chd", context) assert out["period 1"]["period"].open_close_binary is False - assert (tmp_path / "m_chd_period_data_p1.txt").read_text() == "1 1 1 myts\n" + assert (tmp_path / "m_chd_stress_period_data_p1.txt").read_text() == "1 1 1 myts\n" def test_list_format_binary_writes_other_blocks_as_text(tmp_path): @@ -267,7 +269,7 @@ def test_list_format_binary_writes_other_blocks_as_text(tmp_path): def test_list_sharing_its_block_written_inline(tmp_path): """Only a list alone in its block can go to a file.""" rows = Rows(field="rows") - rows.append([Wel.PeriodData(cellid=(0, 0, 0), q=1.0)]) + rows.append([Wel.StressPeriodData(cellid=(0, 0, 0), q=1.0)]) data = {"options": {"flag": True, "rows": rows}} context = WriteContext.resolve(WriteContext(lists={"rows": ListIO(path="r.txt")})) with pytest.warns(UserWarning, match="only a list alone in its block"): @@ -299,16 +301,16 @@ def _sim(workspace: Path) -> Simulation: Chd( parent=gwf, auxiliary=["c"], - period_data={0: [[(0, 0, 0), 10.0, 1.0], [(1, 2, 3), 2.0, 2.0]]}, + stress_period_data={0: [[(0, 0, 0), 10.0, 1.0], [(1, 2, 3), 2.0, 2.0]]}, ) Wel( parent=gwf, - period_data={ + stress_period_data={ 0: [[(1, 1, 1), -0.1]], 1: [[(1, 1, 1), -0.3], [(0, 1, 2), 0.05]], }, ) - Oc(parent=gwf, head_file="gwf.hds", period_data={0: [("SAVE", "HEAD", "ALL")]}) + Oc(parent=gwf, head_file="gwf.hds", stress_period_data={0: [("SAVE", "HEAD", "ALL")]}) return sim @@ -324,9 +326,11 @@ def test_mf6_reads_list_files(function_tmpdir, list_format): sim = _sim(external) sim.write(context=WriteContext(list_format=list_format)) suffix = ".bin (BINARY)" if list_format == "binary" else ".txt" - assert f"OPEN/CLOSE gwf_wel-1_wel_period_data_p2{suffix}" in _lines( + assert f"OPEN/CLOSE gwf_wel-1_wel_stress_period_data_p2{suffix}" in _lines( external / "gwf.wel-1.wel", "OPEN/CLOSE" ) - assert _lines(external / "gwf.oc", "OPEN/CLOSE") == ["OPEN/CLOSE gwf_oc_period_data_p1.txt"] + assert _lines(external / "gwf.oc", "OPEN/CLOSE") == [ + "OPEN/CLOSE gwf_oc_stress_period_data_p1.txt" + ] sim.run() assert (inline / "gwf.hds").read_bytes() == (external / "gwf.hds").read_bytes() diff --git a/test/mf6/test_mf6_grammar_gen.py b/test/mf6/test_mf6_grammar_gen.py index fb2a2482d..71fbaf2ea 100644 --- a/test/mf6/test_mf6_grammar_gen.py +++ b/test/mf6/test_mf6_grammar_gen.py @@ -224,20 +224,20 @@ def test_make_grammar_with_period_block(tmp_path): grammar_file = tmp_path / "gwf-test.lark" content = grammar_file.read_text() - # Period block should have a period_data recarray instead of individual fields - assert "period_data" in content + # Period block should have a stress_period_data recarray instead of individual fields + assert "stress_period_data" in content assert "period__fields:" in content # Individual q and aux should not appear as separate rules in period_fields - # (they should be combined into period_data) + # (they should be combined into stress_period_data) lines = content.split("\n") period_fields_line = [l for l in lines if "period__fields:" in l][0] - assert "period_data" in period_fields_line + assert "stress_period_data" in period_fields_line - # period_data should accept numbers and strings, one row per line - assert "period_data:" in content - period_data_line = [l for l in lines if l.strip().startswith("period_data:")][0] - assert "record" in period_data_line + # stress_period_data should accept numbers and strings, one row per line + assert "stress_period_data:" in content + stress_period_data_line = [l for l in lines if l.strip().startswith("stress_period_data:")][0] + assert "record" in stress_period_data_line def test_make_grammar_with_named_subfields(tmp_path): @@ -266,12 +266,12 @@ def test_make_grammar_with_named_subfields(tmp_path): grammar_file = tmp_path / "gwf-rch.lark" content = grammar_file.read_text() - # period_data should be a generic recarray accepting numbers/strings per line - assert "period_data" in content + # stress_period_data should be a generic recarray accepting numbers/strings per line + assert "stress_period_data" in content lines = content.split("\n") - period_data_line = [l for l in lines if l.strip().startswith("period_data:")][0] + stress_period_data_line = [l for l in lines if l.strip().startswith("stress_period_data:")][0] # Should accept both numbers and simple strings - assert "record" in period_data_line + assert "record" in stress_period_data_line def test_make_grammar_with_oc_style_records(tmp_path): diff --git a/test/mf6/test_mf6_integration.py b/test/mf6/test_mf6_integration.py index 7a9c0ce7c..b4cce0e43 100644 --- a/test/mf6/test_mf6_integration.py +++ b/test/mf6/test_mf6_integration.py @@ -104,7 +104,7 @@ def test_gwf_chd01(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={ + stress_period_data={ 0: [ ("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST"), @@ -125,7 +125,7 @@ def test_gwf_chd01(function_tmpdir): chd = Chd( parent=gwf, print_flows=True, - period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 99), 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 99), 0.0]]}, name="chd-1", ) @@ -242,7 +242,7 @@ def test_gwf_disv(function_tmpdir): chd = Chd( parent=gwf, print_flows=True, - period_data={0: [[(0, 0), 1.0], [(0, 8), 0.0]]}, + stress_period_data={0: [[(0, 0), 1.0], [(0, 8), 0.0]]}, ) sim.write() @@ -462,7 +462,7 @@ def test_gwf_disv_uzf(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={ + stress_period_data={ 0: [ ("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL"), @@ -486,7 +486,7 @@ def test_gwf_disv_uzf(function_tmpdir): storagecoefficient=False, ss=1.00000000e-05, sy=0.2, - period_data={0: [["TRANSIENT"]]}, + stress_period_data={0: [["TRANSIENT"]]}, iconvert=1, ) @@ -516,7 +516,7 @@ def test_gwf_disv_uzf(function_tmpdir): ghb = Ghb( parent=gwf, print_flows=True, - period_data={0: [[c, 14.0, 10000.0] for c in ghb_cells]}, + stress_period_data={0: [[c, 14.0, 10000.0] for c in ghb_cells]}, name="ghb-1", ) @@ -550,14 +550,14 @@ def test_model_in_subdirectory(function_tmpdir): Chd( parent=gwf, filename="gwf/m.chd", - period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}, ) Oc( parent=gwf, filename="gwf/m.oc", budget_file="gwf/m.bud", head_file="gwf/m.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) sim.write() @@ -602,10 +602,10 @@ def test_quickstart(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.bud", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) npf = Npf(parent=gwf, icelltype=0, k=1.0) - chd = Chd(parent=gwf, period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}) + chd = Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 9, 9), 0.0]]}) sim.write() sim.run() @@ -649,7 +649,7 @@ def test_quickstart_grid(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.bud", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) npf = Npf(parent=gwf, icelltype=0, k=1.0) @@ -714,7 +714,7 @@ def test_quickstart_grid_explicit_maxbound(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.bud", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) Npf(parent=gwf, icelltype=0, k=1.0) @@ -780,7 +780,7 @@ def test_quickstart_netcdf(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.bud", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) npf = Npf(parent=gwf, icelltype=0, k=1.0) @@ -893,7 +893,7 @@ def test_quickstart_netcdf_mesh(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.bud", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) npf = Npf(parent=gwf, icelltype=0, k=1.0) @@ -997,10 +997,12 @@ def test_gwf_wel(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) - chd = Chd(parent=gwf, period_data={0: [[(0, 0, 0), 5.0], [(0, 0, 9), 5.0]]}, name="chd-1") - wel = Wel(parent=gwf, period_data={0: [[(0, 0, 4), -1.0]]}, name="wel-1") + chd = Chd( + parent=gwf, stress_period_data={0: [[(0, 0, 0), 5.0], [(0, 0, 9), 5.0]]}, name="chd-1" + ) + wel = Wel(parent=gwf, stress_period_data={0: [[(0, 0, 4), -1.0]]}, name="wel-1") sim.write() sim.run() @@ -1041,12 +1043,12 @@ def test_gwf_drn(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) - chd = Chd(parent=gwf, period_data={0: [[(0, 0, 0), 5.0]]}, name="chd-1") + chd = Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 5.0]]}, name="chd-1") drn = Drn( parent=gwf, - period_data={0: [[(0, 0, 9), 4.0, 100.0]]}, + stress_period_data={0: [[(0, 0, 9), 4.0, 100.0]]}, name="drn-1", ) @@ -1089,12 +1091,12 @@ def test_gwf_riv(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) - chd = Chd(parent=gwf, period_data={0: [[(0, 0, 0), 3.0]]}, name="chd-1") + chd = Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 3.0]]}, name="chd-1") riv = Riv( parent=gwf, - period_data={0: [[(0, 0, 9), 5.0, 100.0, 2.0]]}, + stress_period_data={0: [[(0, 0, 9), 5.0, 100.0, 2.0]]}, name="riv-1", ) @@ -1137,16 +1139,16 @@ def test_gwf_rch(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) chd = Chd( parent=gwf, - period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 9), 1.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 9), 1.0]]}, name="chd-1", ) rch = Rch( parent=gwf, - period_data={ + stress_period_data={ 0: { "cellid": [(0, 0, i) for i in range(10)], "recharge": [1e-3] * 10, @@ -1196,11 +1198,11 @@ def test_gwf_rcha(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) chd = Chd( parent=gwf, - period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 9), 1.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 9), 1.0]]}, name="chd-1", ) # RCHA uses READARRAY period arrays: shape (nper, ncpl) @@ -1250,16 +1252,16 @@ def test_gwf_evt(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) chd = Chd( parent=gwf, - period_data={0: [[(0, 0, 0), 8.0], [(0, 0, 9), 8.0]]}, + stress_period_data={0: [[(0, 0, 0), 8.0], [(0, 0, 9), 8.0]]}, name="chd-1", ) evt = Evt( parent=gwf, - period_data={ + stress_period_data={ 0: { "cellid": [(0, 0, i) for i in range(10)], "surface": [10.0] * 10, @@ -1311,11 +1313,11 @@ def test_gwf_evta(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) chd = Chd( parent=gwf, - period_data={0: [[(0, 0, 0), 8.0], [(0, 0, 9), 8.0]]}, + stress_period_data={0: [[(0, 0, 0), 8.0], [(0, 0, 9), 8.0]]}, name="chd-1", ) # EVTA uses READARRAY period arrays: shape (nper, ncpl) @@ -1375,13 +1377,13 @@ def test_gwf_mvr(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) # Auto-naming appends the 0-based index for list-typed children, so Chd/Wel/Drn # get auto-names chd0/wel0/drn0. Explicit name= would be mangled (e.g. "wel-1" -> "wel-10"). - chd = Chd(parent=gwf, period_data={0: [[(0, 0, 0), 5.0], [(0, 0, 9), 5.0]]}) + chd = Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 5.0], [(0, 0, 9), 5.0]]}) # mover=True writes MOVER keyword to OPTIONS block so MF6 allocates IMOVER - wel = Wel(parent=gwf, mover=True, period_data={0: [[(0, 0, 4), -1.0]]}) + wel = Wel(parent=gwf, mover=True, stress_period_data={0: [[(0, 0, 4), -1.0]]}) lak = Lak( parent=gwf, mover=True, @@ -1398,7 +1400,7 @@ def test_gwf_mvr(function_tmpdir): maxpackages=2, maxmvr=1, packages={"pname": np.array(["wel-1", "lak-1"], dtype=object)}, - period_data={ + stress_period_data={ 0: { "pname1": np.array(["wel-1"], dtype=object), # 0-based Python-side index (the first boundary in wel0/ @@ -1486,11 +1488,11 @@ def test_gwt_basic(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) Chd( parent=gwf, - period_data={0: [[(0, 0, 0), 1.0], [(0, 0, ncol - 1), 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 0, ncol - 1), 0.0]]}, name="chd-1", ) @@ -1505,8 +1507,8 @@ def test_gwt_basic(function_tmpdir): GwtAdv(parent=gwt, scheme="upstream") GwtMst(parent=gwt, porosity=0.3) GwtDsp(parent=gwt, xt3d_off=True, diffc=0.0, alh=0.1, alv=0.1, ath1=0.0) - GwtCnc(parent=gwt, period_data={0: [[(0, 0, 0), 1.0]]}, name="cnc-1") - GwtSrc(parent=gwt, period_data={0: [[(0, 0, 5), 1e-4]]}, name="src-1") + GwtCnc(parent=gwt, stress_period_data={0: [[(0, 0, 0), 1.0]]}, name="cnc-1") + GwtSrc(parent=gwt, stress_period_data={0: [[(0, 0, 5), 1e-4]]}, name="src-1") sim.write() sim.run() @@ -1571,11 +1573,11 @@ def test_gwe_basic(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) Chd( parent=gwf, - period_data={0: [[(0, 0, 0), 1.0], [(0, 0, ncol - 1), 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 0, ncol - 1), 0.0]]}, name="chd-1", ) @@ -1590,8 +1592,8 @@ def test_gwe_basic(function_tmpdir): GweAdv(parent=gwe, scheme="upstream") GweEst(parent=gwe, porosity=0.3, heat_capacity_solid=800.0, density_solid=2700.0) GweCnd(parent=gwe, ktw=0.58, kts=3.0) - GweCtp(parent=gwe, period_data={0: [[(0, 0, 0), 1.0]]}, name="ctp-1") - GweEsl(parent=gwe, period_data={0: [[(0, 0, 5), 1e-4]]}, name="esl-1") + GweCtp(parent=gwe, stress_period_data={0: [[(0, 0, 0), 1.0]]}, name="ctp-1") + GweEsl(parent=gwe, stress_period_data={0: [[(0, 0, 5), 1e-4]]}, name="esl-1") sim.write() sim.run() @@ -1656,13 +1658,13 @@ def test_gwf_buy(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) # CHD with auxiliary "conc" so BUY can read concentration per stress record Chd( parent=gwf, auxiliary=["conc"], - period_data={0: [[(0, 0, 0), 1.0, 0.0], [(0, 0, ncol - 1), 0.0, 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0, 0.0], [(0, 0, ncol - 1), 0.0, 0.0]]}, name="chd-1", ) Buy( @@ -1679,7 +1681,7 @@ def test_gwf_buy(function_tmpdir): GwtSsm(parent=gwt) GwtAdv(parent=gwt, scheme="upstream") GwtMst(parent=gwt, porosity=0.3) - GwtCnc(parent=gwt, period_data={0: [[(0, 0, 0), 1.0]]}, name="cnc-1") + GwtCnc(parent=gwt, stress_period_data={0: [[(0, 0, 0), 1.0]]}, name="cnc-1") sim.write() @@ -1746,13 +1748,13 @@ def test_gwf_vsc(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) # CHD with auxiliary "temperature" so VSC can read temp per stress record Chd( parent=gwf, auxiliary=["temperature"], - period_data={0: [[(0, 0, 0), 1.0, 20.0], [(0, 0, ncol - 1), 0.0, 20.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0, 20.0], [(0, 0, ncol - 1), 0.0, 20.0]]}, name="chd-1", ) Vsc( @@ -1773,7 +1775,7 @@ def test_gwf_vsc(function_tmpdir): GweAdv(parent=gwe, scheme="upstream") GweEst(parent=gwe, porosity=0.3, heat_capacity_solid=800.0, density_solid=2700.0) GweCnd(parent=gwe, ktw=0.58, kts=3.0) - GweCtp(parent=gwe, period_data={0: [[(0, 0, 0), 40.0]]}, name="ctp-1") + GweCtp(parent=gwe, stress_period_data={0: [[(0, 0, 0), 40.0]]}, name="ctp-1") sim.write() @@ -1846,9 +1848,9 @@ def test_prt_basic(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) - Chd(parent=gwf, period_data={0: [[(0, 0, 0), 5.0], [(0, 0, 4), 3.0]]}) + Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 5.0], [(0, 0, 4), 3.0]]}) gwf_sim.write() gwf_sim.run() @@ -1888,7 +1890,7 @@ def test_prt_basic(function_tmpdir): def test_gwf_oc_period_variations(function_tmpdir): - """OC period_data: verify an explicit empty period and STEPS produce + """OC stress_period_data: verify an explicit empty period and STEPS produce correct CBC record counts. Uses a minimal 3-period, 1-layer, 3x3 model with: @@ -1934,12 +1936,12 @@ def test_gwf_oc_period_variations(function_tmpdir): gwf = Gwf(parent=sim, save_flows=True, dis=dis, name=gwf_name) Ic(parent=gwf, strt=1.0) Npf(parent=gwf, k=1.0, icelltype=0) - Chd(parent=gwf, period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 2), 0.0]]}, name="chd-1") + Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 2), 0.0]]}, name="chd-1") Oc( parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={ + stress_period_data={ 0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "STEPS", 1)], 1: [("SAVE", "HEAD", "ALL")], }, @@ -2016,13 +2018,13 @@ def test_gwt_ssm_sources(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) # CHD with auxiliary "conc": left inflow at concentration 1.0, right outflow 0.0 chd = Chd( parent=gwf, auxiliary=["conc"], - period_data={0: [[(0, 0, 0), 1.0, 1.0], [(0, 0, ncol - 1), 0.0, 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 1.0, 1.0], [(0, 0, ncol - 1), 0.0, 0.0]]}, name="chd-1", ) # Auto-naming appends a zero-based counter to the name; use chd.name to get the @@ -2136,13 +2138,13 @@ def test_gwf_lak_status(function_tmpdir): ss=0.0, sy=0.1, iconvert=1, - period_data={0: [["STEADY-STATE"]], 1: [["TRANSIENT"]]}, + stress_period_data={0: [["STEADY-STATE"]], 1: [["TRANSIENT"]]}, ) oc = Oc( parent=gwf, head_file=f"{gwf_name}.hds", budget_file=f"{gwf_name}.cbc", - period_data={ + stress_period_data={ 0: [ ("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL"), @@ -2153,7 +2155,7 @@ def test_gwf_lak_status(function_tmpdir): ) chd = Chd( parent=gwf, - period_data={0: [[(0, 0, 0), 100.0], [(0, nrow - 1, ncol - 1), 95.0]]}, + stress_period_data={0: [[(0, 0, 0), 100.0], [(0, nrow - 1, ncol - 1), 95.0]]}, name="chd-1", ) @@ -2189,7 +2191,7 @@ def test_gwf_lak_status(function_tmpdir): (0, i, (0, r, c), "vertical", 1.0, 0.0, 0.0, 0.0, 0.0) for i, (r, c) in enumerate(lake_connections) ], - period_data={ + stress_period_data={ 0: [[0, "RAINFALL", 0.1]], 1: [[0, "STATUS", "inactive"]], 2: [[0, "STATUS", "active"]], @@ -2321,11 +2323,11 @@ def test_gwt_lkt01(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) Chd( parent=gwf, - period_data={0: [[(0, 0, 0), -0.5], [(0, 0, ncol - 1), -0.5]]}, + stress_period_data={0: [[(0, 0, 0), -0.5], [(0, 0, ncol - 1), -0.5]]}, name="CHD-1", ) @@ -2351,7 +2353,7 @@ def test_gwt_lkt01(function_tmpdir): ], # lakeout None: no downstream lake (0 in the file) outlets=[(0, 0, None, "SPECIFIED", 999.0, 999.0, 999.0, 999.0)], - period_data={ + stress_period_data={ 0: [ [0, "STATUS", "CONSTANT"], [0, "STAGE", -0.4], @@ -2398,7 +2400,7 @@ def test_gwt_lkt01(function_tmpdir): budget_file=f"{gwt_name}.lkt.bud", flow_package_name=lak.name, packagedata=[(0, 35.0, "mylake")], - period_data={ + stress_period_data={ 0: [ [0, "STATUS", "CONSTANT"], [0, "CONCENTRATION", 100.0], @@ -2414,7 +2416,7 @@ def test_gwt_lkt01(function_tmpdir): parent=gwt, budget_file=f"{gwt_name}.cbc", concentration_file=f"{gwt_name}.ucn", - period_data={ + stress_period_data={ 0: [ ("SAVE", "CONCENTRATION", "ALL"), ("PRINT", "CONCENTRATION", "ALL"), @@ -2529,11 +2531,11 @@ def test_gwt_lkt_flow_package_auxiliary_name(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) Chd( parent=gwf, - period_data={0: [[(0, 0, 0), -0.5], [(0, 0, ncol - 1), -0.5]]}, + stress_period_data={0: [[(0, 0, 0), -0.5], [(0, 0, ncol - 1), -0.5]]}, name="CHD-1", ) @@ -2561,7 +2563,7 @@ def test_gwt_lkt_flow_package_auxiliary_name(function_tmpdir): (0, 2, (0, 0, 2), "VERTICAL", FILL_DNODATA, 10.0, 10.0, connlen, connwidth), ], outlets=[(0, 0, None, "SPECIFIED", 999.0, 999.0, 999.0, 999.0)], - period_data={ + stress_period_data={ 0: [ [0, "STATUS", "CONSTANT"], [0, "STAGE", -0.4], @@ -2606,7 +2608,7 @@ def test_gwt_lkt_flow_package_auxiliary_name(function_tmpdir): flow_package_name=lak.name, flow_package_auxiliary_name="CONCENTRATION", packagedata=[(0, 35.0, "mylake")], - period_data={ + stress_period_data={ 0: [ [0, "STATUS", "CONSTANT"], [0, "CONCENTRATION", 100.0], @@ -2622,7 +2624,7 @@ def test_gwt_lkt_flow_package_auxiliary_name(function_tmpdir): parent=gwt, budget_file=f"{gwt_name}.cbc", concentration_file=f"{gwt_name}.ucn", - period_data={ + stress_period_data={ 0: [ ("SAVE", "CONCENTRATION", "ALL"), ("PRINT", "CONCENTRATION", "ALL"), @@ -2737,11 +2739,11 @@ def test_gwe_lke_flow_package_auxiliary_name(function_tmpdir): parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) Chd( parent=gwf, - period_data={0: [[(0, 0, 0), -0.5], [(0, 0, ncol - 1), -0.5]]}, + stress_period_data={0: [[(0, 0, 0), -0.5], [(0, 0, ncol - 1), -0.5]]}, name="CHD-1", ) @@ -2766,7 +2768,7 @@ def test_gwe_lke_flow_package_auxiliary_name(function_tmpdir): (0, 2, (0, 0, 2), "VERTICAL", FILL_DNODATA, 10.0, 10.0, connlen, connwidth), ], outlets=[(0, 0, None, "SPECIFIED", 999.0, 999.0, 999.0, 999.0)], - period_data={ + stress_period_data={ 0: [ [0, "STATUS", "CONSTANT"], [0, "STAGE", -0.4], @@ -2812,7 +2814,7 @@ def test_gwe_lke_flow_package_auxiliary_name(function_tmpdir): flow_package_name=lak.name, flow_package_auxiliary_name="TEMPERATURE", packagedata=[(0, 5.0, 0.6, 0.1, "mylake")], - period_data={ + stress_period_data={ 0: [ [0, "STATUS", "CONSTANT"], [0, "TEMPERATURE", 20.0], @@ -2828,7 +2830,7 @@ def test_gwe_lke_flow_package_auxiliary_name(function_tmpdir): parent=gwe, budget_file=f"{gwe_name}.cbc", temperature_file=f"{gwe_name}.utn", - period_data={ + stress_period_data={ 0: [ ("SAVE", "TEMPERATURE", "ALL"), ("PRINT", "TEMPERATURE", "ALL"), @@ -2950,8 +2952,8 @@ def test_structured_grid_arrays_written_by_row(function_tmpdir): gwf = Gwf(parent=sim, name="gwf", dis=dis) Ic(parent=gwf, strt=10.0) Npf(parent=gwf, k=np.linspace(1.0, 2.0, 24), icelltype=0) - Chd(parent=gwf, period_data={0: [[(0, 0, 0), 10.0], [(1, 2, 3), 2.0]]}) - Oc(parent=gwf, head_file="gwf.hds", period_data={0: [("SAVE", "HEAD", "LAST")]}) + Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 10.0], [(1, 2, 3), 2.0]]}) + Oc(parent=gwf, head_file="gwf.hds", stress_period_data={0: [("SAVE", "HEAD", "LAST")]}) sim.write() lines = (function_tmpdir / "gwf.dis").read_text().splitlines() @@ -2979,7 +2981,7 @@ def test_tas_arrays_written_by_row(function_tmpdir): Dis(parent=gwf, nlay=nlay, nrow=nrow, ncol=ncol, top=10.0, botm=[5.0, 0.0, -5.0]) Ic(parent=gwf, strt=10.0) Npf(parent=gwf, k=1.0) - Chd(parent=gwf, period_data={0: [[(nlay - 1, nrow - 1, ncol - 1), 4.0]]}) + Chd(parent=gwf, stress_period_data={0: [[(nlay - 1, nrow - 1, ncol - 1), 4.0]]}) tas = Tas( time_series_name=Tas.TimeSeriesName(time_series_name=("rcharray",)), interpolation_method=Tas.InterpolationMethod(interpolation_method="linear"), @@ -3027,8 +3029,8 @@ def test_grid_arrays_with_unit_dim_written_by_row(function_tmpdir): gwf = Gwf(parent=sim, name="gwf", dis=dis) Ic(parent=gwf, strt=1.0) Npf(parent=gwf, k=1.0, icelltype=0) - Chd(parent=gwf, period_data={0: [[(0, 0, 0), 1.0]]}) - Oc(parent=gwf, head_file="gwf.hds", period_data={0: [("SAVE", "HEAD", "LAST")]}) + Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 1.0]]}) + Oc(parent=gwf, head_file="gwf.hds", stress_period_data={0: [("SAVE", "HEAD", "LAST")]}) sim.write() lines = (function_tmpdir / "gwf.dis").read_text().splitlines() diff --git a/test/mf6/test_mf6_io_roundtrip.py b/test/mf6/test_mf6_io_roundtrip.py index 5b3ae11a2..c3c8b3419 100644 --- a/test/mf6/test_mf6_io_roundtrip.py +++ b/test/mf6/test_mf6_io_roundtrip.py @@ -268,7 +268,7 @@ def test_tvk_child_kept(tmp_path): ) sim = Simulation.load(workspace / "mfsim.nam") tvk = sim["flow15"].npf.tvk - rows = tvk.period_data[0] + rows = tvk.stress_period_data[0] settings = [(type(r.tvksetting).__name__, r.cellid) for r in rows] assert settings == [("K", (0, 0, 2)), ("K33", (0, 0, 3))] assert (rows[0].tvksetting.k, rows[1].tvksetting.k33) == (5.0, 2.5) @@ -280,7 +280,7 @@ def test_tvk_child_kept(tmp_path): assert "TVK6 FILEIN flow15.tvk" in (out / "flow15.npf").read_text() reloaded = Simulation.load(out / "mfsim.nam") diffs: list[str] = [] - _diff(rows, reloaded["flow15"].npf.tvk.period_data[0], "tvk", diffs) + _diff(rows, reloaded["flow15"].npf.tvk.stress_period_data[0], "tvk", diffs) assert not diffs, "\n".join(diffs) @@ -293,7 +293,7 @@ def test_tvs_child_kept(tmp_path): "BEGIN PERIOD 2\n 1 1 1 SS 2.0e-5\n 1 1 2 SY 0.1\nEND PERIOD\n" ) sim = Simulation.load(workspace / "mfsim.nam") - rows = sim["GWF_1"].sto.tvs.period_data[1] + rows = sim["GWF_1"].sto.tvs.stress_period_data[1] settings = [(type(r.tvssetting).__name__, r.cellid) for r in rows] assert settings == [("Ss", (0, 0, 0)), ("Sy", (0, 0, 1))] assert (rows[0].tvssetting.ss, rows[1].tvssetting.sy) == (2.0e-5, 0.1) @@ -305,7 +305,7 @@ def test_tvs_child_kept(tmp_path): assert "TVS6 FILEIN model.tvs" in (out / "model.sto").read_text() reloaded = Simulation.load(out / "mfsim.nam") diffs: list[str] = [] - _diff(rows, reloaded["GWF_1"].sto.tvs.period_data[1], "tvs", diffs) + _diff(rows, reloaded["GWF_1"].sto.tvs.stress_period_data[1], "tvs", diffs) assert not diffs, "\n".join(diffs) @@ -413,7 +413,7 @@ def test_gwt_transport_round_trips(tmp_path, pkg_cls): dims={"nper": 1}, boundnames=True, packagedata=[(0, 1.0, "reach1")], - period_data={0: [[0, "STATUS", "CONSTANT"], [0, "CONCENTRATION", 5.0]]}, + stress_period_data={0: [[0, "STATUS", "CONSTANT"], [0, "CONCENTRATION", 5.0]]}, name=f"{pkg_cls.__name__.upper()}-1", ) @@ -454,7 +454,7 @@ def test_gwe_transport_round_trips(tmp_path, pkg_cls, row): dims={"nper": 1}, boundnames=True, packagedata=[row], - period_data={0: [[0, "STATUS", "CONSTANT"], [0, "TEMPERATURE", 20.0]]}, + stress_period_data={0: [[0, "STATUS", "CONSTANT"], [0, "TEMPERATURE", 20.0]]}, name=f"{pkg_cls.__name__.upper()}-1", ) @@ -484,7 +484,7 @@ def test_quoted_multiword_boundname_and_obsname_round_trips(tmp_path): ghb = Ghb( parent=gwf, boundnames=True, - period_data={0: [[(0, 0, 0), 1.0, 10.0, "my bound"]]}, + stress_period_data={0: [[(0, 0, 0), 1.0, 10.0, "my bound"]]}, name="GHB-1", ) Obs( @@ -501,7 +501,7 @@ def test_quoted_multiword_boundname_and_obsname_round_trips(tmp_path): sim.write() reloaded = Simulation.load(tmp_path / "mfsim.nam") rghb = reloaded[gwf_name].ghb[0] - assert rghb.period_data[0][0].boundname == "my bound" + assert rghb.stress_period_data[0][0].boundname == "my bound" robs = rghb.obs.continuous[0].continuous[0] assert (robs.obsname, robs.id_) == ("my obs", "my bound") @@ -526,7 +526,7 @@ def test_obs_id_naming_numeric_boundname_warns(tmp_path, boundname, warns): ghb = Ghb( parent=gwf, boundnames=True, - period_data={0: [[(0, 0, 0), 1.0, 10.0, boundname]]}, + stress_period_data={0: [[(0, 0, 0), 1.0, 10.0, boundname]]}, name="GHB-1", ) Obs( @@ -565,7 +565,7 @@ def _ghb_sim(tmp_path, rows, *, auxiliary=None, obs=()): ghb = Ghb( parent=gwf, boundnames=True, - period_data={0: [[(0, 0, j), 1.0, 10.0, *row] for j, row in enumerate(rows)]}, + stress_period_data={0: [[(0, 0, j), 1.0, 10.0, *row] for j, row in enumerate(rows)]}, name="GHB-1", **kwargs, ) @@ -597,16 +597,16 @@ def test_boundname_round_trips(tmp_path, boundname, aux): -> reload as written.""" sim, ghb = _ghb_sim(tmp_path, [(aux, boundname), (aux, "b")], auxiliary=["x"] if aux else None) sim.write() - rows = _reloaded_ghb(tmp_path).period_data[0] + rows = _reloaded_ghb(tmp_path).stress_period_data[0] assert [(r.boundname, r.aux) for r in rows] == [(boundname, aux), ("b", aux)] def test_empty_boundname_is_none(tmp_path): """An empty boundname is no boundname, however the row gives it.""" sim, ghb = _ghb_sim(tmp_path, [("",), ((), ""), ("b",)]) - assert [r.boundname for r in ghb.period_data[0]] == [None, None, "b"] + assert [r.boundname for r in ghb.stress_period_data[0]] == [None, None, "b"] sim.write() - rows = _reloaded_ghb(tmp_path).period_data[0] + rows = _reloaded_ghb(tmp_path).stress_period_data[0] assert [r.boundname for r in rows] == [None, None, "b"] @@ -628,7 +628,7 @@ def test_hand_written_boundnames_load(tmp_path): ghb_file.write_text(text[:start] + rows + text[text.index("END PERIOD") :]) rghb = _reloaded_ghb(tmp_path) - rows_back = rghb.period_data[0] + rows_back = rghb.stress_period_data[0] assert [r.boundname for r in rows_back] == ["5", "1.50", "end", None, None] assert all(r.aux == (3.0,) for r in rows_back) @@ -658,7 +658,7 @@ def test_unquoted_number_like_names_load_as_written(tmp_path, rows): assert "'" not in obs_file.read_text().split("BEGIN continuous")[-1] rghb = _reloaded_ghb(tmp_path) - rows_back = rghb.period_data[0] + rows_back = rghb.stress_period_data[0] second = rows.split()[-1] assert [r.boundname for r in rows_back] == ["1.50", second] assert [(r.bhead, r.cond) for r in rows_back] == [(1.0, 10.0), (1.0, 10.0)] diff --git a/test/mf6/test_mf6_keys.py b/test/mf6/test_mf6_keys.py index 28e718fd6..9295d7ad0 100644 --- a/test/mf6/test_mf6_keys.py +++ b/test/mf6/test_mf6_keys.py @@ -15,8 +15,8 @@ def _gwf(name): gwf = Gwf(name=name, dis=Dis(nlay=1, nrow=1, ncol=2)) Ic(parent=gwf) Npf(parent=gwf) - Wel(parent=gwf, name="wel", mover=True, period_data={0: [((0, 0, 0), -1.0)]}) - Drn(parent=gwf, name="drn", mover=True, period_data={0: [((0, 0, 1), 1.0, 1.0)]}) + Wel(parent=gwf, name="wel", mover=True, stress_period_data={0: [((0, 0, 0), -1.0)]}) + Drn(parent=gwf, name="drn", mover=True, stress_period_data={0: [((0, 0, 1), 1.0, 1.0)]}) Lak(parent=gwf, name="lak", mover=True, nlakes=1, packagedata=[(0, 1.0, 1)]) return gwf @@ -26,7 +26,7 @@ def _mvr(packages, moves, **kwargs): maxpackages=len(packages), maxmvr=len(moves), packages=packages, - period_data={0: moves}, + stress_period_data={0: moves}, **kwargs, ) @@ -64,7 +64,7 @@ def test_model_mvr_keys(): ( [("wel",), ("drn",)], [("wel", 0, "riv", 0, "FACTOR", 1.0)], - "Mvr.period_data: period 0: pname2 'riv' isn't in packages", + "Mvr.stress_period_data: period 0: pname2 'riv' isn't in packages", ), ], ) @@ -128,7 +128,7 @@ def test_exchange_mvr_keys(tmp_path): ( [("a", "wel"), ("b", "drn")], [("a", "wel", 0, "a", "drn", 0, "FACTOR", 1.0)], - "Mvr.period_data: period 0: pname2 'drn' (mname2 'a') isn't in packages", + "Mvr.stress_period_data: period 0: pname2 'drn' (mname2 'a') isn't in packages", ), ], ) @@ -149,7 +149,7 @@ def _lak(outlets=(), periods=()): noutlets=len(outlets), packagedata=[(0, 1.0, 1), (1, 1.0, 1)], outlets=[(*o, "SPECIFIED", 0.0, 0.0, 0.0, 0.0) for o in outlets] or None, - period_data={0: list(periods)} if periods else None, + stress_period_data={0: list(periods)} if periods else None, ) @@ -221,9 +221,9 @@ def test_chf_cross_section_keys(tmp_path): chf = Chf(name="m") Cxs(parent=chf, nsections=1, npoints=2, packagedata=[(0, 2)]) - cdb = Cdb(parent=chf, period_data={0: [[(0,), 0, 1.0], [(1,), 1, 1.0]]}) + cdb = Cdb(parent=chf, stress_period_data={0: [[(0,), 0, 1.0], [(1,), 1, 1.0]]}) assert key_errors(cdb) == [ - "Cdb.period_data: period 0: idcxs 1 isn't in packagedata of cxs 'cxs'" + "Cdb.stress_period_data: period 0: idcxs 1 isn't in packagedata of cxs 'cxs'" ] @@ -240,7 +240,7 @@ def test_model_mvr_id_errors(move, error): gwf = _gwf("flow") mvr = _mvr([("wel",), ("lak",)], [(*move, "FACTOR", 1.0)]) mvr.parent = gwf - assert key_errors(mvr) == [f"Mvr.period_data: period 0: {error}"] + assert key_errors(mvr) == [f"Mvr.stress_period_data: period 0: {error}"] def test_exchange_mvr_model_outside_exchange(tmp_path): @@ -255,7 +255,7 @@ def test_exchange_mvr_model_outside_exchange(tmp_path): [ ( [("wel", 0, "lak", 0, "FACTOR", 1.0)], - ["Mvr.period_data: period 0: id1 0 is in wel 'wel', which hasn't mover on"], + ["Mvr.stress_period_data: period 0: id1 0 is in wel 'wel', which hasn't mover on"], ), ([], []), ], @@ -279,7 +279,7 @@ def test_model_mvr_role_off(): mvr.parent = gwf assert key_errors(mvr) == [ "Mvr.packages: pname 'lak' hasn't mover on", - "Mvr.period_data: period 0: id2 0 is in lak 'lak', which hasn't mover on", + "Mvr.stress_period_data: period 0: id2 0 is in lak 'lak', which hasn't mover on", ] @@ -288,7 +288,7 @@ def test_model_mvr_not_mover(): from flopy4.mf6.gwf import Chd gwf = _gwf("flow") - Chd(parent=gwf, name="chd", period_data={0: [((0, 0, 1), 1.0)]}) + Chd(parent=gwf, name="chd", stress_period_data={0: [((0, 0, 1), 1.0)]}) mvr = _mvr([("wel",), ("chd",)], []) mvr.parent = gwf assert key_errors(mvr) == ["Mvr.packages: pname 'chd' isn't a mover"] @@ -316,7 +316,7 @@ def _transport(tmp_path, pname="wel", bndno=0, exchange=True): gwf = _gwf("flow") gwt = Gwt(name="trans", dis=GwtDis(nlay=1, nrow=1, ncol=2)) - spc = Spc(maxbound=1, period_data={0: [(bndno, Spc.Concentration(1.0))]}) + spc = Spc(maxbound=1, stress_period_data={0: [(bndno, Spc.Concentration(1.0))]}) ssm = Ssm(parent=gwt, fileinput=[(pname, spc)]) exchanges = [Gwfgwt(exgmnamea=gwf, exgmnameb=gwt)] if exchange else [] _sim(tmp_path, gwf, gwt, exchanges=exchanges) @@ -346,7 +346,7 @@ def test_ssm_pname_without_exchange(tmp_path): def test_spc_bndno_past_bounds(tmp_path): _, spc = _transport(tmp_path, bndno=1) assert key_errors(spc) == [ - "Spc.period_data: period 0: bndno 1 isn't below the maxbound of wel 'wel' (1)" + "Spc.stress_period_data: period 0: bndno 1 isn't below the maxbound of wel 'wel' (1)" ] @@ -403,7 +403,7 @@ def _sfr_diversions(periods=()): packagedata=[(0, (0, 0, 0), *reach, 1), (1, (0, 0, 1), *reach, 0)], connectiondata=[(0, (-2,)), (1, (1,))], diversions=[(0, 0, 1, "UPTO")], - period_data={0: [(r, Sfr.Diversion(d, 1.0)) for r, d in periods]} or None, + stress_period_data={0: [(r, Sfr.Diversion(d, 1.0)) for r, d in periods]} or None, ) @@ -420,7 +420,7 @@ def test_sfr_period_diversion_keys(): ], ) def test_sfr_period_diversion_errors(periods, error): - assert key_errors(_sfr_diversions(periods)) == [f"Sfr.period_data: period 0: {error}"] + assert key_errors(_sfr_diversions(periods)) == [f"Sfr.stress_period_data: period 0: {error}"] def test_ssm_package_in_both_lists(tmp_path): @@ -433,7 +433,7 @@ def test_spc_on_advanced_package(tmp_path): """SPC on an advanced package numbers its bounds: LAK's connections.""" _, spc = _transport(tmp_path, pname="lak", bndno=1) assert key_errors(spc) == [ - "Spc.period_data: period 0: bndno 1 isn't below the nlakeconn of lak 'lak' (1)" + "Spc.stress_period_data: period 0: bndno 1 isn't below the nlakeconn of lak 'lak' (1)" ] diff --git a/test/mf6/test_mf6_legacy.py b/test/mf6/test_mf6_legacy.py index ac11e3174..7c197b67d 100644 --- a/test/mf6/test_mf6_legacy.py +++ b/test/mf6/test_mf6_legacy.py @@ -1,14 +1,12 @@ """flopy3's period-data constructor keywords and attributes.""" -import inspect import warnings import attrs -import flopy import pytest from flopy4.mf6.component import get_fnames -from flopy4.mf6.gwf import Lak, Oc, Sto, Wel +from flopy4.mf6.gwf import Lak, Oc, Sto from flopy4.mf6.gwf.ic import Ic from flopy4.mf6.legacy import oc_period_data, sto_period_data @@ -25,10 +23,10 @@ def _renames(): @pytest.mark.parametrize(("dfn_name", "old"), _renames()) def test_rename(dfn_name, old): cls = get_fnames()[dfn_name] - with pytest.warns(DeprecationWarning, match=f"{old}=.*use period_data=") as record: + with pytest.warns(DeprecationWarning, match=f"{old}=.*use stress_period_data=") as record: legacy = cls(**{old: {}}) assert len(record) == 1 - assert legacy == cls(period_data={}) + assert legacy == cls(stress_period_data={}) def test_renames(): @@ -41,66 +39,25 @@ def test_renames(): } <= set(_renames()) -def test_stress_period_data_matches_flopy3(): - """The alias is on each class whose flopy3 class takes the keyword, and - on CHF's and OLF's stress packages, which flopy3 doesn't have yet.""" - - def flopy3_takes(cls): - ftype, _, name = cls.dfn_name.partition("-") - flopy3 = getattr(flopy.mf6, f"Modflow{ftype.capitalize()}{name}", None) - return flopy3 is not None and ( - "stress_period_data" in inspect.signature(flopy3.__init__).parameters - ) - - classes = set(get_fnames().values()) - unreleased = {f"{m}-{p}" for m in ("chf", "olf") for p in "cdb chd evp flw pcp zdg".split()} - assert {c.dfn_name for c in classes if flopy3_takes(c)} | unreleased == { - c.dfn_name for c in classes if "stress_period_data" in c.legacy_kwargs - } - - -@pytest.mark.parametrize("cls", [Lak, Oc, Sto]) -def test_stress_period_data_not_where_flopy3_has_another_name(cls): - with pytest.raises(TypeError, match="stress_period_data"): - cls(stress_period_data={}) - - -def test_stress_period_data_reaches_period_data(): - rows = {0: [((0, 0, 0), -1.0)]} - with pytest.warns(DeprecationWarning, match="use period_data="): - wel = Wel(stress_period_data=rows) - assert wel == Wel(period_data=rows) - assert wel.period_data[0][0].q == -1.0 - - -def test_stress_period_data_and_period_data_conflict(): - with pytest.raises(TypeError, match="got both"): - Wel(stress_period_data={}, period_data={}) - - -@pytest.mark.parametrize( - ("cls", "old"), - [(Wel, "stress_period_data"), (Lak, "perioddata")], -) -def test_attribute_reads_and_assigns_period_data(cls, old): - pkg = cls(period_data={}) - match = f"{old} is deprecated; use period_data" +def test_attribute_reads_and_assigns_stress_period_data(): + lak = Lak(stress_period_data={}) + match = "perioddata is deprecated; use stress_period_data" with pytest.warns(DeprecationWarning, match=match) as record: - assert getattr(pkg, old) is pkg.period_data + assert lak.perioddata is lak.stress_period_data assert record[0].filename == __file__ with pytest.warns(DeprecationWarning, match=match) as record: - setattr(pkg, old, {}) + lak.perioddata = {} assert record[0].filename == __file__ - assert pkg.period_data == {} - assert old not in vars(pkg) + assert lak.stress_period_data == {} + assert "perioddata" not in vars(lak) -def test_attribute_assignment_is_coerced_like_period_data(): - wel = Wel() +def test_attribute_assignment_is_coerced_like_stress_period_data(): + lak = Lak() with pytest.warns(DeprecationWarning): - wel.stress_period_data = {0: [((0, 0, 0), -1.0)]} - assert wel.period_data[0][0].q == -1.0 + lak.perioddata = {0: [(0, "status", "active")]} + assert lak.stress_period_data[0][0].status == "active" @pytest.mark.parametrize( @@ -114,9 +71,9 @@ def test_attribute_assignment_is_coerced_like_period_data(): ) def test_converted_attribute_raises(cls, old): pkg = cls() - with pytest.raises(AttributeError, match=f"{old} is gone.*period_data"): + with pytest.raises(AttributeError, match=f"{old} is gone.*stress_period_data"): getattr(pkg, old) - with pytest.raises(AttributeError, match=f"{old} is gone.*period_data"): + with pytest.raises(AttributeError, match=f"{old} is gone.*stress_period_data"): setattr(pkg, old, {}) assert not hasattr(pkg, old) @@ -151,7 +108,7 @@ def test_sto(kwargs, expected): with pytest.warns(DeprecationWarning) as record: sto = Sto(**kwargs) assert len(record) == 1 - assert sto == Sto(period_data=expected) + assert sto == Sto(stress_period_data=expected) def test_sto_conflict(): @@ -189,7 +146,7 @@ def test_oc(kwargs, expected): with pytest.warns(DeprecationWarning) as record: oc = Oc(**kwargs) assert len(record) == 1 - assert oc == Oc(period_data=expected) + assert oc == Oc(stress_period_data=expected) @pytest.mark.parametrize( @@ -201,8 +158,8 @@ def test_oc(kwargs, expected): ], ) def test_old_and_new(cls, kwargs): - with pytest.raises(TypeError, match="got both .* and period_data="): - cls(period_data={}, **kwargs) + with pytest.raises(TypeError, match="got both .* and stress_period_data="): + cls(stress_period_data={}, **kwargs) def test_no_legacy_kwargs(): diff --git a/test/mf6/test_mf6_load_all_models.py b/test/mf6/test_mf6_load_all_models.py index 7170d73eb..126c8542b 100644 --- a/test/mf6/test_mf6_load_all_models.py +++ b/test/mf6/test_mf6_load_all_models.py @@ -560,7 +560,7 @@ def _collapse(data): def _load_digest(component: Component, workspace: Path) -> dict: """Each component under ``component`` (itself included), by its path of names, as its type and its fields' values (see `_digest`), private ones - like `_period_data` too. Fields left None are omitted, to keep + like `_stress_period_data` too. Fields left None are omitted, to keep the snapshots small.""" out: dict = {} ws = workspace.as_posix() diff --git a/test/mf6/test_mf6_load_context.py b/test/mf6/test_mf6_load_context.py index 08046c50a..710e9e350 100644 --- a/test/mf6/test_mf6_load_context.py +++ b/test/mf6/test_mf6_load_context.py @@ -30,14 +30,14 @@ def test_resolve_without_workspace_raises(): def test_ncelldim_from_dims(): context = LoadContext(dims={"nlay": 1, "ncpl": 4, "nodes": 4}) - assert context.ncelldim(Chd.PeriodData) == 2 + assert context.ncelldim(Chd.StressPeriodData) == 2 def test_ncelldim_unknown_solved_from_row(): """Without a grid, a row's cellid width is the one its length makes room for (see item._layout).""" - assert LoadContext().ncelldim(Chd.PeriodData) is None - assert Chd.PeriodData.from_tokens([1, 2, 3, 1.0]).cellid == (0, 1, 2) + assert LoadContext().ncelldim(Chd.StressPeriodData) is None + assert Chd.StressPeriodData.from_tokens([1, 2, 3, 1.0]).cellid == (0, 1, 2) def test_ncelldim_per_column_under_exchange(): diff --git a/test/mf6/test_mf6_namefile_load.py b/test/mf6/test_mf6_namefile_load.py index 0bd9509d6..f9969a79c 100644 --- a/test/mf6/test_mf6_namefile_load.py +++ b/test/mf6/test_mf6_namefile_load.py @@ -51,12 +51,12 @@ def written_sim(tmp_path): ) gwf = Gwf(parent=sim, name=gwf_name, save_flows=True, dis=grid) gwf.npf = Npf(print_flows=True, save_flows=True, save_specific_discharge=True) - Chd(parent=gwf, period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}) + Chd(parent=gwf, stress_period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}) gwf.ic = Ic(strt=1.0) gwf.oc = Oc( budget_file=f"{gwf.name}.bud", head_file=f"{gwf.name}.hds", - period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, + stress_period_data={0: [("SAVE", "HEAD", "ALL"), ("SAVE", "BUDGET", "ALL")]}, ) sim.write() return workspace @@ -110,7 +110,7 @@ def test_load_simulation_resolves_list_package_rows(written_sim): assert len(gwf.chd) == 1 chd = gwf.chd[0] assert isinstance(chd, Chd) - rows = chd.period_data[0] + rows = chd.stress_period_data[0] assert [(r.cellid, r.head) for r in rows] == [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)] @@ -427,11 +427,11 @@ def test_write_names_packages_attached_by_assignment(tmp_path): name="sim", workspace=tmp_path, tdis=Time(perlen=[1.0], nstp=[1]), solutiongroup=[Ims()] ) gwf = Gwf(parent=sim, name="m", dis=Dis(nlay=1, nrow=1, ncol=2)) - gwf.chd = [Chd(period_data={0: [[(0, 0, 0), 1.0]]})] + gwf.chd = [Chd(stress_period_data={0: [[(0, 0, 0), 1.0]]})] sim.write() del gwf.chd[0] - gwf.chd = [Chd(period_data={0: [[(0, 0, 0), 2.0]]})] + gwf.chd = [Chd(stress_period_data={0: [[(0, 0, 0), 2.0]]})] sim.write() assert " CHD6 m.chd-1.chd chd-1" in (tmp_path / "m.nam").read_text().splitlines() @@ -596,7 +596,7 @@ def test_exchange_resolves_cellid_widths_for_dis2d(tmp_path): ] -def test_loads_cdb_period_data(tmp_path): +def test_loads_cdb_stress_period_data(tmp_path): """`Cdb` (CHF's channel-divergence boundary package) round-trips its stress period data -- the one CHF package type no upstream test exercises at all, so it's otherwise entirely unverified.""" @@ -621,16 +621,16 @@ def test_loads_cdb_period_data(tmp_path): ) ChfIc(parent=chf, strt=[1.0, 1.0]) Dfw(parent=chf, manningsn=[0.035, 0.035]) - Cdb(parent=chf, period_data={0: [[(0,), 0, 1.0]]}) + Cdb(parent=chf, stress_period_data={0: [[(0,), 0, 1.0]]}) sim.write() loaded = Simulation.load(tmp_path / "mfsim.nam") - (row,) = loaded.models[0].cdb[0].period_data[0] + (row,) = loaded.models[0].cdb[0].stress_period_data[0] assert (row.cellid, row.idcxs, row.width) == ((0,), 0, 1.0) -def test_loads_olf_cdb_period_data(tmp_path): +def test_loads_olf_cdb_stress_period_data(tmp_path): """`Cdb` (OLF's channel-divergence boundary package) round-trips its stress period data -- the one OLF package type no upstream test exercises at all, so it's otherwise entirely unverified.""" @@ -647,16 +647,16 @@ def test_loads_olf_cdb_period_data(tmp_path): Dis2d(parent=olf, nrow=1, ncol=2, delr=1.0, delc=1.0, bottom=0.0) OlfIc(parent=olf, strt=[1.0, 1.0]) Dfw(parent=olf, manningsn=[0.035, 0.035]) - Cdb(parent=olf, period_data={0: [[(0, 0), 0, 1.0]]}) + Cdb(parent=olf, stress_period_data={0: [[(0, 0), 0, 1.0]]}) sim.write() loaded = Simulation.load(tmp_path / "mfsim.nam") - (row,) = loaded.models[0].cdb[0].period_data[0] + (row,) = loaded.models[0].cdb[0].stress_period_data[0] assert (row.cellid, row.idcxs, row.width) == ((0, 0), 0, 1.0) -def test_loads_evp_period_data(tmp_path): +def test_loads_evp_stress_period_data(tmp_path): """`Evp` (CHF's evaporation package) round-trips its stress period data -- the other CHF package type no upstream test exercises at all (alongside `Cdb`), so it's otherwise entirely unverified.""" @@ -681,16 +681,16 @@ def test_loads_evp_period_data(tmp_path): ) ChfIc(parent=chf, strt=[1.0, 1.0]) Dfw(parent=chf, manningsn=[0.035, 0.035]) - Evp(parent=chf, period_data={0: [[(0,), 0.01]]}) + Evp(parent=chf, stress_period_data={0: [[(0,), 0.01]]}) sim.write() loaded = Simulation.load(tmp_path / "mfsim.nam") - (row,) = loaded.models[0].evp[0].period_data[0] + (row,) = loaded.models[0].evp[0].stress_period_data[0] assert (row.cellid, row.evaporation) == ((0,), 0.01) -def test_loads_olf_evp_period_data(tmp_path): +def test_loads_olf_evp_stress_period_data(tmp_path): """`Evp` (OLF's evaporation package) round-trips its stress period data -- the other OLF package type no upstream test exercises at all (alongside `Cdb`), so it's otherwise entirely unverified.""" @@ -707,10 +707,10 @@ def test_loads_olf_evp_period_data(tmp_path): Dis2d(parent=olf, nrow=1, ncol=2, delr=1.0, delc=1.0, bottom=0.0) OlfIc(parent=olf, strt=[1.0, 1.0]) Dfw(parent=olf, manningsn=[0.035, 0.035]) - Evp(parent=olf, period_data={0: [[(0, 0), 0.01]]}) + Evp(parent=olf, stress_period_data={0: [[(0, 0), 0.01]]}) sim.write() loaded = Simulation.load(tmp_path / "mfsim.nam") - (row,) = loaded.models[0].evp[0].period_data[0] + (row,) = loaded.models[0].evp[0].stress_period_data[0] assert (row.cellid, row.evaporation) == ((0, 0), 0.01) diff --git a/test/mf6/test_mf6_output_readers.py b/test/mf6/test_mf6_output_readers.py index fc2719a6a..225c75f69 100644 --- a/test/mf6/test_mf6_output_readers.py +++ b/test/mf6/test_mf6_output_readers.py @@ -49,13 +49,13 @@ def _dis_model_output(function_tmpdir, **dis_kwargs): Chd( parent=gwf, print_flows=True, - period_data={0: [[(0, 0, 0), 10.0], [(0, 0, ncol - 1), 0.0]]}, + stress_period_data={0: [[(0, 0, 0), 10.0], [(0, 0, ncol - 1), 0.0]]}, ) Oc( parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) sim.write() @@ -155,12 +155,12 @@ def _disv_model_output(function_tmpdir, **dis_kwargs): gwf = Gwf(parent=sim, save_flows=True, dis=disv, name=gwf_name) Ic(parent=gwf, strt=5.0) Npf(parent=gwf, k=1.0, icelltype=0) - Chd(parent=gwf, print_flows=True, period_data={0: [[(0, 0), 10.0], [(0, 8), 0.0]]}) + Chd(parent=gwf, print_flows=True, stress_period_data={0: [[(0, 0), 10.0], [(0, 8), 0.0]]}) Oc( parent=gwf, budget_file=f"{gwf_name}.cbc", head_file=f"{gwf_name}.hds", - period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST"), ("SAVE", "BUDGET", "LAST")]}, ) sim.write() diff --git a/test/mf6/test_mf6_parallel.py b/test/mf6/test_mf6_parallel.py index 9bed4f4c5..adaad7b20 100644 --- a/test/mf6/test_mf6_parallel.py +++ b/test/mf6/test_mf6_parallel.py @@ -46,11 +46,11 @@ def _build(workspace): ) Ic(parent=left, strt=0.0) Npf(parent=left, k=1.0, icelltype=0) - Chd(parent=left, period_data={0: [[(0, 0, 0), 1.0]]}) + Chd(parent=left, stress_period_data={0: [[(0, 0, 0), 1.0]]}) Oc( parent=left, head_file=f"{NAME_LEFT}.hds", - period_data={0: [("SAVE", "HEAD", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST")]}, ) right = Gwf( @@ -70,11 +70,11 @@ def _build(workspace): ) Ic(parent=right, strt=0.0) Npf(parent=right, k=1.0, icelltype=0) - Chd(parent=right, period_data={0: [[(0, 0, NCOL - 1), 10.0]]}) + Chd(parent=right, stress_period_data={0: [[(0, 0, NCOL - 1), 10.0]]}) Oc( parent=right, head_file=f"{NAME_RIGHT}.hds", - period_data={0: [("SAVE", "HEAD", "LAST")]}, + stress_period_data={0: [("SAVE", "HEAD", "LAST")]}, ) Gwfgwf( diff --git a/test/mf6/test_mf6_period_lists.py b/test/mf6/test_mf6_period_lists.py index 941daef11..89979728c 100644 --- a/test/mf6/test_mf6_period_lists.py +++ b/test/mf6/test_mf6_period_lists.py @@ -13,16 +13,16 @@ def round_trips(pkg, **kwargs): - expected = pkg.period_data + expected = pkg.stress_period_data pkg.from_xarray(pkg.to_xarray(**kwargs)) - assert pkg.period_data == expected + assert pkg.stress_period_data == expected # --- cellid rows on the grid ------------------------------------------------ def test_chd_on_grid_carries_periods_forward(): - chd = Chd(period_data={0: [((0, 0, 0), 1.0), ((0, 1, 2), 2.0)], 2: []}, dims=DIMS) + chd = Chd(stress_period_data={0: [((0, 0, 0), 1.0), ((0, 1, 2), 2.0)], 2: []}, dims=DIMS) head = chd.to_xarray()["head"] assert head.dims == ("kper", "layer", "row", "col") expected = np.full((2, 3), NODATA) @@ -34,19 +34,19 @@ def test_chd_on_grid_carries_periods_forward(): def test_chd_round_trips(): spd = {0: [((0, 0, 0), 1.0), ((0, 1, 2), 2.0)], 1: [((0, 0, 1), 3.0)], 2: []} - round_trips(Chd(period_data=spd, dims=DIMS)) + round_trips(Chd(stress_period_data=spd, dims=DIMS)) def test_unchanged_periods_load_as_carried(): - chd = Chd(period_data={0: [((0, 0, 0), 1.0)], 1: [((0, 0, 0), 1.0)]}, dims=DIMS) + chd = Chd(stress_period_data={0: [((0, 0, 0), 1.0)], 1: [((0, 0, 0), 1.0)]}, dims=DIMS) chd.from_xarray(chd.to_xarray()) - assert list(chd.period_data) == [0] + assert list(chd.stress_period_data) == [0] def test_aux_is_a_variable_per_name(): wel = Wel( auxiliary=["conc", "temp"], - period_data={0: [((0, 0, 1), -5.0, (1.0, 2.0))]}, + stress_period_data={0: [((0, 0, 1), -5.0, (1.0, 2.0))]}, dims=DIMS, ) ds = wel.to_xarray() @@ -58,7 +58,7 @@ def test_aux_is_a_variable_per_name(): def test_array_column_has_a_dim_named_for_its_size(): evt = Evt( nseg=3, - period_data={0: [((0, 0, 0), 1.0, 0.1, 2.0, (0.3, 0.6), (0.5, 0.2))]}, + stress_period_data={0: [((0, 0, 0), 1.0, 0.1, 2.0, (0.3, 0.6), (0.5, 0.2))]}, dims=DIMS, ) ds = evt.to_xarray() @@ -73,7 +73,7 @@ def test_conditional_column(): evt = Evt( nseg=2, surf_rate_specified=True, - period_data={0: [((0, 0, 0), 1.0, 0.1, 2.0, (0.3,), (0.5,), 0.7)]}, + stress_period_data={0: [((0, 0, 0), 1.0, 0.1, 2.0, (0.3,), (0.5,), 0.7)]}, dims=DIMS, ) ds = evt.to_xarray() @@ -82,7 +82,7 @@ def test_conditional_column(): def test_disv_grid(): - chd = Chd(period_data={0: [((1, 2), 1.0)]}, dims={"nlay": 2, "ncpl": 4, "nper": 1}) + chd = Chd(stress_period_data={0: [((1, 2), 1.0)]}, dims={"nlay": 2, "ncpl": 4, "nper": 1}) head = chd.to_xarray()["head"] assert head.dims == ("kper", "layer", "cell") assert head.values[0, 1, 2] == 1.0 @@ -92,7 +92,7 @@ def test_disv_grid(): def test_boundnames_are_a_coordinate(): chd = Chd( boundnames=True, - period_data={0: [((0, 0, 0), 1.0, (), "a"), ((0, 1, 1), 2.0, (), None)]}, + stress_period_data={0: [((0, 0, 0), 1.0, (), "a"), ((0, 1, 1), 2.0, (), None)]}, dims=DIMS, ) ds = chd.to_xarray() @@ -103,13 +103,13 @@ def test_boundnames_are_a_coordinate(): def test_time_series_value_is_nan_with_its_name(): - chd = Chd(period_data={0: [((0, 0, 0), "ts-2"), ((0, 0, 1), 2.0)]}, dims=DIMS) + chd = Chd(stress_period_data={0: [((0, 0, 0), "ts-2"), ((0, 0, 1), 2.0)]}, dims=DIMS) ds = chd.to_xarray() assert np.isnan(ds["head"].values[0, 0, 0, 0]) assert ds.coords["head_ts"].values[0, 0, 0, 0] == "ts-2" assert pd.isnull(ds.coords["head_ts"].values[0, 0, 0, 1]) round_trips(chd) - assert chd.period_data[0][0].head == TimeSeriesRef("ts-2") + assert chd.stress_period_data[0][0].head == TimeSeriesRef("ts-2") @pytest.mark.parametrize("sparse", [False, True]) @@ -117,17 +117,17 @@ def test_time_series_round_trips_netcdf(tmp_path, sparse): """NetCDF saves a cell without a series as '', which loads as none.""" import xarray as xr - chd = Chd(period_data={0: [((0, 0, 0), "ts-2"), ((0, 0, 1), 2.0)]}, dims=DIMS) - expected = chd.period_data + chd = Chd(stress_period_data={0: [((0, 0, 0), "ts-2"), ((0, 0, 1), 2.0)]}, dims=DIMS) + expected = chd.stress_period_data ds = chd.to_xarray(sparse=sparse) ds.drop_attrs().to_netcdf(path := tmp_path / "chd.nc") chd.from_xarray(xr.load_dataset(path).assign_attrs(ds.attrs)) - assert chd.period_data == expected + assert chd.stress_period_data == expected def test_no_grid_dims_raises(): with pytest.raises(ValueError, match="needs the grid's nlay, nrow, ncol"): - Chd(period_data={0: [((0, 0, 0), 1.0)]}).to_xarray() + Chd(stress_period_data={0: [((0, 0, 0), 1.0)]}).to_xarray() def set_at(ds, names, at, value): @@ -141,16 +141,16 @@ def set_at(ds, names, at, value): @pytest.mark.parametrize( "pkg, names, missing", [ - (Drn(period_data={0: [((0, 0, 0), 1.0, 10.0)]}, dims=DIMS), ["elev"], "cond"), + (Drn(stress_period_data={0: [((0, 0, 0), 1.0, 10.0)]}, dims=DIMS), ["elev"], "cond"), ( - Wel(auxiliary=["conc"], period_data={0: [((0, 0, 0), -1.0, (5.0,))]}, dims=DIMS), + Wel(auxiliary=["conc"], stress_period_data={0: [((0, 0, 0), -1.0, (5.0,))]}, dims=DIMS), ["q"], "aux", ), ( Evt( nseg=3, - period_data={0: [((0, 0, 0), 1.0, 0.1, 2.0, (0.3, 0.6), (0.5, 0.2))]}, + stress_period_data={0: [((0, 0, 0), 1.0, 0.1, 2.0, (0.3, 0.6), (0.5, 0.2))]}, dims=DIMS, ), ["surface", "rate", "depth"], @@ -169,7 +169,7 @@ def test_cell_missing_a_column_raises(pkg, names, missing): def two_wells(): - return Wel(period_data={0: [((0, 0, 0), -1.0), ((0, 0, 0), -2.0)]}, dims=DIMS) + return Wel(stress_period_data={0: [((0, 0, 0), -1.0), ((0, 0, 0), -2.0)]}, dims=DIMS) def test_two_rows_at_a_cell_raise(): @@ -186,10 +186,10 @@ def test_duplicates_merge(how, q): @pytest.mark.parametrize("by_column", [False, True], ids=["rows", "columns"]) def test_duplicates_keep_a_boundname(how, name, by_column): spd = {0: [((0, 0, 0), -1.0, (), "a"), ((0, 0, 0), -2.0, (), "b")]} - wel = Wel(period_data=spd, boundnames=True, dims=DIMS) + wel = Wel(stress_period_data=spd, boundnames=True, dims=DIMS) if not by_column: - tables = wel.__dict__["_period_data"] - wel.__dict__["_period_data"] = {k: t.to_items() for k, t in tables.items()} + tables = wel.__dict__["_stress_period_data"] + wel.__dict__["_stress_period_data"] = {k: t.to_items() for k, t in tables.items()} assert wel.to_xarray(duplicates=how).coords["boundname"].values[0, 0, 0, 0] == name @@ -199,13 +199,13 @@ def test_duplicates_must_be_known(): def test_summing_a_time_series_raises(): - wel = Wel(period_data={0: [((0, 0, 0), "ts-2"), ((0, 0, 0), -2.0)]}, dims=DIMS) + wel = Wel(stress_period_data={0: [((0, 0, 0), "ts-2"), ((0, 0, 0), -2.0)]}, dims=DIMS) with pytest.raises(ValueError, match="can't be summed"): wel.to_xarray(duplicates="sum") def test_periods_past_nper_are_dropped(): - wel = Wel(period_data={3: [((0, 0, 0), "ts-2"), ((0, 0, 1), -1.0)]}, dims=DIMS) + wel = Wel(stress_period_data={3: [((0, 0, 0), "ts-2"), ((0, 0, 1), -1.0)]}, dims=DIMS) with pytest.warns(UserWarning, match="past NPER"): ds = wel.to_xarray() assert (ds["q"].values == NODATA).all() @@ -221,8 +221,8 @@ def wells_by_column(): 0: [((0, 0, 0), -1.0, (1.0,), "a"), ((0, 1, 2), "ts-2", (2.0,), None)], 2: [((0, 0, 1), -1.0, (3.0,), "b"), ((0, 0, 1), -2.0, (4.0,), "c")], } - wel = Wel(period_data=spd, auxiliary=["conc"], boundnames=True, dims=DIMS) - assert isinstance(wel.__dict__["_period_data"][0], ItemTable) + wel = Wel(stress_period_data=spd, auxiliary=["conc"], boundnames=True, dims=DIMS) + assert isinstance(wel.__dict__["_stress_period_data"][0], ItemTable) return wel @@ -233,18 +233,18 @@ def wells_by_column(): ) def test_columns_give_what_rows_do(kwargs): wel = wells_by_column() - tables = wel.__dict__["_period_data"] + tables = wel.__dict__["_stress_period_data"] by_column = wel.to_xarray(**kwargs) - wel.__dict__["_period_data"] = {k: t.to_items() for k, t in tables.items()} + wel.__dict__["_stress_period_data"] = {k: t.to_items() for k, t in tables.items()} assert by_column.identical(wel.to_xarray(**kwargs)) @pytest.mark.parametrize("sparse", [True, False], ids=["sparse", "dense"]) def test_tabular_rows_come_back_as_tables(sparse): wel = wells_by_column() - tables = wel.__dict__["_period_data"] + tables = wel.__dict__["_stress_period_data"] wel.from_xarray(wel.to_xarray(sparse=sparse, duplicates="last")) - spd = wel.__dict__["_period_data"] + spd = wel.__dict__["_stress_period_data"] assert all(isinstance(t, ItemTable) for t in spd.values()) assert spd[0] == tables[0] assert spd[0].columns["q"].dtype == object # a series @@ -267,7 +267,7 @@ def uzf(): (0, (0, 0, 2), 1, -1, 0.001, 1.0, 0.05, 0.25, 0.05, 4.0), (1, (0, 1, 0), 1, -1, 0.001, 1.0, 0.05, 0.25, 0.05, 4.0), ], - period_data={0: [(1, 0.01, 0.001, 2.25, 0.05, 0.0, 0.0, 0.0)]}, + stress_period_data={0: [(1, 0.01, 0.001, 2.25, 0.05, 0.0, 0.0, 0.0)]}, dims=DIMS, ) @@ -287,7 +287,7 @@ def test_uzf_rows_on_the_grid_through_packagedata(): def sfr(spd, **kwargs): - return Sfr(nreaches=3, period_data=spd, dims=DIMS, **kwargs) + return Sfr(nreaches=3, stress_period_data=spd, dims=DIMS, **kwargs) def test_sfr_settings_are_variables_per_setting(): @@ -336,7 +336,7 @@ def test_lak_settings_are_on_their_keys_dims(): lak = Lak( nlakes=2, noutlets=1, - period_data={0: [Lak.Stage(1, 10.0), Lak.Rate(0, 0.5)]}, + stress_period_data={0: [Lak.Stage(1, 10.0), Lak.Rate(0, 0.5)]}, dims=DIMS, ) ds = lak.to_xarray() @@ -348,7 +348,7 @@ def test_lak_settings_are_on_their_keys_dims(): def test_maw_word_or_number_setting_is_an_object_variable(): maw = Maw( nmawwells=2, - period_data={0: [(0, "head_limit", "off"), (1, "head_limit", 2.5)]}, + stress_period_data={0: [(0, "head_limit", "off"), (1, "head_limit", 2.5)]}, dims=DIMS, ) ds = maw.to_xarray() @@ -366,7 +366,7 @@ def test_maw_word_or_number_setting_is_an_object_variable(): pytest.param( lambda: Chd( boundnames=True, - period_data={ + stress_period_data={ 0: [((0, 0, 0), 1.0, (), "a"), ((0, 0, 0), "ts-2")], 2: [], }, @@ -378,7 +378,9 @@ def test_maw_word_or_number_setting_is_an_object_variable(): lambda: Evt( nseg=3, auxiliary=["conc"], - period_data={0: [((0, 0, 0), 1.0, 0.1, 2.0, (0.3, 0.6), (0.5, 0.2), None, (4.0,))]}, + stress_period_data={ + 0: [((0, 0, 0), 1.0, 0.1, 2.0, (0.3, 0.6), (0.5, 0.2), None, (4.0,))] + }, dims=DIMS, ), id="evt", @@ -393,22 +395,24 @@ def test_maw_word_or_number_setting_is_an_object_variable(): lambda: Lak( nlakes=2, noutlets=1, - period_data={0: [Lak.Stage(1, 10.0), Lak.Auxiliary(0, "conc", 1.0)]}, + stress_period_data={0: [Lak.Stage(1, 10.0), Lak.Auxiliary(0, "conc", 1.0)]}, auxiliary=["conc"], dims=DIMS, ), id="lak", ), pytest.param( - lambda: Hfb(period_data={0: [((0, 0, 0), (0, 0, 1), 1e-3)]}, dims=DIMS), + lambda: Hfb(stress_period_data={0: [((0, 0, 0), (0, 0, 1), 1e-3)]}, dims=DIMS), id="hfb", ), pytest.param( - lambda: Mvr(period_data={0: [("wel", 0, "drn", 1, "factor", 0.5)]}, dims=DIMS), + lambda: Mvr(stress_period_data={0: [("wel", 0, "drn", 1, "factor", 0.5)]}, dims=DIMS), id="mvr", ), pytest.param( - lambda: Oc(period_data={0: [("save", "head", "all"), ("print", "budget", "last")]}), + lambda: Oc( + stress_period_data={0: [("save", "head", "all"), ("print", "budget", "last")]} + ), id="oc", ), ], @@ -422,7 +426,7 @@ def test_sparse_round_trips(pkg): def test_sparse_cellid_columns_are_named_for_grid_dims(): - tvk = Tvk(period_data={0: [((0, 1, 2), Tvk.K(5.0))]}, dims=DIMS) + tvk = Tvk(stress_period_data={0: [((0, 1, 2), Tvk.K(5.0))]}, dims=DIMS) ds = tvk.to_xarray(sparse=True) assert [int(ds.coords[n].values[0]) for n in ("cellid_layer", "cellid_row", "cellid_col")] == [ 0, @@ -434,14 +438,14 @@ def test_sparse_cellid_columns_are_named_for_grid_dims(): def test_rows_with_no_single_key_are_sparse(): - hfb = Hfb(period_data={0: [((0, 0, 0), (0, 0, 1), 1e-3)]}, dims=DIMS) + hfb = Hfb(stress_period_data={0: [((0, 0, 0), (0, 0, 1), 1e-3)]}, dims=DIMS) ds = hfb.to_xarray() assert ds["hydchr"].dims == ("entry",) assert list(ds.coords["cellid2_col"].values) == [1] def test_aux_named_like_a_column_raises(): - wel = Wel(auxiliary=["q"], period_data={0: [((0, 0, 0), -1.0, (2.0,))]}, dims=DIMS) + wel = Wel(auxiliary=["q"], stress_period_data={0: [((0, 0, 0), -1.0, (2.0,))]}, dims=DIMS) with pytest.raises(ValueError, match="'q'"): wel.to_xarray() with pytest.raises(ValueError, match="name of a column"): @@ -453,20 +457,20 @@ def test_assigned_rows_taken_as_at_construction(how): import copy import pickle - chd = Chd(period_data={0: [((0, 0, 0), 1.0)]}, dims=DIMS) + chd = Chd(stress_period_data={0: [((0, 0, 0), 1.0)]}, dims=DIMS) rows = [((0, 1, 2), 2.0, "b")] if how == "setter": - chd.period_data = {1: rows} + chd.stress_period_data = {1: rows} elif how == "item": - chd.period_data[1] = rows + chd.stress_period_data[1] = rows else: - chd.period_data.update({1: rows}) - assert isinstance(chd.period_data[1], ItemTable) - assert chd.period_data[1][0].boundname == "b" + chd.stress_period_data.update({1: rows}) + assert isinstance(chd.stress_period_data[1], ItemTable) + assert chd.stress_period_data[1][0].boundname == "b" assert chd.boundnames assert chd.to_xarray()["head"].values[1, 0, 1, 2] == 2.0 for other in (copy.deepcopy(chd), pickle.loads(pickle.dumps(chd))): assert other == chd - other.period_data[2] = [((0, 0, 1), 3.0)] - assert isinstance(other.period_data[2], ItemTable) - assert 2 not in chd.period_data + other.stress_period_data[2] = [((0, 0, 1), 3.0)] + assert isinstance(other.stress_period_data[2], ItemTable) + assert 2 not in chd.stress_period_data diff --git a/test/mf6/test_mf6_reader.py b/test/mf6/test_mf6_reader.py index ed1127c5c..24162fe71 100644 --- a/test/mf6/test_mf6_reader.py +++ b/test/mf6/test_mf6_reader.py @@ -487,10 +487,10 @@ def test_transform_gwf_wel_file(model_workspace): # Should have a period 2 entry (indexed period blocks are flattened to "period N" keys) assert "period 2" in result - assert "period_data" in result["period 2"] + assert "stress_period_data" in result["period 2"] # Should have 2 rows of data (MAXBOUND = 2) - spd = result["period 2"]["period_data"] + spd = result["period 2"]["stress_period_data"] assert len(spd) == 2 # Each row should have 4 values (cellid components + q value) @@ -846,7 +846,7 @@ def test_typed_loads_fortran_real_forms_in_list_rows_as_words(): "BEGIN period 1\n 1 1 1 1.0+1 1-2\nEND period\n", "gwf-chd", ) - assert result["period 1"]["period_data"] == [["1", "1", "1", "1.0+1", "1-2"]] + assert result["period 1"]["stress_period_data"] == [["1", "1", "1", "1.0+1", "1-2"]] def test_typed_loads_iso_datetime(): @@ -868,13 +868,13 @@ def test_typed_loads_words_starting_with_begin_or_end(): "BEGIN PERIOD 1\n 1 1 1 1.0 10.0 endpoint\n 1 1 2 1.0 10.0 Beginning\n" " 1 1 3 1.0 10.0 end_x\nEND PERIOD\n" ) - rows = loads_typed(ghb, "gwf-ghb")["period 1"]["period_data"] + rows = loads_typed(ghb, "gwf-ghb")["period 1"]["stress_period_data"] assert [r[-1] for r in rows] == ["endpoint", "Beginning", "end_x"] assert rows == loads(ghb)["PERIOD 1"] obs = "BEGIN CONTINUOUS FILEOUT x.csv\n endwell HEAD 1 1 1\nEND CONTINUOUS\n" typed = loads_typed(obs, "utl-obs")["continuous FILEOUT x.csv"] - assert typed["period_data"] == loads(obs)["CONTINUOUS FILEOUT x.csv"] + assert typed["stress_period_data"] == loads(obs)["CONTINUOUS FILEOUT x.csv"] def test_typed_loads_bare_begin_or_end_word(): @@ -892,12 +892,12 @@ def test_typed_loads_begin_or_end_after_row_start(): from flopy4.mf6.codec.reader import loads, loads_typed ghb = "BEGIN PERIOD 1\n 1 1 1 1.0 10.0 end\n 1 1 2 1.0 10.0 BEGIN\nEND PERIOD\n" - rows = loads_typed(ghb, "gwf-ghb")["period 1"]["period_data"] + rows = loads_typed(ghb, "gwf-ghb")["period 1"]["stress_period_data"] assert [r[-1] for r in rows] == ["end", "BEGIN"] assert rows == loads(ghb)["PERIOD 1"] ts = "BEGIN TIMESERIES\n 0.0 1.0 begin SP 1\n 1.0 2.0 end\nEND TIMESERIES\n" - typed = loads_typed(ts, "utl-ts")["timeseries"]["period_data"] + typed = loads_typed(ts, "utl-ts")["timeseries"]["stress_period_data"] assert typed == [["0.0", "1.0", "begin", "SP", "1"], ["1.0", "2.0", "end"]] @@ -907,7 +907,7 @@ def test_typed_loads_bang_comment_after_number(): from flopy4.mf6.codec.reader import loads, loads_typed ghb = "BEGIN PERIOD 1\n 1 1 1 1.0 10.0!note\nEND PERIOD\n" - rows = loads_typed(ghb, "gwf-ghb")["period 1"]["period_data"] + rows = loads_typed(ghb, "gwf-ghb")["period 1"]["stress_period_data"] assert rows == [["1", "1", "1", "1.0", "10.0"]] assert rows == loads(ghb)["PERIOD 1"] @@ -925,17 +925,17 @@ def test_typed_loads_number_lines_as_text(): "BEGIN PERIOD 2\n 1 1 1 1.0 10.0 a\n # a comment\n 1 1 2 1.0 10.0\nEND PERIOD\n" ) typed, basic = loads_typed(ghb, "gwf-ghb"), loads(ghb) - rows = typed["period 1"]["period_data"] + rows = typed["period 1"]["stress_period_data"] assert isinstance(rows, NumberRows) assert rows == [["1", "1", "1", "1.0", "10.0"], ["1", "1", "2", "1.0D1", "10.0"]] assert rows == basic["PERIOD 1"] - rows = typed["period 2"]["period_data"] + rows = typed["period 2"]["stress_period_data"] assert rows == [["1", "1", "1", "1.0", "10.0", "a"], ["1", "1", "2", "1.0", "10.0"]] assert rows == basic["PERIOD 2"] # a block's list other than a period's disv = "BEGIN VERTICES\n 1 0.0 0.0\n 2 1.0 0.0\nEND VERTICES\n" - assert loads_typed(disv, "gwf-disv")["vertices"]["period_data"] == [ + assert loads_typed(disv, "gwf-disv")["vertices"]["stress_period_data"] == [ ["1", "0.0", "0.0"], ["2", "1.0", "0.0"], ] @@ -951,7 +951,7 @@ def test_typed_loads_records(): "BEGIN PERIOD 1\n 1 inflow 0.0\n 1 status active, 2 'a b' 3\n" " 2 rainfall 1.0 # note\n 2 stage 1.5\n\n # c\n 3 end 1\nEND PERIOD\n" ) - rows = loads_typed(sfr, "gwf-sfr")["period 1"]["period_data"] + rows = loads_typed(sfr, "gwf-sfr")["period 1"]["stress_period_data"] assert rows == [ ["1", "inflow", "0.0"], ["1", "status", "active", "2", "a b", "3"], @@ -966,7 +966,7 @@ def test_typed_loads_records(): nam = "BEGIN SOLUTIONGROUP 1\n MXITER 2\n IMS6 sim.ims gwf\nEND SOLUTIONGROUP\n" assert loads_typed(nam, "sim-nam")["solutiongroup 1"] == { "mxiter": 2, - "period_data": [["IMS6", "sim.ims", "gwf"]], + "stress_period_data": [["IMS6", "sim.ims", "gwf"]], } # ...its rows kept on either side of the field nam = ( @@ -974,7 +974,7 @@ def test_typed_loads_records(): ) assert loads_typed(nam, "sim-nam")["solutiongroup 1"] == { "mxiter": 3, - "period_data": [["IMS6", "a.ims", "gwf"], ["EMS6", "b.ems", "gwe"]], + "stress_period_data": [["IMS6", "a.ims", "gwf"], ["EMS6", "b.ems", "gwe"]], } diff --git a/test/mf6/test_mf6_write_context.py b/test/mf6/test_mf6_write_context.py index 79d716f17..338f322fc 100644 --- a/test/mf6/test_mf6_write_context.py +++ b/test/mf6/test_mf6_write_context.py @@ -128,7 +128,7 @@ def test_component_write_with_context(function_tmpdir): gwf = Gwf(parent=sim, name="gwf", dis=dis) ic = Ic(parent=gwf, strt=1.0) npf = Npf(parent=gwf, k=1.0) - chd = Chd(parent=gwf, period_data={0: [[(0, 0, 0), 1.0]]}) + chd = Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 1.0]]}) oc = Oc(parent=gwf, head_file="gwf.hds", budget_file="gwf.bud") # Write with custom context diff --git a/test/test_converter_structure.py b/test/test_converter_structure.py index 95b86c916..f2a6e787b 100644 --- a/test/test_converter_structure.py +++ b/test/test_converter_structure.py @@ -157,13 +157,13 @@ class TestChdComponent: """Test structure_array with Chd component (stress period data).""" def test_chd_with_dict_format(self): - """Test CHD with period_data dict format.""" + """Test CHD with stress_period_data dict format.""" chd = Chd( - period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}, + stress_period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}, ) - assert hasattr(chd, "_period_data") - rec = chd._period_data[0] + assert hasattr(chd, "_stress_period_data") + rec = chd._stress_period_data[0] assert list(rec[0].cellid) == [0, 0, 0] assert float(rec[0].head) == 1.0 assert list(rec[1].cellid) == [0, 9, 9] @@ -172,34 +172,34 @@ def test_chd_with_dict_format(self): def test_chd_with_fill_forward(self): """Test CHD stores multiple periods separately (fill-forward is write-time only).""" chd = Chd( - period_data={ + stress_period_data={ 0: [((0, 0, 0), 1.0)], 5: [((0, 0, 0), 2.0)], }, ) # Both periods are stored; no in-memory fill-forward - assert set(chd._period_data.keys()) == {0, 5} - assert float(chd._period_data[0][0].head) == 1.0 - assert float(chd._period_data[5][0].head) == 2.0 + assert set(chd._stress_period_data.keys()) == {0, 5} + assert float(chd._stress_period_data[0][0].head) == 1.0 + assert float(chd._stress_period_data[5][0].head) == 2.0 class TestRchComponent: """Test structure_array with Rch component (recharge).""" - def test_rch_with_period_data(self): - """Test RCH period_data API (explicit cellid tuples).""" + def test_rch_with_stress_period_data(self): + """Test RCH stress_period_data API (explicit cellid tuples).""" rch = Rch( - period_data={ + stress_period_data={ 0: [((0, 0, 0), 0.004), ((0, 9, 9), 0.004)], 1: [((0, 0, 0), 0.002), ((0, 9, 9), 0.002)], }, ) - assert hasattr(rch, "_period_data") - assert set(rch._period_data.keys()) == {0, 1} - assert float(rch._period_data[0][0].recharge) == 0.004 - assert float(rch._period_data[1][0].recharge) == 0.002 + assert hasattr(rch, "_stress_period_data") + assert set(rch._stress_period_data.keys()) == {0, 1} + assert float(rch._stress_period_data[0][0].recharge) == 0.004 + assert float(rch._stress_period_data[1][0].recharge) == 0.002 class TestXarrayOutput: @@ -226,18 +226,18 @@ def test_empty_dict_creates_default_array(self): assert ic.strt.shape == (100,) def test_mixed_dict_value_types(self): - """Test period_data with multiple periods and cellids.""" + """Test stress_period_data with multiple periods and cellids.""" chd = Chd( - period_data={ + stress_period_data={ 0: [((0, 0, 0), 1.0)], 5: [((0, 0, 0), 2.0), ((0, 9, 9), 0.5)], }, ) - assert set(chd._period_data.keys()) == {0, 5} - assert float(chd._period_data[0][0].head) == 1.0 - assert float(chd._period_data[5][0].head) == 2.0 - assert float(chd._period_data[5][1].head) == 0.5 + assert set(chd._stress_period_data.keys()) == {0, 5} + assert float(chd._stress_period_data[0][0].head) == 1.0 + assert float(chd._stress_period_data[5][0].head) == 2.0 + assert float(chd._stress_period_data[5][1].head) == 0.5 class TestDataFrameIntegration: @@ -246,7 +246,7 @@ class TestDataFrameIntegration: def test_to_dataframe_chd_multi_period(self): """Test that to_dataframe() returns correct tidy DataFrame for multi-period CHD.""" chd = Chd( - period_data={ + stress_period_data={ 0: [((0, 0, 0), 10.0), ((1, 9, 9), 5.0)], 1: [((0, 0, 0), 11.0), ((1, 9, 9), 6.0)], }, @@ -265,7 +265,7 @@ def test_to_dataframe_chd_multi_period(self): def test_to_dataframe_chd_cellid_as_tuple(self): """Test that cellid column contains tuples (not expanded layer/row/col).""" chd = Chd( - period_data={0: [((0, 2, 3), 7.5)]}, + stress_period_data={0: [((0, 2, 3), 7.5)]}, ) df = chd.to_dataframe() diff --git a/test/test_dataframe_api.py b/test/test_dataframe_api.py index ab27c2049..4ca958ac4 100644 --- a/test/test_dataframe_api.py +++ b/test/test_dataframe_api.py @@ -1,7 +1,7 @@ -"""Tests for period_data / to_dataframe() API. +"""Tests for stress_period_data / to_dataframe() API. Stress-period packages (Chd, Drn, Wel, …) expose: - - ``period_data`` property returning ``Optional[dict[int, np.recarray]]`` + - ``stress_period_data`` property returning ``Optional[dict[int, np.recarray]]`` - ``to_dataframe()`` returning a tidy DataFrame with ``kper``, ``cellid`` (tuple column), and field value columns (head, q, elev, cond, …) """ @@ -15,7 +15,7 @@ def test_chd_to_dataframe(): """to_dataframe() for CHD returns kper, cellid tuple, and head columns.""" - chd = Chd(period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}) + chd = Chd(stress_period_data={0: [((0, 0, 0), 1.0), ((0, 9, 9), 0.0)]}) df = chd.to_dataframe() assert isinstance(df, type(df)) # is a DataFrame @@ -38,7 +38,7 @@ def test_chd_to_dataframe(): def test_wel_to_dataframe(): """to_dataframe() for WEL returns q column.""" wel = Wel( - period_data={0: [((0, 5, 5), -100.0), ((0, 8, 8), 50.0)]}, + stress_period_data={0: [((0, 5, 5), -100.0), ((0, 8, 8), 50.0)]}, ) df = wel.to_dataframe() @@ -51,7 +51,7 @@ def test_wel_to_dataframe(): def test_drn_to_dataframe_multifield(): """to_dataframe() for DRN returns both elev and cond columns.""" - drn = Drn(period_data={0: [((0, 7, 5), 10.0, 1.0)]}) + drn = Drn(stress_period_data={0: [((0, 7, 5), 10.0, 1.0)]}) df = drn.to_dataframe() assert len(df) == 1 @@ -64,7 +64,7 @@ def test_drn_to_dataframe_multifield(): def test_multi_period_to_dataframe(): """to_dataframe() includes rows for each stress period.""" chd = Chd( - period_data={ + stress_period_data={ 0: [((0, 0, 0), 1.0)], 1: [((0, 0, 0), 0.9)], 2: [((0, 0, 0), 0.8)], @@ -81,7 +81,7 @@ def test_multi_period_to_dataframe(): def test_multiple_cells_to_dataframe(): """to_dataframe() includes all cells for each period.""" chd = Chd( - period_data={ + stress_period_data={ 0: [((0, 0, 0), 1.0), ((0, 5, 5), 0.5), ((0, 9, 9), 0.0)], 1: [((0, 0, 0), 0.9), ((0, 5, 5), 0.45), ((0, 9, 9), 0.0)], }, @@ -99,9 +99,9 @@ def test_multiple_cells_to_dataframe(): assert sorted(float(v) for v in per1["head"]) == [0.0, 0.45, 0.9] -def test_empty_period_data_to_dataframe(): +def test_empty_stress_period_data_to_dataframe(): """to_dataframe() returns empty DataFrame when no stress period data.""" - chd = Chd() # No period_data + chd = Chd() # No stress_period_data df = chd.to_dataframe() import pandas as pd @@ -115,115 +115,115 @@ def test_empty_period_data_to_dataframe(): # --------------------------------------------------------------------------- -def test_period_data_setter_single_field(): - """Set CHD period_data from a DataFrame with one value column.""" - chd = Chd(period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 1), 2.0]]}) +def test_stress_period_data_setter_single_field(): + """Set CHD stress_period_data from a DataFrame with one value column.""" + chd = Chd(stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 1), 2.0]]}) df = chd.to_dataframe() chd.from_dataframe(df) - spd = chd.period_data + spd = chd.stress_period_data assert tuple(spd[0][0].cellid) == (0, 0, 0) assert spd[0][0].head == 1.0 assert spd[0][1].head == 2.0 -def test_period_data_setter_multifield(): - """Set DRN period_data from a DataFrame with multiple value columns.""" - drn = Drn(period_data={0: [[(0, 0, 0), 5.0, 0.01], [(0, 1, 0), 4.0, 0.02]]}) +def test_stress_period_data_setter_multifield(): + """Set DRN stress_period_data from a DataFrame with multiple value columns.""" + drn = Drn(stress_period_data={0: [[(0, 0, 0), 5.0, 0.01], [(0, 1, 0), 4.0, 0.02]]}) df = drn.to_dataframe() drn.from_dataframe(df) - spd = drn.period_data + spd = drn.stress_period_data assert spd[0][0].elev == pytest.approx(5.0) assert spd[0][1].cond == pytest.approx(0.02) -def test_period_data_setter_modify_existing(): +def test_stress_period_data_setter_modify_existing(): """Modify a value in the DataFrame then set back.""" - chd = Chd(period_data={0: [[(0, 0, 0), 1.0]]}) + chd = Chd(stress_period_data={0: [[(0, 0, 0), 1.0]]}) df = chd.to_dataframe() df.loc[0, "head"] = 99.0 chd.from_dataframe(df) - assert chd.period_data[0][0].head == pytest.approx(99.0) + assert chd.stress_period_data[0][0].head == pytest.approx(99.0) -def test_period_data_setter_node_format(): +def test_stress_period_data_setter_node_format(): """CHD with DISV (2D cellid) round-trips through DataFrame.""" chd = Chd( dims={"ncpl": 10, "nlay": 1, "nodes": 10}, - period_data={0: [[(0, 5), 1.0], [(0, 9), 2.0]]}, + stress_period_data={0: [[(0, 5), 1.0], [(0, 9), 2.0]]}, ) df = chd.to_dataframe() chd.from_dataframe(df) - spd = chd.period_data + spd = chd.stress_period_data assert tuple(spd[0][0].cellid) == (0, 5) assert spd[0][1].head == pytest.approx(2.0) -def test_period_data_setter_partial_fields(): +def test_stress_period_data_setter_partial_fields(): """Setting from a DataFrame with fewer rows than original replaces SPD.""" - chd = Chd(period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 1), 2.0]]}) + chd = Chd(stress_period_data={0: [[(0, 0, 0), 1.0], [(0, 0, 1), 2.0]]}) df = chd.to_dataframe() # Keep only first row df = df.iloc[:1] chd.from_dataframe(df) - assert len(chd.period_data[0]) == 1 + assert len(chd.stress_period_data[0]) == 1 -def test_period_data_setter_structured_grid(): +def test_stress_period_data_setter_structured_grid(): """CHD with multiple stress periods round-trips correctly.""" chd = Chd( - period_data={ + stress_period_data={ 0: [[(0, 0, 0), 1.0], [(0, 0, 1), 2.0]], 1: [[(0, 0, 0), 3.0]], } ) df = chd.to_dataframe() chd.from_dataframe(df) - spd = chd.period_data + spd = chd.stress_period_data assert set(spd.keys()) == {0, 1} assert spd[1][0].head == pytest.approx(3.0) -def test_period_data_setter_errors(): +def test_stress_period_data_setter_errors(): """from_dataframe raises on missing kper column.""" - chd = Chd(period_data={0: [[(0, 0, 0), 1.0]]}) + chd = Chd(stress_period_data={0: [[(0, 0, 0), 1.0]]}) df = pd.DataFrame({"cellid": [(0, 0, 0)], "head": [1.0]}) with pytest.raises(ValueError, match="kper"): chd.from_dataframe(df) -def test_period_data_setter_with_named_aux_column(): +def test_stress_period_data_setter_with_named_aux_column(): """WEL with one aux column round-trips through DataFrame.""" wel = Wel( auxiliary=["concentration"], - period_data={0: [[(0, 0, 0), -100.0, 35.0]]}, + stress_period_data={0: [[(0, 0, 0), -100.0, 35.0]]}, ) df = wel.to_dataframe() wel.from_dataframe(df) - spd = wel.period_data + spd = wel.stress_period_data assert spd[0][0].q == pytest.approx(-100.0) assert float(spd[0][0].aux[0]) == pytest.approx(35.0) -def test_period_data_setter_with_two_named_aux_columns(): +def test_stress_period_data_setter_with_two_named_aux_columns(): """WEL with two aux columns round-trips through DataFrame.""" wel = Wel( auxiliary=["concentration", "density"], - period_data={0: [[(0, 0, 0), -100.0, 35.0, 1025.0]]}, + stress_period_data={0: [[(0, 0, 0), -100.0, 35.0, 1025.0]]}, ) df = wel.to_dataframe() wel.from_dataframe(df) - spd = wel.period_data + spd = wel.stress_period_data assert float(spd[0][0].aux[0]) == pytest.approx(35.0) assert float(spd[0][0].aux[1]) == pytest.approx(1025.0) def test_from_dataframe_drops_missing_optional_columns(): """A NaN in an optional str column (boundname) falls back to the default.""" - chd = Chd(period_data={0: [[(0, 0, 0), 1.0, "a"], [(0, 0, 1), 2.0]]}) + chd = Chd(stress_period_data={0: [[(0, 0, 0), 1.0, "a"], [(0, 0, 1), 2.0]]}) df = chd.to_dataframe() assert "boundname" in df.columns and pd.isna(df["boundname"].iloc[1]) chd.from_dataframe(df) - rows = chd.period_data[0] + rows = chd.stress_period_data[0] assert rows[0].boundname == "a" assert rows[1].boundname is None @@ -232,7 +232,7 @@ def test_union_field_rows_round_trip(): """A row's union field (MAW's mawsetting) is a column of arm instances, not of dicts, so the frame round-trips.""" maw = Maw( - period_data={ + stress_period_data={ 0: [(0, "RATE", -1.0), (1, "STATUS", "INACTIVE")], 1: [(0, "RATE", -2.0)], } @@ -242,7 +242,7 @@ def test_union_field_rows_round_trip(): assert df["mawsetting"].iloc[0] == Maw.Rate(rate=-1.0) maw2 = Maw() maw2.from_dataframe(df) - assert maw2.period_data == maw.period_data + assert maw2.stress_period_data == maw.stress_period_data def test_union_list_round_trip(): @@ -250,11 +250,11 @@ def test_union_list_round_trip(): a keyword column, and keep their ints though other arms leave gaps.""" prp = Prp( dims={"nper": 2}, - period_data={0: [("FREQUENCY", 2), "ALL"], 1: [("STEPS", 1, 3)]}, + stress_period_data={0: [("FREQUENCY", 2), "ALL"], 1: [("STEPS", 1, 3)]}, ) df = prp.to_dataframe() assert list(df["keyword"]) == ["FREQUENCY", "ALL", "STEPS"] assert df["frequency"].iloc[0] == 2 and isinstance(df["frequency"].iloc[0], int) prp2 = Prp(dims={"nper": 2}) prp2.from_dataframe(df) - assert prp2.period_data == prp.period_data + assert prp2.stress_period_data == prp.stress_period_data diff --git a/test/test_imports.py b/test/test_imports.py index b22e745a5..56999c09a 100644 --- a/test/test_imports.py +++ b/test/test_imports.py @@ -25,8 +25,8 @@ gwf = Gwf(parent=sim, dis=Dis(nlay=1, nrow=3, ncol=3, top=1.0, botm=0.0), name="gwf") Ic(parent=gwf) Npf(parent=gwf, k=1.0) -Oc(parent=gwf, head_file="gwf.hds", period_data={0: [("SAVE", "HEAD", "ALL")]}) -Chd(parent=gwf, period_data={0: [[(0, 0, 0), 1.0]]}) +Oc(parent=gwf, head_file="gwf.hds", stress_period_data={0: [("SAVE", "HEAD", "ALL")]}) +Chd(parent=gwf, stress_period_data={0: [[(0, 0, 0), 1.0]]}) sim.write() Simulation.load(ws / "mfsim.nam") print(" ".join(sorted({m.split(".")[0] for m in sys.modules})))