fixes

Author: wpbonelli

docs/md/dfnspec.md

@@ -39,6 +39,7 @@
       - [Type-specific attributes](#type-specific-attributes-2)
         - [`valid`](#valid)
         - [`case_sensitive`](#case_sensitive)
+        - [`time_series`](#time_series)
         - [`pk`](#pk)
         - [`fk`](#fk)
         - [`fk_ref`](#fk_ref)
@@ -52,7 +53,7 @@
     - [Double](#double)
       - [Type-specific attributes](#type-specific-attributes-4)
         - [`time_series`](#time_series-1)
-    - [Path](#path)
+    - [File](#file)
       - [Type-specific attributes](#type-specific-attributes-5)
         - [`mode`](#mode)
   - [Composites](#composites)
@@ -309,6 +310,10 @@ Type `string`.
 
 `boolean (default: false)`. Indicates that the string's case must be preserved. The MF6 parser uppercases strings by default.
 
+###### `time_series`
+
+`boolean (default: false)`. Marks fields where the parser accepts either a string literal or a time-series name (referencing a `utl-ts` object).
+
 ###### `pk`
 
 `boolean (default: false)`. Marks this scalar as the primary key of its containing list's item record. Valid only on integer or string scalars that are columns in a list item record. Exactly one column per list item may be marked pk.
@@ -327,10 +332,6 @@ Type `integer`.
 
 ##### Type-specific attributes
 
-###### `tagged`
-
-`boolean (default: true)`. Indicates that the field value should be preceded by the field name.
-
 ###### `valid`
 
 `[integer] | null`. Permitted values (enumeration constraint). Empty list is treated as absent.
@@ -357,17 +358,13 @@ Type `double`.
 
 ##### Type-specific attributes
 
-###### `tagged`
-
-`boolean (default: true)`. Indicates that the field value should be preceded by the field name.
-
 ###### `time_series`
 
 `boolean (default: false)`. Marks fields where the parser accepts either a numeric literal or a time-series name (referencing a `utl-ts` object). Not inferable from structural type. Also appears on array fields (where it references a `utl-tas` object instead). Note that `utl-tas` currently only works with layered arrays, not full-grid arrays, though generalizing has been considered.
 
-#### Path
+#### File
 
-Type `path`.
+Type `file`.
 
 ##### Type-specific attributes
 
@@ -472,13 +469,14 @@ And a `scope` (see [Scope and resolution](#scope-and-resolution)) that controls
 
 Self-sizing `array` fields (those with `shape: []`) may also serve as dimension sources: any such array's name may appear in a `shape` expression to mean "one element per item in this array." These are registered in `dims` with `field` pointing to the array name.
 
-Shape expressions for non-string arrays may use one of three structural forms. All three may additionally carry a bound annotation:
+Shape expressions for non-string arrays may use one of four structural forms. Dim references may additionally carry a bound annotation:
 
 - **Dim reference** (`^[A-Za-z_]\w*$`): a plain identifier resolved via the scope chain (explicit → derived → inherited dims). When the array is a subfield of a record and the identifier does not resolve globally, resolution falls back to intra-record sibling scope (see below).
 - **Intra-record sibling reference**: a dim reference that names a sibling `integer` in the same enclosing record. Makes the record a variadic tuple whose width varies per row. Valid only when the array is a subfield of a record. See below.
+- **Arithmetic offset** (`dim [+-] integer`): a dim reference with an integer offset, e.g. `nlay + 1`. Only the dim portion is validated; the offset is accepted as-is.
 - **Row-level column lookup** (`block.column(fk_field)`): a cross-list per-row quantity, valid only for array subfields of records. See below.
 
-Any dim reference (either of the first two forms) may carry a **bound annotation** prefix (`<`, `>`, `<=`, or `>=`). The dim portion validates normally; the bound is advisory and is not enforced by the MF6 parser.
+Any dim reference (including the dim portion of an arithmetic offset) may carry a **bound annotation** prefix (`<`, `>`, `<=`, or `>=`). The dim portion validates normally; the bound is advisory and is not enforced by the MF6 parser.
 
 A shape expression that does not match one of these forms is a schema validation error. String arrays (`dtype: "string"`) must have empty `shape`.
 

modflow_devtools/dfns/schema.py

@@ -17,6 +17,15 @@
 
 
 class FieldBase(BaseModel):
+    name: str
+    longname: str | None = None
+    description: str | None = None
+    optional: bool = False
+    default: Any | None = None
+    developmode: bool = False
+    netcdf: bool = False
+    tagged: bool = True
+
     @classmethod
     def from_dict(cls, d: dict, strict: bool = False) -> "FieldBase":
         type_name = d.get("type")
@@ -25,7 +34,7 @@ def from_dict(cls, d: dict, strict: bool = False) -> "FieldBase":
             "string": String,
             "integer": Integer,
             "double": Double,
-            "path": File,
+            "file": File,
             "array": Array,
             "record": Record,
             "union": Union,
@@ -43,25 +52,10 @@ def from_dict(cls, d: dict, strict: bool = False) -> "FieldBase":
 
 class Keyword(FieldBase):
     type: Literal["keyword"] = PydanticField(default="keyword", frozen=True)
-    name: str
-    longname: str | None = None
-    description: str | None = None
-    optional: bool = False
-    default: Any | None = None
-    developmode: bool = False
-    netcdf: bool = False
 
 
 class String(FieldBase):
     type: Literal["string"] = PydanticField(default="string", frozen=True)
-    name: str
-    longname: str | None = None
-    description: str | None = None
-    optional: bool = False
-    default: Any | None = None
-    developmode: bool = False
-    netcdf: bool = False
-    tagged: bool = True
     valid: list[str] | None = None
     case_sensitive: bool = False
     time_series: bool = False
@@ -72,14 +66,6 @@ class String(FieldBase):
 
 class Integer(FieldBase):
     type: Literal["integer"] = PydanticField(default="integer", frozen=True)
-    name: str
-    longname: str | None = None
-    description: str | None = None
-    optional: bool = False
-    default: Any | None = None
-    developmode: bool = False
-    netcdf: bool = False
-    tagged: bool = True
     valid: list[int] | None = None
     time_series: bool = False
     pk: bool = False
@@ -89,25 +75,11 @@ class Integer(FieldBase):
 
 class Double(FieldBase):
     type: Literal["double"] = PydanticField(default="double", frozen=True)
-    name: str
-    longname: str | None = None
-    description: str | None = None
-    optional: bool = False
-    default: Any | None = None
-    developmode: bool = False
-    netcdf: bool = False
-    tagged: bool = True
     time_series: bool = False
 
 
 class File(FieldBase):
     type: Literal["file"] = PydanticField(default="file", frozen=True)
-    name: str
-    longname: str | None = None
-    description: str | None = None
-    optional: bool = False
-    default: Any | None = None
-    developmode: bool = False
     mode: Literal["filein", "fileout"]
 
 
@@ -119,13 +91,6 @@ class File(FieldBase):
 
 class Array(FieldBase):
     type: Literal["array"] = PydanticField(default="array", frozen=True)
-    name: str
-    longname: str | None = None
-    description: str | None = None
-    optional: bool = False
-    default: Any | None = None
-    developmode: bool = False
-    netcdf: bool = False
     dtype: Literal["keyword", "integer", "double", "string"]
     shape: list[str] = []
     time_series: bool = False
@@ -134,12 +99,6 @@ class Array(FieldBase):
 
 class Record(FieldBase):
     type: Literal["record"] = PydanticField(default="record", frozen=True)
-    name: str
-    longname: str | None = None
-    description: str | None = None
-    optional: bool = False
-    default: Any | None = None
-    developmode: bool = False
     fields: "dict[str, Scalar | Array | Record | Union]" = PydanticField(default_factory=dict)
 
     @property
@@ -149,12 +108,6 @@ def children(self) -> "dict[str, Field]":
 
 class Union(FieldBase):
     type: Literal["union"] = PydanticField(default="union", frozen=True)
-    name: str
-    longname: str | None = None
-    description: str | None = None
-    optional: bool = False
-    default: Any | None = None
-    developmode: bool = False
     arms: "dict[str, Scalar | Array | Record]" = PydanticField(default_factory=dict)
 
     @property
@@ -164,13 +117,6 @@ def children(self) -> "dict[str, Field]":
 
 class List(FieldBase):
     type: Literal["list"] = PydanticField(default="list", frozen=True)
-    name: str
-    longname: str | None = None
-    description: str | None = None
-    optional: bool = False
-    default: Any | None = None
-    developmode: bool = False
-    netcdf: bool = False
     item: "Record | Union"
 
     @property
@@ -397,7 +343,7 @@ class Simulation(ComponentBase):
 
 class Model(ComponentBase):
     type: Literal["model"] = "model"
-    solution: str | list[str] | None = None  # compatible solution type(s)
+    solution: Literal["ims", "ems", "sln-ims", "sln-ems"] | None = None
 
 
 class Package(ComponentBase):