more cleanup

Author: mjreno

flopy4/mf6/converter/unstructure.py

@@ -93,23 +93,18 @@ def _hack_structured_grid_dims(
 def _hack_period_non_numeric(name: str, value: xr.DataArray) -> dict[str, dict[int, Any]]:
     from flopy4.mf6.gwf import Oc
 
-    def oc_setting_data(rec, action):
+    def oc_setting_data(rec):
         dat = {}
-        key = f"{action} {rec.rtype}"
         if rec.steps.first:
             dat = {kper: "first" for kper in range(value.sizes["nper"])}
-            data[key] = dat
         elif rec.steps.last:
             dat = {kper: "last" for kper in range(value.sizes["nper"])}
-            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"])}
-            data[key] = dat
         elif rec.steps.all:
             # check last as this defaults to True
             dat = {kper: "all" for kper in range(value.sizes["nper"])}
-            data[key] = dat
 
         return dat
 
@@ -127,17 +122,15 @@ def oc_setting_data(rec, action):
                 if hasattr(value.values[0], "printrecord") and isinstance(
                     value.values[0].printrecord, list
                 ):
-                    action = "PRINT"
                     for rec in value.values[0].printrecord:
-                        key = f"{action} {rec.rtype}"
-                        data[key] = oc_setting_data(rec, action)
+                        key = f"{rec.print} {rec.rtype}"
+                        data[key] = oc_setting_data(rec)
                 if hasattr(value.values[0], "saverecord") and isinstance(
                     value.values[0].saverecord, list
                 ):
-                    action = "SAVE"
                     for rec in value.values[0].saverecord:  # type: ignore
-                        key = f"{action} {rec.rtype}"
-                        data[key] = oc_setting_data(rec, action)
+                        key = f"{rec.save} {rec.rtype}"  # type: ignore
+                        data[key] = oc_setting_data(rec)
 
     return data