rework oc

Author: wpbonelli

docs/examples/quickstart.py

@@ -41,8 +41,7 @@
 assert gwf.dis.data.botm.sel(lay=0, col=0, row=0) == 0.0
 
 # check OC
-assert oc.data["saverecord"][0] == "all"
-assert oc.data.save_head.sel(per=0) == "all"
+oc.data.perioddata[0].saverecord
 
 # get head and budget results
 budget = gwf.output.budget.squeeze()

flopy4/mf6/gwf/oc.py

@@ -22,17 +22,13 @@ class FormatRecord:
         format: Literal["exponential", "fixed", "general", "scientific"] = field(default="general")
 
     @define(slots=False)
-    class OCSettingOption:
+    class OCSetting:
         first: bool = field(default=True)
         last: bool = field(default=False)
         all: bool = field(default=False)
-        steps: Optional[list[int]] = field(default=None)
+        steps: Optional[tuple[int]] = field(default=None)
         frequency: Optional[int] = field(default=None)
 
-    @define(slots=False)
-    class OCSetting:
-        ocsetting: Optional[list["Oc.OCSettingOption"]] = field(default=None)
-
     @define(slots=False)
     class SaveRecord:
         rtype: str = field()
@@ -43,6 +39,11 @@ class PrintRecord:
         rtype: str = field()
         ocsetting: "Oc.OCSetting" = field()
 
+    @define(slots=False)
+    class PeriodData:
+        saverecord: Optional[tuple["Oc.SaveRecord"]] = field(default=None)
+        printrecord: Optional[tuple["Oc.PrintRecord"]] = field(default=None)
+
     budget_file: Optional[Path] = field(
         block="options",
         converter=to_path,
@@ -59,16 +60,8 @@ class PrintRecord:
         default=None,
     )
     headprintrecord: Optional[FormatRecord] = field(block="options", default=None, init=False)
-    saverecord: Optional[NDArray[np.object_]] = array(
-        SaveRecord,
-        block="period",
-        default=None,
-        dims=("nper",),
-        converter=Converter(structure_array, takes_self=True, takes_field=True),
-        reader="urword",
-    )
-    printrecord: Optional[NDArray[np.object_]] = array(
-        PrintRecord,
+    perioddata: Optional[NDArray[np.object_]] = array(
+        PeriodData,
         block="period",
         default=None,
         dims=("nper",),