cleanup

Author: mjreno

flopy4/mf6/converter/unstructure.py

@@ -95,24 +95,22 @@ def _hack_period_non_numeric(name: str, value: xr.DataArray) -> dict[str, dict[i
 
     def oc_setting_data(rec, action):
         dat = {}
+        key = f"{action} {rec.rtype}"
         if rec.steps.first:
             dat = {kper: "first" for kper in range(value.sizes["nper"])}
-            key = f"{action} {rec.rtype}"
             data[key] = dat
         elif rec.steps.last:
             dat = {kper: "last" for kper in range(value.sizes["nper"])}
-            key = f"{action} {rec.rtype}"
             data[key] = dat
         elif rec.steps.steps:
             steps = " ".join(str(x - 1) for x in rec.steps.steps)
             dat = {kper: f"steps {steps}" for kper in range(value.sizes["nper"])}
-            key = f"{action} {rec.rtype}"
             data[key] = dat
         elif rec.steps.all:
             # check last as this defaults to True
             dat = {kper: "all" for kper in range(value.sizes["nper"])}
-            key = f"{action} {rec.rtype}"
             data[key] = dat
+
         return dat
 
     data = {}

test/test_mf6_codec.py

@@ -120,13 +120,10 @@ def test_dumps_oc2():
         dims={"nper": 1},
         budget_file="test.bud",
         head_file="test.hds",
-        # save_head={0: "all"},
-        # save_budget={0: "all"},
         perioddata={
             0: Oc.PrintSaveSetting(
                 printrecord=[
                     Oc.PrintRecord("head", Oc.Steps(first=True)),
-                    # Oc.PrintRecord("budget", Oc.Steps(last=True)),
                     Oc.PrintRecord("budget", Oc.Steps(steps=(2, 3, 5))),
                 ],
                 saverecord=[