From 26ec3af32bb60399b8e6ef165c2e6f35ed385adc Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Sat, 3 Oct 2026 07:28:40 -0700 Subject: [PATCH 1/5] feat(dfns): link file fields to the components they're input for Add File.component (a selector over component names, types and subtypes, resolved among the owning component's children) and File.component_ref (a sibling naming the target's ftype token), plus File.mode_keyword for name-file entries, which have no FILEIN. Selectors and parents share one vocabulary: add admits() and covering_selector(), make Dfns.children() use admits() so list and type/subtype parents work, and add Dfns.ftype()/ftype_family() to map ftype tokens to components, array-based variants included. A concrete package parent (utl-tvk's gwf-npf) now resolves to that package's model for model-scoped dims. Co-Authored-By: Claude Opus 5.5 --- autotest/dfns/test_schema_relations.py | 152 ++++++++++++++++++ docs/md/dfnspec.md | 33 +++- modflow_devtools/dfns/schema.json | 35 +++++ modflow_devtools/dfns/schema.py | 209 ++++++++++++++++++++++--- 4 files changed, 403 insertions(+), 26 deletions(-) diff --git a/autotest/dfns/test_schema_relations.py b/autotest/dfns/test_schema_relations.py index f46bf35c..b8f39b70 100644 --- a/autotest/dfns/test_schema_relations.py +++ b/autotest/dfns/test_schema_relations.py @@ -7,6 +7,7 @@ Block, Dfns, Double, + File, InputDim, Integer, Keyword, @@ -14,9 +15,12 @@ Model, Package, Record, + Simulation, String, Union, _validate_fk_fields, + admits, + covering_selector, ) @@ -242,3 +246,151 @@ def test_dfns_validate_cellid_outside_list_item(): gwf = Model(name="gwf-nam", blocks=None) with pytest.raises(ValueError, match="only valid on a column in a list item"): Dfns(components={"gwf-nam": gwf, "gwf-gnc": pkg}) + + +# --- file links (File.component / component_ref) --- + + +def _file_block(file: File, **siblings) -> dict: + item = Record(name="item", fields={**siblings, file.name: file}) + return {"links": Block(name="links", fields={"links": List(name="links", item=item)})} + + +def _link_spec(file: File, owner: str = "gwf-dis", **siblings) -> dict: + """A gwf model with dis, rch/rcha (a variant family) and a utl-ncf + utility attached by packages; ``file`` goes in ``owner``.""" + components = { + "sim-nam": Simulation(name="sim-nam"), + "gwf-nam": Model(name="gwf-nam", parent="sim-nam"), + "gwf-dis": Package(name="gwf-dis", parent="gwf-nam"), + "gwf-rch": Package(name="gwf-rch", parent="gwf-nam", subtype="stress"), + "gwf-rcha": Package(name="gwf-rcha", parent="gwf-nam", subtype="stress"), + "utl-ncf": Package(name="utl-ncf", parent="package", subtype="utility"), + } + components[owner] = components[owner].model_copy( + update={"blocks": _file_block(file, **siblings)} + ) + return components + + +def test_file_link_fixed_target(): + file = File(name="ncf6_filename", direction="in", component="utl-ncf") + Dfns(components=_link_spec(file)) + + +def test_file_link_variant_family_without_component_ref(): + file = File(name="f", direction="in", component=["gwf-rch", "gwf-rcha"]) + Dfns(components=_link_spec(file, owner="gwf-nam")) + + +def test_file_link_component_ref(): + file = File(name="fname", direction="in", component="package", component_ref="ftype") + Dfns(components=_link_spec(file, owner="gwf-nam", ftype=String(name="ftype"))) + + +def test_file_link_output_rejected(): + file = File(name="f", direction="out", component="utl-ncf") + with pytest.raises(ValueError, match="only an input file"): + Dfns(components=_link_spec(file)) + + +def test_file_link_unknown_selector_rejected(): + file = File(name="f", direction="in", component="utl-nope") + with pytest.raises(ValueError, match="matches none"): + Dfns(components=_link_spec(file)) + + +def test_file_link_not_a_child_rejected(): + # utl-ncf's parent is `package`, which doesn't admit the model + file = File(name="f", direction="in", component="utl-ncf") + with pytest.raises(ValueError, match="matches none"): + Dfns(components=_link_spec(file, owner="gwf-nam")) + + +def test_file_link_ambiguous_without_component_ref_rejected(): + file = File(name="f", direction="in", component="package") + with pytest.raises(ValueError, match="no component_ref"): + Dfns(components=_link_spec(file, owner="gwf-nam")) + + +def test_file_link_component_ref_not_sibling_rejected(): + file = File(name="f", direction="in", component="package", component_ref="ftype") + with pytest.raises(ValueError, match="not a sibling String"): + Dfns(components=_link_spec(file, owner="gwf-nam")) + + +def test_admits(): + rch = Package(name="gwf-rch", parent="gwf-nam", subtype="stress") + assert admits("gwf-rch", rch) + assert admits("stress", rch) + assert admits("package", rch) + assert admits(["model", "stress"], rch) + assert admits("*", rch) + assert not admits("model", rch) + assert not admits(None, rch) + + +def test_covering_selector(): + nam = Model(name="gwf-nam") + exg = Package(name="exg-gwfgwf", subtype="exchange") + npf = Package(name="gwf-npf") + wel = Package(name="gwf-wel", subtype="stress") + chd = Package(name="gwf-chd", subtype="stress") + spc = Package(name="utl-spc", subtype="utility") + all_ = {c.name: c for c in (nam, exg, npf, wel, chd, spc)} + # one linker: its own name + assert covering_selector([npf], all_) == "gwf-npf" + # a shared subtype beats a type + assert covering_selector([wel, chd], all_) == "stress" + # one type term beats two narrower ones + assert covering_selector([wel, spc], all_) == "package" + # no single term covers a model and an exchange: concrete names + assert covering_selector([nam, exg], all_) == ["exg-gwfgwf", "gwf-nam"] + + +def test_children_list_parent(): + gwf = Model(name="gwf-nam", parent="sim-nam") + exg = Package(name="exg-gwfgwf", parent="sim-nam", subtype="exchange") + gnc = Package(name="gwf-gnc", parent=["gwf-nam", "exg-gwfgwf"]) + spec = Dfns( + components={ + "sim-nam": Simulation(name="sim-nam"), + "gwf-nam": gwf, + "exg-gwfgwf": exg, + "gwf-gnc": gnc, + } + ) + assert "gwf-gnc" in spec.children("gwf-nam") + assert "gwf-gnc" in spec.children("exg-gwfgwf") + assert "gwf-gnc" not in spec.children("sim-nam") + + +def test_ftype_family(): + spec = Dfns(components=_link_spec(File(name="f", direction="in"))) + spec.components["exg-gwfgwf"] = Package(name="exg-gwfgwf", parent="sim-nam") + assert spec.ftype("gwf-nam") == "GWF6" + assert spec.ftype("gwf-rcha") == "RCH6" + assert spec.ftype("exg-gwfgwf") == "GWF6-GWF6" + assert spec.ftype_family("DIS6", "gwf-nam") == ["gwf-dis"] + assert spec.ftype_family("rch6", "gwf-nam") == ["gwf-rch", "gwf-rcha"] + assert spec.ftype_family("GWF6", "sim-nam") == ["gwf-nam"] + assert spec.ftype_family("GWF6-GWF6", "sim-nam") == ["exg-gwfgwf"] + assert spec.ftype_family("NCF6", "gwf-nam") == [] + + +def test_concrete_package_parent_sees_model_dims(): + """A subpackage whose parent is a concrete package (utl-tvk's gwf-npf) + is in that package's model, so it sees the model's grid dims.""" + spec = Dfns( + components={ + "gwf-nam": Model(name="gwf-nam"), + "gwf-dis": Package( + name="gwf-dis", + parent="gwf-nam", + dims={"nodes": InputDim(value="10", scope="model")}, + ), + "gwf-npf": Package(name="gwf-npf", parent="gwf-nam"), + "utl-tvk": Package(name="utl-tvk", parent="gwf-npf", subtype="utility"), + } + ) + assert "nodes" in spec.inherited_dims("utl-tvk") diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index a8f7d508..72290526 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -149,11 +149,16 @@ Parent relationships are defined bottom-up with attribute `parent`: - `null` — no parent; only valid for the root, i.e. simulation. - `"*"` — unconstrained; any parent component type is allowed. -- A string or list of strings — declares the set of valid parent component types. Entries are either: +- A string or list of strings (a **selector**) — declares the set of valid parents. Each entry (a **term**) is one of: - **Component type names:** `"simulation"`, `"model"`, or `"package"`. - - **Concrete component names:** e.g. ``"gwf-nam"` + - **Subtypes:** `"solution"`, `"exchange"`, `"stress"`, `"advanced"`, or `"utility"` (see [`subtype`](#subtype)). + - **Concrete component names:** e.g. `"gwf-nam"`, `"gwf-npf"`. -**Note:** Type names and concrete component names may be mixed. A type name subsumes any named component of the same type: e.g., `["gwf-sfr", "package"]` reduces to `["package"]` since `gwf-sfr` is a package. +A term **admits** a component if it equals the component's name, type, or subtype, and a selector admits a component if any of its terms does. The same selectors appear in a `file` field's [`component`](#component). + +**Note:** Terms may be mixed. A type or subtype subsumes any named component of the same type or subtype: e.g., `["gwf-sfr", "package"]` reduces to `["package"]` since `gwf-sfr` is a package. + +A component that other components' input files link (see [File](#file)), such as a utility, has its `parent` derived from the components that link to it: the simplest selector that admits all of them, i.e. the fewest terms, then the narrowest (a concrete name before a subtype before a type). It is a superset of the actual linkers: it says what kind of component can attach this one, and the linking `file` field says exactly which ones do. For example, `utl-tvk` is linked only by `gwf-npf`, so its parent is `"gwf-npf"`; `utl-ts` is linked by stress, advanced, and utility packages and by `gwf-csub`, which has no subtype, so its parent is `"package"`; `gwf-gnc` is listed in a model name file and also linked by `exg-gwfgwf`, so its parent is `["exg-gwfgwf", "gwf-nam"]`. #### `schema_version` @@ -426,7 +431,7 @@ Type `double`. Type `file`. A path to another file. -If a file option is introduced by one or more leading keywords (e.g. `CROSS_SECTION TAB6` before `FILEIN `), those keywords are ordinary `Keyword` fields alongside the `File` field in the enclosing `Record`, in declaration order -- `File` carries no keyword/tag data of its own. An exception: `prt-fmi`'s `GWFHEAD`/`GWFBUDGET`/`GWFGRID` fields have no enclosing record, so they're directly `tagged: true`, using their own `name` as the tag like any other tagged scalar field. +If a file option is introduced by one or more leading keywords (e.g. `CROSS_SECTION TAB6` before `FILEIN `), those keywords are ordinary `Keyword` fields alongside the `File` field in the enclosing `Record`, in declaration order -- `File` carries no keyword/tag data of its own. A `File` with no enclosing record, such as `sim-nam`'s `TDIS6 `, is `tagged: true` instead, using its own `name` as the tag like any other tagged scalar field. ##### Type-specific attributes @@ -434,6 +439,24 @@ If a file option is introduced by one or more leading keywords (e.g. `CROSS_SECT `"in" | "out"`. Whether the program reads or writes the file. Required. +###### `mode_keyword` + +`boolean (default: true)`. Whether a `FILEIN` (or `FILEOUT`, per `direction`) keyword precedes the path. Name-file entries have none: `TDIS6 ` in `sim-nam`, or ` []` rows in a model name file. + +###### `component` + +`string | [string] | null (default: null)`. The component the file is input for, as a selector (see [`parent`](#parent)). It resolves among this component's **children** only, i.e. the components whose `parent` admits this one: `"package"` in `gwf-nam` means `gwf-nam`'s packages, and `"model"` in `sim-nam` means the model name files. Only valid when `direction` is `"in"`. + +Without `component_ref`, the selector must resolve to one **ftype family**: a component and its array-based variants (e.g. `["utl-spc", "utl-spca"]` for SSM's `SPC6` file). MODFLOW 6 picks the variant from the file's own options: `READASARRAYS` selects the `…a` component and `READARRAYGRID` the `…g` component. + +For example, `ncf_filerecord`'s file in `gwf-dis` has `component: "utl-ncf"`, and `sim-nam`'s `tdis6` has `component: "sim-tdis"`. + +###### `component_ref` + +`string | null (default: null)`. Names a sibling `string` field in the same record whose value is the target's **ftype token** (e.g. `GWF6`, `DIS6`, `IMS6`, `GWF6-GWF6`), like [`fk_ref`](#fk_ref) for keys. The token picks one ftype family among `component`'s matches; the target file's own options then pick the variant, as above. For example, a model name file's `packages` rows have `fname` with `component: "package"` and `component_ref: "ftype"`, and `sim-nam`'s `models` rows have `mfname` with `component: "model"` and `component_ref: "mtype"`. + +A component's ftype token is its name's suffix, upper-cased, plus `6` (`gwf-dis` → `DIS6`, `sln-ims` → `IMS6`); a model's is its prefix (`gwf-nam` → `GWF6`), and an exchange's names both models (`exg-gwfgwf` → `GWF6-GWF6`). Array-based variants share their base's token (`gwf-rcha` → `RCH6`). + ### Composites Three kinds of composite type are relevant to MF6: [product](https://en.wikipedia.org/wiki/Product_type) (record), [sum](https://en.wikipedia.org/wiki/Tagged_union) (union), and collection (array, list). @@ -732,7 +755,7 @@ Dimensions may specify a `scope` attribute controlling which other components ca - **`"component"`**: only visible within this component (or to subpackages that list this component as their explicit parent). The default scope. - **`"model"`**: visible to any component that can share the same model instance, as determined by component `parent` attributes. A dimension defined in component A with `scope: "model"` is visible to component B if: - A's `parent` contains a concrete model-name entry (e.g. `"gwf-nam"`, `"chf-nam"`), and - - B's `parent` contains either that same model-name entry (meaning B can belong to the same model type), a generic type (`"model"` or `"package"`, meaning B can be attached to any such type), or a wildcard pattern (`"*"`, meaning B can be attached to any component). + - B's `parent` contains either that same model-name entry (meaning B can belong to the same model type), a generic type (`"model"` or `"package"`, meaning B can be attached to any such type), or a wildcard pattern (`"*"`, meaning B can be attached to any component). A concrete package entry in B's `parent` counts as that package's own parents: `utl-tvk`, with `parent: "gwf-npf"`, is in whatever model `gwf-npf` is. - **`"simulation"`**: always visible to all components. Examples: diff --git a/modflow_devtools/dfns/schema.json b/modflow_devtools/dfns/schema.json index 34408a1e..c531aca0 100644 --- a/modflow_devtools/dfns/schema.json +++ b/modflow_devtools/dfns/schema.json @@ -499,6 +499,41 @@ ], "title": "Direction", "type": "string" + }, + "mode_keyword": { + "default": true, + "title": "Mode Keyword", + "type": "boolean" + }, + "component": { + "anyOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Component" + }, + "component_ref": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Component Ref" } }, "required": [ diff --git a/modflow_devtools/dfns/schema.py b/modflow_devtools/dfns/schema.py index bc5e9cdc..b8febe45 100644 --- a/modflow_devtools/dfns/schema.py +++ b/modflow_devtools/dfns/schema.py @@ -115,6 +115,15 @@ class Double(InputFieldBase): class File(InputFieldBase): type: Literal["file"] = PydanticField(default="file", frozen=True) direction: Literal["in", "out"] + # Whether a FILEIN/FILEOUT keyword precedes the path. Name-file entries + # (`TDIS6 `, `GWF6 `) have none. + mode_keyword: bool = True + # The component the file is input for: a selector (see `admits`), resolved + # among this component's children. See `_validate_file_links`. + component: str | list[str] | None = None + # A sibling String whose value is the target's ftype token (e.g. `DIS6`), + # picking one family among the selector's matches. See `Dfns.ftype_family`. + component_ref: str | None = None Scalar = Annotated[ @@ -323,10 +332,10 @@ def _render_shape(field: "Array") -> str: def _render_file(field: "File") -> str: - keyword = "FILEIN" if field.direction == "in" else "FILEOUT" - if not field.tagged: - return f"{keyword} <{field.name}>" - return f"{field.name.upper()} {keyword} <{field.name}>" + path = f"<{field.name}>" + if field.mode_keyword: + path = f"{'FILEIN' if field.direction == 'in' else 'FILEOUT'} {path}" + return _tag(field, path) def _tag(field: "InputField", inner: str) -> str: @@ -575,6 +584,61 @@ def _parents_as_set(parent: "str | list[str] | None") -> set[str]: return {parent} if isinstance(parent, str) else set(parent) +def admits(selector: "str | list[str] | None", component: "ComponentBase") -> bool: + """ + Whether a selector admits a component. + + A selector is a term or a list of terms, as in ``Component.parent`` and + ``File.component``. A term admits a component if it equals the component's + name, its type (``"model"``, ``"package"``) or its subtype (``"exchange"``, + ``"utility"``, ...). ``"*"`` admits every component. + """ + names = {component.name, getattr(component, "type", None), getattr(component, "subtype", None)} + return any(t == "*" or t in names for t in _parents_as_set(selector)) + + +def _term_rank(term: str, components: "Mapping[str, ComponentBase]") -> int: + """How broad a selector term is: a concrete name, then a subtype, then a type.""" + if term in components: + return 0 + if term in ("model", "package", "simulation"): + return 2 + return 1 + + +def covering_selector( + linkers: "list[ComponentBase]", components: "Mapping[str, ComponentBase]" +) -> "str | list[str]": + """ + The simplest selector that admits every linker: fewest terms first, then + the narrowest terms (see `_term_rank`). Used to derive a linked + component's ``parent`` from the components that link to it. + """ + from itertools import combinations + + if not linkers: + raise ValueError("No linkers to cover") + terms = sorted( + { + t + for c in linkers + for t in (c.name, getattr(c, "subtype", None), getattr(c, "type", None)) + if t is not None + }, + key=lambda t: (_term_rank(t, components), t), + ) + for k in range(1, len(terms) + 1): + covers = [ + combo + for combo in combinations(terms, k) + if all(admits(list(combo), c) for c in linkers) + ] + if covers: + best = min(covers, key=lambda combo: sorted(_term_rank(t, components) for t in combo)) + return best[0] if k == 1 else list(best) + raise AssertionError("unreachable: the linkers' own names always cover them") + + def _receives_from( requester_parent: "str | list[str] | None", provider_parent: "str | list[str] | None", @@ -1256,6 +1320,63 @@ def _check_fields(fields: dict, dynamic_key: "InputField | None" = None) -> None _check_fields(block.fields) +def _iter_files(fields: "Mapping[str, InputField]"): + """Yield every File among ``fields`` (recursively) with its sibling fields.""" + for field in fields.values(): + match field: + case File(): + yield field, fields + case Record(): + yield from _iter_files(field.fields) + case Union(): + yield from _iter_files(field.arms) + case List(): + yield from _iter_files({field.item.name: field.item}) + + +def _validate_file_links(component: "ComponentBase", spec: "Dfns") -> None: + """ + For every File with ``component`` or ``component_ref`` set: + + - it must be an input file; + - ``component`` must resolve to at least one of this component's + children (see `Dfns.children`); + - without ``component_ref``, it must resolve to one ftype family (a base + and its array-based variants, see `Dfns.ftype`); + - ``component_ref`` must name a sibling String in the same record. + """ + blocks = list((component.blocks or {}).values()) + for block in blocks: + for file, siblings in _iter_files(block.fields): + if file.component is None and file.component_ref is None: + continue + where = f"{component.name}: File {file.name!r}" + if file.direction != "in": + raise ValueError(f"{where}: only an input file may link a component") + if file.component is None: + raise ValueError(f"{where}: component_ref without component") + targets = [ + n for n, c in spec.children(component.name).items() if admits(file.component, c) + ] + if not targets: + raise ValueError( + f"{where}: component={file.component!r} matches none of this " + f"component's children" + ) + if file.component_ref is None: + families = {spec.ftype(n) for n in targets} + if len(families) > 1: + raise ValueError( + f"{where}: component={file.component!r} matches several " + f"components {sorted(targets)} and has no component_ref" + ) + elif not isinstance(siblings.get(file.component_ref), String): + raise ValueError( + f"{where}: component_ref={file.component_ref!r} is not a sibling " + f"String field in the same record" + ) + + def _validate_cellid_fields(component: "ComponentBase") -> None: """ A cellid array (`cellid=True`, see `Array.cellid`) is only meaningful as a @@ -1482,8 +1603,57 @@ def root(self) -> "Simulation | None": return None def children(self, name: str) -> "dict[str, Component]": - """Components whose parent matches ``name``.""" - return {n: c for n, c in self.components.items() if c.parent == name} + """Components whose parent admits ``name`` (see `admits`).""" + component = self.components[name] + return { + n: c for n, c in self.components.items() if n != name and admits(c.parent, component) + } + + def ftype(self, name: str) -> str: + """ + The ftype token naming a component's family in name files: ``gwf-nam`` + → ``GWF6``, ``gwf-dis`` → ``DIS6``, ``exg-gwfgwf`` → ``GWF6-GWF6``, + ``sln-ims`` → ``IMS6``. An array-based variant (``gwf-rcha``, + ``gwf-chdg``, ``utl-spca``) shares its base's token: mf6 picks the + variant from the file's own ``READASARRAYS``/``READARRAYGRID`` option. + """ + prefix, _, suffix = name.partition("-") + if suffix == "nam": + return f"{prefix.upper()}6" + if prefix == "exg": + # model type prefixes are all three letters + return f"{suffix[:3].upper()}6-{suffix[3:].upper()}6" + if suffix[-1:] in ("a", "g") and f"{prefix}-{suffix[:-1]}" in self.components: + suffix = suffix[:-1] + return f"{suffix.upper()}6" + + def ftype_family(self, token: str, context: str) -> list[str]: + """ + The components a name-file ftype token can mean among ``context``'s + children: ``DIS6`` in ``gwf-nam`` → ``["gwf-dis"]``, ``RCH6`` → + ``["gwf-rch", "gwf-rcha"]``. More than one is a variant family, which + the target file's own options pick between. + """ + token = token.upper() + return sorted(n for n in self.children(context) if self.ftype(n) == token) + + def _parents_in_models(self, parent: "str | list[str] | None") -> set[str]: + """ + ``parent``'s terms, plus, for a concrete package term (``utl-tvk``'s + ``gwf-npf``), that package's own parents, transitively. A subpackage + sits in whatever model its parent package does. + """ + result: set[str] = set() + todo = list(_parents_as_set(parent)) + while todo: + p = todo.pop() + if p in result: + continue + result.add(p) + c = self.components.get(p) + if isinstance(c, Package): + todo.extend(_parents_as_set(c.parent)) + return result def local_dims(self, component_name: str) -> set[str]: """All dim names declared in this component, both input and runtime.""" @@ -1503,6 +1673,7 @@ def _inherited_dim_names( inherited: set[str] = set() component = self.components[component_name] req_parent = component.parent + req_model_parents = list(self._parents_in_models(req_parent)) for cname, c in self.components.items(): if cname == component_name: continue @@ -1511,7 +1682,9 @@ def _inherited_dim_names( case "simulation": inherited.add(dim_name) case "model": - if _receives_from(req_parent, c.parent, requester_name=component_name): + if _receives_from( + req_model_parents, c.parent, requester_name=component_name + ): inherited.add(dim_name) case "component": if cname in _parents_as_set(req_parent): @@ -1570,6 +1743,8 @@ def _validate_relations(self) -> "Dfns": _resolve_derived_dims(component, self.dims(name)) for name, component in self.components.items(): _validate_fk_fields(component, self) + for name, component in self.components.items(): + _validate_file_links(component, self) for name, component in self.components.items(): _validate_cellid_fields(component) for name, component in self.components.items(): @@ -1601,6 +1776,7 @@ def load(cls, path: str | PathLike) -> "Dfns": dfns: dict = {} if dfn_paths: from modflow_devtools.dfn import schema as v1 + from modflow_devtools.dfns.migrate_to_v2_0_0_dev2 import migrate_corpus from modflow_devtools.dfns.migrate_to_v2_0_0_dev3 import to_v2_0_0_dev3 common_path = path / "common.dfn" @@ -1609,22 +1785,13 @@ def load(cls, path: str | PathLike) -> "Dfns": with common_path.open() as f: common, _ = v1.Dfn.load_dfn(f) # type: ignore[attr-defined] + raw = {} for stem, dfn_path in dfn_paths.items(): with dfn_path.open() as f: - fields, meta = v1.Dfn.load_dfn(f, common=common) # type: ignore[attr-defined] - # to_v2_0_0_dev3() runs to_v2_0_0_dev2() itself as its own first - # step (same raw (name, fields, meta) input) -- this was calling - # to_v2_0_0_dev2() directly and stopping there, silently leaving - # every component one schema version behind CURRENT_SCHEMA_VERSION - # (still true as of MODFLOW-ORG/modflow-devtools@develop). Confirmed - # directly: Dfns.load() on a freshly-synced raw-.dfn directory (the - # exact path a live RemoteDfnRegistry.spec(schema_version= - # CURRENT_SCHEMA_VERSION) call takes) returned components with - # schema_version == "2.0.0.dev2", not "2.0.0.dev3", with no error or - # warning -- e.g. gwf-chdg's now-removed vestigial `maxbound` - # DIMENSIONS field (see the dev3 migration fix in this same branch) - # was still present, because the dev3-only fix never ran. - dfns[stem] = to_v2_0_0_dev3(name=stem, fields=fields, meta=meta) + raw[stem] = v1.Dfn.load_dfn(f, common=common) # type: ignore[attr-defined] + # to_v2_0_0_dev3 runs to_v2_0_0_dev2 itself as its first step, so this + # yields CURRENT_SCHEMA_VERSION components, not dev2 ones. + dfns = dict(migrate_corpus(raw, to_v2_0_0_dev3)) elif toml_paths: import tomli From 11c999d83ffb6f009341ac0f3cdcfcd12febb7d7 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Sat, 3 Oct 2026 07:28:41 -0700 Subject: [PATCH 2/5] feat(dfns): migrate component links and derive linked parents Link subpackage file records from the legacy `# flopy subpackage` keys, plus a small table for what those miss (sfr/lak tab6, ssm spc6), and turn name-file filename columns into linked Files. Check every `# mf6 subpackage` line is covered. Derive each linked component's parent from the components linking it, as the simplest covering selector, replacing infer_parent's guess: e.g. utl-ts/obs/ncf/spc become `package`, utl-tvk `gwf-npf`, utl-ats `sim-tdis`, gwf-gnc `[exg-gwfgwf, gwf-nam]`. This needs the whole corpus, so migrate.py and Dfns.load now go through migrate_corpus(). Also make sim-nam's tdis6 required: mf6 fails without it. Co-Authored-By: Claude Opus 5.5 --- .../__snapshots__/v2.0.0.dev2/chf-cdb.json | 3 +- .../__snapshots__/v2.0.0.dev2/chf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-chd.json | 6 +- .../__snapshots__/v2.0.0.dev2/chf-chd.toml | 2 + .../__snapshots__/v2.0.0.dev2/chf-chd.yaml | 2 + .../__snapshots__/v2.0.0.dev2/chf-dfw.json | 3 +- .../__snapshots__/v2.0.0.dev2/chf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-evp.json | 6 +- .../__snapshots__/v2.0.0.dev2/chf-evp.toml | 2 + .../__snapshots__/v2.0.0.dev2/chf-evp.yaml | 2 + .../__snapshots__/v2.0.0.dev2/chf-flw.json | 6 +- .../__snapshots__/v2.0.0.dev2/chf-flw.toml | 2 + .../__snapshots__/v2.0.0.dev2/chf-flw.yaml | 2 + .../__snapshots__/v2.0.0.dev2/chf-nam.json | 7 +- .../__snapshots__/v2.0.0.dev2/chf-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev2/chf-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev2/chf-pcp.json | 6 +- .../__snapshots__/v2.0.0.dev2/chf-pcp.toml | 2 + .../__snapshots__/v2.0.0.dev2/chf-pcp.yaml | 2 + .../__snapshots__/v2.0.0.dev2/chf-zdg.json | 6 +- .../__snapshots__/v2.0.0.dev2/chf-zdg.toml | 2 + .../__snapshots__/v2.0.0.dev2/chf-zdg.yaml | 2 + .../__snapshots__/v2.0.0.dev2/exg-chfgwf.json | 3 +- .../__snapshots__/v2.0.0.dev2/exg-chfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwegwe.json | 6 +- .../__snapshots__/v2.0.0.dev2/exg-gwegwe.toml | 2 + .../__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml | 2 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwf.json | 9 +- .../__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml | 3 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml | 3 + .../__snapshots__/v2.0.0.dev2/exg-gwtgwt.json | 6 +- .../__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml | 2 + .../__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml | 2 + .../__snapshots__/v2.0.0.dev2/exg-olfgwf.json | 3 +- .../__snapshots__/v2.0.0.dev2/exg-olfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ctp.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwe-ctp.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-ctp.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-dis.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwe-dis.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-disv.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwe-disv.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-esl.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwe-esl.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-esl.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-lke.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwe-lke.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-lke.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-mve.json | 5 +- .../__snapshots__/v2.0.0.dev2/gwe-mve.toml | 5 +- .../__snapshots__/v2.0.0.dev2/gwe-mve.yaml | 4 +- .../__snapshots__/v2.0.0.dev2/gwe-mwe.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwe-mwe.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-mwe.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-nam.json | 7 +- .../__snapshots__/v2.0.0.dev2/gwe-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev2/gwe-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev2/gwe-sfe.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwe-sfe.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-sfe.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-ssm.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwe-ssm.toml | 4 + .../__snapshots__/v2.0.0.dev2/gwe-ssm.yaml | 3 + .../__snapshots__/v2.0.0.dev2/gwe-uze.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwe-uze.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwe-uze.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-api.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-api.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-api.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-chd.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-chd.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-chd.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-chdg.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-chdg.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-chdg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-csub.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-csub.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-csub.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-dis.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-dis.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-disv.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-disv.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-drn.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-drn.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-drn.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-drng.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-drng.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-drng.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-evt.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-evt.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-evt.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-evta.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-evta.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-evta.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-ghb.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-ghb.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-ghb.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-ghbg.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-ghbg.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-gnc.json | 5 +- .../__snapshots__/v2.0.0.dev2/gwf-gnc.toml | 5 +- .../__snapshots__/v2.0.0.dev2/gwf-gnc.yaml | 4 +- .../__snapshots__/v2.0.0.dev2/gwf-lak.json | 9 +- .../__snapshots__/v2.0.0.dev2/gwf-lak.toml | 3 + .../__snapshots__/v2.0.0.dev2/gwf-lak.yaml | 3 + .../__snapshots__/v2.0.0.dev2/gwf-maw.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-maw.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-maw.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-mvr.json | 5 +- .../__snapshots__/v2.0.0.dev2/gwf-mvr.toml | 5 +- .../__snapshots__/v2.0.0.dev2/gwf-mvr.yaml | 4 +- .../__snapshots__/v2.0.0.dev2/gwf-nam.json | 7 +- .../__snapshots__/v2.0.0.dev2/gwf-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev2/gwf-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev2/gwf-npf.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-npf.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-npf.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rch.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-rch.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-rch.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-rcha.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-rcha.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-rcha.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-riv.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-riv.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-riv.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-rivg.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-rivg.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rivg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-sfr.json | 12 +- .../__snapshots__/v2.0.0.dev2/gwf-sfr.toml | 4 + .../__snapshots__/v2.0.0.dev2/gwf-sfr.yaml | 4 + .../__snapshots__/v2.0.0.dev2/gwf-sto.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-uzf.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-uzf.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-uzf.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-wel.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwf-wel.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-wel.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwf-welg.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-welg.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-welg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-api.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwt-api.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-api.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-cnc.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwt-cnc.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-cnc.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-dis.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwt-dis.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-disv.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwt-disv.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-lkt.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwt-lkt.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-lkt.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-mvt.json | 5 +- .../__snapshots__/v2.0.0.dev2/gwt-mvt.toml | 5 +- .../__snapshots__/v2.0.0.dev2/gwt-mvt.yaml | 4 +- .../__snapshots__/v2.0.0.dev2/gwt-mwt.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwt-mwt.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-mwt.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-nam.json | 7 +- .../__snapshots__/v2.0.0.dev2/gwt-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev2/gwt-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev2/gwt-sft.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwt-sft.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-sft.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-src.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwt-src.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-src.yaml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-ssm.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwt-ssm.toml | 4 + .../__snapshots__/v2.0.0.dev2/gwt-ssm.yaml | 3 + .../__snapshots__/v2.0.0.dev2/gwt-uzt.json | 6 +- .../__snapshots__/v2.0.0.dev2/gwt-uzt.toml | 2 + .../__snapshots__/v2.0.0.dev2/gwt-uzt.yaml | 2 + .../__snapshots__/v2.0.0.dev2/olf-cdb.json | 3 +- .../__snapshots__/v2.0.0.dev2/olf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-chd.json | 6 +- .../__snapshots__/v2.0.0.dev2/olf-chd.toml | 2 + .../__snapshots__/v2.0.0.dev2/olf-chd.yaml | 2 + .../__snapshots__/v2.0.0.dev2/olf-dfw.json | 3 +- .../__snapshots__/v2.0.0.dev2/olf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-evp.json | 6 +- .../__snapshots__/v2.0.0.dev2/olf-evp.toml | 2 + .../__snapshots__/v2.0.0.dev2/olf-evp.yaml | 2 + .../__snapshots__/v2.0.0.dev2/olf-flw.json | 6 +- .../__snapshots__/v2.0.0.dev2/olf-flw.toml | 2 + .../__snapshots__/v2.0.0.dev2/olf-flw.yaml | 2 + .../__snapshots__/v2.0.0.dev2/olf-nam.json | 7 +- .../__snapshots__/v2.0.0.dev2/olf-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev2/olf-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev2/olf-pcp.json | 6 +- .../__snapshots__/v2.0.0.dev2/olf-pcp.toml | 2 + .../__snapshots__/v2.0.0.dev2/olf-pcp.yaml | 2 + .../__snapshots__/v2.0.0.dev2/olf-zdg.json | 6 +- .../__snapshots__/v2.0.0.dev2/olf-zdg.toml | 2 + .../__snapshots__/v2.0.0.dev2/olf-zdg.yaml | 2 + .../__snapshots__/v2.0.0.dev2/prt-dis.json | 3 +- .../__snapshots__/v2.0.0.dev2/prt-dis.toml | 1 + .../__snapshots__/v2.0.0.dev2/prt-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/prt-disv.json | 3 +- .../__snapshots__/v2.0.0.dev2/prt-disv.toml | 1 + .../__snapshots__/v2.0.0.dev2/prt-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/prt-nam.json | 7 +- .../__snapshots__/v2.0.0.dev2/prt-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev2/prt-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev2/sim-nam.json | 31 ++- .../__snapshots__/v2.0.0.dev2/sim-nam.toml | 29 ++- .../__snapshots__/v2.0.0.dev2/sim-nam.yaml | 29 ++- .../__snapshots__/v2.0.0.dev2/sim-tdis.json | 3 +- .../__snapshots__/v2.0.0.dev2/sim-tdis.toml | 1 + .../__snapshots__/v2.0.0.dev2/sim-tdis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-cdb.json | 3 +- .../__snapshots__/v2.0.0.dev2/swf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-chd.json | 6 +- .../__snapshots__/v2.0.0.dev2/swf-chd.toml | 2 + .../__snapshots__/v2.0.0.dev2/swf-chd.yaml | 2 + .../__snapshots__/v2.0.0.dev2/swf-dfw.json | 3 +- .../__snapshots__/v2.0.0.dev2/swf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-evp.json | 6 +- .../__snapshots__/v2.0.0.dev2/swf-evp.toml | 2 + .../__snapshots__/v2.0.0.dev2/swf-evp.yaml | 2 + .../__snapshots__/v2.0.0.dev2/swf-flw.json | 6 +- .../__snapshots__/v2.0.0.dev2/swf-flw.toml | 2 + .../__snapshots__/v2.0.0.dev2/swf-flw.yaml | 2 + .../__snapshots__/v2.0.0.dev2/swf-nam.json | 7 +- .../__snapshots__/v2.0.0.dev2/swf-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev2/swf-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev2/swf-pcp.json | 6 +- .../__snapshots__/v2.0.0.dev2/swf-pcp.toml | 2 + .../__snapshots__/v2.0.0.dev2/swf-pcp.yaml | 2 + .../__snapshots__/v2.0.0.dev2/swf-zdg.json | 6 +- .../__snapshots__/v2.0.0.dev2/swf-zdg.toml | 2 + .../__snapshots__/v2.0.0.dev2/swf-zdg.yaml | 2 + .../__snapshots__/v2.0.0.dev2/utl-ats.json | 2 +- .../__snapshots__/v2.0.0.dev2/utl-ats.toml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-ats.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-laktab.json | 2 +- .../__snapshots__/v2.0.0.dev2/utl-laktab.toml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-laktab.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-ncf.json | 2 +- .../__snapshots__/v2.0.0.dev2/utl-ncf.toml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-ncf.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-obs.json | 2 +- .../__snapshots__/v2.0.0.dev2/utl-obs.toml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-obs.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-sfrtab.json | 2 +- .../__snapshots__/v2.0.0.dev2/utl-sfrtab.toml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-spc.json | 5 +- .../__snapshots__/v2.0.0.dev2/utl-spc.toml | 3 +- .../__snapshots__/v2.0.0.dev2/utl-spc.yaml | 3 +- .../__snapshots__/v2.0.0.dev2/utl-spca.json | 3 +- .../__snapshots__/v2.0.0.dev2/utl-spca.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-spca.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-ts.json | 2 +- .../__snapshots__/v2.0.0.dev2/utl-ts.toml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-ts.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/utl-tvk.json | 5 +- .../__snapshots__/v2.0.0.dev2/utl-tvk.toml | 3 +- .../__snapshots__/v2.0.0.dev2/utl-tvk.yaml | 3 +- .../__snapshots__/v2.0.0.dev2/utl-tvs.json | 5 +- .../__snapshots__/v2.0.0.dev2/utl-tvs.toml | 3 +- .../__snapshots__/v2.0.0.dev2/utl-tvs.yaml | 3 +- .../__snapshots__/v2.0.0.dev3/chf-cdb.json | 3 +- .../__snapshots__/v2.0.0.dev3/chf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-chd.json | 6 +- .../__snapshots__/v2.0.0.dev3/chf-chd.toml | 2 + .../__snapshots__/v2.0.0.dev3/chf-chd.yaml | 2 + .../__snapshots__/v2.0.0.dev3/chf-dfw.json | 3 +- .../__snapshots__/v2.0.0.dev3/chf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-evp.json | 6 +- .../__snapshots__/v2.0.0.dev3/chf-evp.toml | 2 + .../__snapshots__/v2.0.0.dev3/chf-evp.yaml | 2 + .../__snapshots__/v2.0.0.dev3/chf-flw.json | 6 +- .../__snapshots__/v2.0.0.dev3/chf-flw.toml | 2 + .../__snapshots__/v2.0.0.dev3/chf-flw.yaml | 2 + .../__snapshots__/v2.0.0.dev3/chf-nam.json | 7 +- .../__snapshots__/v2.0.0.dev3/chf-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev3/chf-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev3/chf-pcp.json | 6 +- .../__snapshots__/v2.0.0.dev3/chf-pcp.toml | 2 + .../__snapshots__/v2.0.0.dev3/chf-pcp.yaml | 2 + .../__snapshots__/v2.0.0.dev3/chf-zdg.json | 6 +- .../__snapshots__/v2.0.0.dev3/chf-zdg.toml | 2 + .../__snapshots__/v2.0.0.dev3/chf-zdg.yaml | 2 + .../__snapshots__/v2.0.0.dev3/exg-chfgwf.json | 3 +- .../__snapshots__/v2.0.0.dev3/exg-chfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwegwe.json | 6 +- .../__snapshots__/v2.0.0.dev3/exg-gwegwe.toml | 2 + .../__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml | 2 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwf.json | 9 +- .../__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml | 3 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml | 3 + .../__snapshots__/v2.0.0.dev3/exg-gwtgwt.json | 6 +- .../__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml | 2 + .../__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml | 2 + .../__snapshots__/v2.0.0.dev3/exg-olfgwf.json | 3 +- .../__snapshots__/v2.0.0.dev3/exg-olfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ctp.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwe-ctp.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-ctp.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-dis.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwe-dis.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-disv.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwe-disv.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-esl.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwe-esl.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-esl.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-lke.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwe-lke.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-lke.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-mve.json | 5 +- .../__snapshots__/v2.0.0.dev3/gwe-mve.toml | 5 +- .../__snapshots__/v2.0.0.dev3/gwe-mve.yaml | 4 +- .../__snapshots__/v2.0.0.dev3/gwe-mwe.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwe-mwe.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-mwe.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-nam.json | 7 +- .../__snapshots__/v2.0.0.dev3/gwe-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev3/gwe-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev3/gwe-sfe.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwe-sfe.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-sfe.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-ssm.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwe-ssm.toml | 4 + .../__snapshots__/v2.0.0.dev3/gwe-ssm.yaml | 3 + .../__snapshots__/v2.0.0.dev3/gwe-uze.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwe-uze.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwe-uze.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-api.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-api.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-api.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-chd.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-chd.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-chd.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-chdg.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-chdg.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-chdg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-csub.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-csub.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-csub.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-dis.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-dis.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-disv.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-disv.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-drn.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-drn.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-drn.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-drng.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-drng.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-drng.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-evt.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-evt.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-evt.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-evta.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-evta.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-evta.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-ghb.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-ghb.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-ghb.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-ghbg.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-ghbg.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-gnc.json | 5 +- .../__snapshots__/v2.0.0.dev3/gwf-gnc.toml | 5 +- .../__snapshots__/v2.0.0.dev3/gwf-gnc.yaml | 4 +- .../__snapshots__/v2.0.0.dev3/gwf-lak.json | 9 +- .../__snapshots__/v2.0.0.dev3/gwf-lak.toml | 3 + .../__snapshots__/v2.0.0.dev3/gwf-lak.yaml | 3 + .../__snapshots__/v2.0.0.dev3/gwf-maw.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-maw.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-maw.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-mvr.json | 5 +- .../__snapshots__/v2.0.0.dev3/gwf-mvr.toml | 5 +- .../__snapshots__/v2.0.0.dev3/gwf-mvr.yaml | 4 +- .../__snapshots__/v2.0.0.dev3/gwf-nam.json | 7 +- .../__snapshots__/v2.0.0.dev3/gwf-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev3/gwf-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev3/gwf-npf.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-npf.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-npf.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rch.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-rch.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-rch.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-rcha.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-rcha.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-rcha.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-riv.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-riv.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-riv.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-rivg.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-rivg.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rivg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-sfr.json | 12 +- .../__snapshots__/v2.0.0.dev3/gwf-sfr.toml | 4 + .../__snapshots__/v2.0.0.dev3/gwf-sfr.yaml | 4 + .../__snapshots__/v2.0.0.dev3/gwf-sto.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-uzf.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-uzf.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-uzf.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-wel.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwf-wel.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-wel.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwf-welg.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-welg.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-welg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-api.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwt-api.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-api.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-cnc.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwt-cnc.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-cnc.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-dis.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwt-dis.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-disv.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwt-disv.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-lkt.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwt-lkt.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-lkt.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-mvt.json | 5 +- .../__snapshots__/v2.0.0.dev3/gwt-mvt.toml | 5 +- .../__snapshots__/v2.0.0.dev3/gwt-mvt.yaml | 4 +- .../__snapshots__/v2.0.0.dev3/gwt-mwt.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwt-mwt.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-mwt.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-nam.json | 7 +- .../__snapshots__/v2.0.0.dev3/gwt-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev3/gwt-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev3/gwt-sft.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwt-sft.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-sft.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-src.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwt-src.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-src.yaml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-ssm.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwt-ssm.toml | 4 + .../__snapshots__/v2.0.0.dev3/gwt-ssm.yaml | 3 + .../__snapshots__/v2.0.0.dev3/gwt-uzt.json | 6 +- .../__snapshots__/v2.0.0.dev3/gwt-uzt.toml | 2 + .../__snapshots__/v2.0.0.dev3/gwt-uzt.yaml | 2 + .../__snapshots__/v2.0.0.dev3/olf-cdb.json | 3 +- .../__snapshots__/v2.0.0.dev3/olf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-chd.json | 6 +- .../__snapshots__/v2.0.0.dev3/olf-chd.toml | 2 + .../__snapshots__/v2.0.0.dev3/olf-chd.yaml | 2 + .../__snapshots__/v2.0.0.dev3/olf-dfw.json | 3 +- .../__snapshots__/v2.0.0.dev3/olf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-evp.json | 6 +- .../__snapshots__/v2.0.0.dev3/olf-evp.toml | 2 + .../__snapshots__/v2.0.0.dev3/olf-evp.yaml | 2 + .../__snapshots__/v2.0.0.dev3/olf-flw.json | 6 +- .../__snapshots__/v2.0.0.dev3/olf-flw.toml | 2 + .../__snapshots__/v2.0.0.dev3/olf-flw.yaml | 2 + .../__snapshots__/v2.0.0.dev3/olf-nam.json | 7 +- .../__snapshots__/v2.0.0.dev3/olf-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev3/olf-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev3/olf-pcp.json | 6 +- .../__snapshots__/v2.0.0.dev3/olf-pcp.toml | 2 + .../__snapshots__/v2.0.0.dev3/olf-pcp.yaml | 2 + .../__snapshots__/v2.0.0.dev3/olf-zdg.json | 6 +- .../__snapshots__/v2.0.0.dev3/olf-zdg.toml | 2 + .../__snapshots__/v2.0.0.dev3/olf-zdg.yaml | 2 + .../__snapshots__/v2.0.0.dev3/prt-dis.json | 3 +- .../__snapshots__/v2.0.0.dev3/prt-dis.toml | 1 + .../__snapshots__/v2.0.0.dev3/prt-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/prt-disv.json | 3 +- .../__snapshots__/v2.0.0.dev3/prt-disv.toml | 1 + .../__snapshots__/v2.0.0.dev3/prt-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/prt-nam.json | 7 +- .../__snapshots__/v2.0.0.dev3/prt-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev3/prt-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev3/sim-nam.json | 31 ++- .../__snapshots__/v2.0.0.dev3/sim-nam.toml | 29 ++- .../__snapshots__/v2.0.0.dev3/sim-nam.yaml | 29 ++- .../__snapshots__/v2.0.0.dev3/sim-tdis.json | 3 +- .../__snapshots__/v2.0.0.dev3/sim-tdis.toml | 1 + .../__snapshots__/v2.0.0.dev3/sim-tdis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-cdb.json | 3 +- .../__snapshots__/v2.0.0.dev3/swf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-chd.json | 6 +- .../__snapshots__/v2.0.0.dev3/swf-chd.toml | 2 + .../__snapshots__/v2.0.0.dev3/swf-chd.yaml | 2 + .../__snapshots__/v2.0.0.dev3/swf-dfw.json | 3 +- .../__snapshots__/v2.0.0.dev3/swf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-evp.json | 6 +- .../__snapshots__/v2.0.0.dev3/swf-evp.toml | 2 + .../__snapshots__/v2.0.0.dev3/swf-evp.yaml | 2 + .../__snapshots__/v2.0.0.dev3/swf-flw.json | 6 +- .../__snapshots__/v2.0.0.dev3/swf-flw.toml | 2 + .../__snapshots__/v2.0.0.dev3/swf-flw.yaml | 2 + .../__snapshots__/v2.0.0.dev3/swf-nam.json | 7 +- .../__snapshots__/v2.0.0.dev3/swf-nam.toml | 7 +- .../__snapshots__/v2.0.0.dev3/swf-nam.yaml | 7 +- .../__snapshots__/v2.0.0.dev3/swf-pcp.json | 6 +- .../__snapshots__/v2.0.0.dev3/swf-pcp.toml | 2 + .../__snapshots__/v2.0.0.dev3/swf-pcp.yaml | 2 + .../__snapshots__/v2.0.0.dev3/swf-zdg.json | 6 +- .../__snapshots__/v2.0.0.dev3/swf-zdg.toml | 2 + .../__snapshots__/v2.0.0.dev3/swf-zdg.yaml | 2 + .../__snapshots__/v2.0.0.dev3/utl-ats.json | 2 +- .../__snapshots__/v2.0.0.dev3/utl-ats.toml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-ats.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-laktab.json | 2 +- .../__snapshots__/v2.0.0.dev3/utl-laktab.toml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-laktab.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-ncf.json | 2 +- .../__snapshots__/v2.0.0.dev3/utl-ncf.toml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-ncf.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-obs.json | 2 +- .../__snapshots__/v2.0.0.dev3/utl-obs.toml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-obs.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-sfrtab.json | 2 +- .../__snapshots__/v2.0.0.dev3/utl-sfrtab.toml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-spc.json | 5 +- .../__snapshots__/v2.0.0.dev3/utl-spc.toml | 3 +- .../__snapshots__/v2.0.0.dev3/utl-spc.yaml | 3 +- .../__snapshots__/v2.0.0.dev3/utl-spca.json | 3 +- .../__snapshots__/v2.0.0.dev3/utl-spca.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-spca.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-ts.json | 2 +- .../__snapshots__/v2.0.0.dev3/utl-ts.toml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-ts.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/utl-tvk.json | 5 +- .../__snapshots__/v2.0.0.dev3/utl-tvk.toml | 3 +- .../__snapshots__/v2.0.0.dev3/utl-tvk.yaml | 3 +- .../__snapshots__/v2.0.0.dev3/utl-tvs.json | 5 +- .../__snapshots__/v2.0.0.dev3/utl-tvs.toml | 3 +- .../__snapshots__/v2.0.0.dev3/utl-tvs.yaml | 3 +- autotest/dfns/test_migrate.py | 156 +++++++++++++++ modflow_devtools/dfns/migrate.py | 17 +- .../dfns/migrate_to_v2_0_0_dev2.py | 185 +++++++++++++++++- .../dfns/migrate_to_v2_0_0_dev3.py | 13 +- 568 files changed, 1857 insertions(+), 478 deletions(-) diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json index 87261a6b..dae0524c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json @@ -60,7 +60,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml index 6818e745..314045ba 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml @@ -56,6 +56,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml index 978c9fd8..51252a9d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml @@ -66,6 +66,7 @@ blocks: observation type(s) supported by the CDB package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json index e5a32c57..9df4a003 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml index 8080fce8..e85398a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml index 5ab5be0e..c80c8cc7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the CHD package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json index 1401ded7..585bf55e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json @@ -56,7 +56,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml index 97ee78b0..08173382 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml @@ -54,6 +54,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml index 4ac42915..2e8a8415 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml @@ -72,6 +72,7 @@ blocks: observation type(s) supported by the DFW package. tagged: false direction: in + component: utl-obs export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json index 3b731c13..a0a7c313 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the EVP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml index 9d2cf8bb..dda0861b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the EVP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml index 47c382d6..6361923b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the EVP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json index b1b62195..c2e6b00d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the FLW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the FLW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml index d90e1d29..cef2f8e4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the FLW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the FLW package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml index 255bb640..2fdfe9f6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml @@ -72,6 +72,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -88,6 +89,7 @@ blocks: observation type(s) supported by the FLW package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json index 311f5760..ad73e066 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json @@ -68,11 +68,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml index ea64bea0..03b42c1b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml @@ -60,11 +60,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml index 7413b63a..93980bf2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml @@ -69,12 +69,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json index f6f2d371..2fec5201 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the PCP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the PCP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml index 5c91f631..a125d829 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the PCP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the PCP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml index 611af7d2..6934e631 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the PCP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json index 05b09699..51fdb2c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json @@ -62,7 +62,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -81,7 +82,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the ZDG package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ZDG package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml index 4a06db7f..ee6a44b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml @@ -59,6 +59,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -75,6 +76,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the ZDG package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ZDG package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml index 7ee6e55a..7ae1081e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml @@ -68,6 +68,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -84,6 +85,7 @@ blocks: observation type(s) supported by the ZDG package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json index 632f415b..16bce899 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json @@ -45,7 +45,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the SWF-GWF package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml index fd15d0af..5c925dd2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml @@ -41,6 +41,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the SWF-GWF package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml index 494a3704..a6d90de6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml @@ -45,6 +45,7 @@ blocks: lists observation type(s) supported by the SWF-GWF package. tagged: false direction: in + component: utl-obs dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json index 41fbe5d6..25e43324 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json @@ -93,7 +93,8 @@ "longname": "mve6 input filename", "description": "is the file name of the transport mover input file to apply to this exchange. Information for the transport mover are provided in the file provided with these keywords.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "gwe-mve" } } }, @@ -111,7 +112,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwe-obstypetable} lists observation type(s) supported by the GWE-GWE Exchange Package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml index bec31370..2fc38afe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml @@ -89,6 +89,7 @@ longname = "mve6 input filename" description = "is the file name of the transport mover input file to apply to this exchange. Information for the transport mover are provided in the file provided with these keywords." tagged = false direction = "in" +component = "gwe-mve" [blocks.options.fields.obs_filerecord] type = "record" @@ -105,6 +106,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwe-obstypetable} lists observation type(s) supported by the GWE-GWE Exchange Package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.dev_interfacemodel_on] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml index 3e08bb11..10e1d5ca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml @@ -101,6 +101,7 @@ blocks: for the transport mover are provided in the file provided with these keywords. tagged: false direction: in + component: gwe-mve obs_filerecord: type: record optional: true @@ -117,6 +118,7 @@ blocks: lists observation type(s) supported by the GWE-GWE Exchange Package. tagged: false direction: in + component: utl-obs dev_interfacemodel_on: type: keyword longname: activate interface model on exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json index da1d9f9a..d2b71d55 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json @@ -102,7 +102,8 @@ "longname": "gnc6 input filename", "description": "is the file name for ghost node correction input file. Information for the ghost nodes are provided in the file provided with these keywords. The format for specifying the ghost nodes is the same as described for the GNC Package of the GWF Model. This includes specifying OPTIONS, DIMENSIONS, and GNCDATA blocks. The order of the ghost nodes must follow the same order as the order of the cells in the EXCHANGEDATA block. For the GNCDATA, noden and all of the nodej values are assumed to be located in model 1, and nodem is assumed to be in model 2.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "gwf-gnc" } } }, @@ -120,7 +121,8 @@ "longname": "mvr6 input filename", "description": "is the file name of the water mover input file to apply to this exchange. Information for the water mover are provided in the file provided with these keywords. The format for specifying the water mover information is the same as described for the Water Mover (MVR) Package of the GWF Model, with two exceptions. First, in the PACKAGES block, the model name must be included as a separate string before each package. Second, the appropriate model name must be included before package name 1 and package name 2 in the BEGIN PERIOD block. This allows providers and receivers to be located in both models listed as part of this exchange.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "gwf-mvr" } } }, @@ -138,7 +140,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the GWF-GWF package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml index 906fb289..93189e59 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml @@ -96,6 +96,7 @@ longname = "gnc6 input filename" description = "is the file name for ghost node correction input file. Information for the ghost nodes are provided in the file provided with these keywords. The format for specifying the ghost nodes is the same as described for the GNC Package of the GWF Model. This includes specifying OPTIONS, DIMENSIONS, and GNCDATA blocks. The order of the ghost nodes must follow the same order as the order of the cells in the EXCHANGEDATA block. For the GNCDATA, noden and all of the nodej values are assumed to be located in model 1, and nodem is assumed to be in model 2." tagged = false direction = "in" +component = "gwf-gnc" [blocks.options.fields.mvr_filerecord] type = "record" @@ -112,6 +113,7 @@ longname = "mvr6 input filename" description = "is the file name of the water mover input file to apply to this exchange. Information for the water mover are provided in the file provided with these keywords. The format for specifying the water mover information is the same as described for the Water Mover (MVR) Package of the GWF Model, with two exceptions. First, in the PACKAGES block, the model name must be included as a separate string before each package. Second, the appropriate model name must be included before package name 1 and package name 2 in the BEGIN PERIOD block. This allows providers and receivers to be located in both models listed as part of this exchange." tagged = false direction = "in" +component = "gwf-mvr" [blocks.options.fields.obs_filerecord] type = "record" @@ -128,6 +130,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the GWF-GWF package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.dev_interfacemodel_on] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml index 7eb39426..84544472 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml @@ -125,6 +125,7 @@ blocks: be in model 2. tagged: false direction: in + component: gwf-gnc mvr_filerecord: type: record optional: true @@ -146,6 +147,7 @@ blocks: of this exchange. tagged: false direction: in + component: gwf-mvr obs_filerecord: type: record optional: true @@ -162,6 +164,7 @@ blocks: lists observation type(s) supported by the GWF-GWF package. tagged: false direction: in + component: utl-obs dev_interfacemodel_on: type: keyword longname: activate interface model on exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json index 21add2f4..8976dcf2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json @@ -93,7 +93,8 @@ "longname": "mvt6 input filename", "description": "is the file name of the transport mover input file to apply to this exchange. Information for the transport mover are provided in the file provided with these keywords.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "gwt-mvt" } } }, @@ -111,7 +112,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwt-obstypetable} lists observation type(s) supported by the GWT-GWT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml index 54c3e25c..8e12a721 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml @@ -89,6 +89,7 @@ longname = "mvt6 input filename" description = "is the file name of the transport mover input file to apply to this exchange. Information for the transport mover are provided in the file provided with these keywords." tagged = false direction = "in" +component = "gwt-mvt" [blocks.options.fields.obs_filerecord] type = "record" @@ -105,6 +106,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwt-obstypetable} lists observation type(s) supported by the GWT-GWT package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.dev_interfacemodel_on] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml index 327c08c8..091a3945 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml @@ -99,6 +99,7 @@ blocks: for the transport mover are provided in the file provided with these keywords. tagged: false direction: in + component: gwt-mvt obs_filerecord: type: record optional: true @@ -115,6 +116,7 @@ blocks: lists observation type(s) supported by the GWT-GWT package. tagged: false direction: in + component: utl-obs dev_interfacemodel_on: type: keyword longname: activate interface model on exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json index fcf6be5a..da586d7d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json @@ -45,7 +45,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the SWF-GWF package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml index 07a7c0d3..25958a80 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml @@ -41,6 +41,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the SWF-GWF package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml index dcc7650d..d71925fe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml @@ -45,6 +45,7 @@ blocks: lists observation type(s) supported by the SWF-GWF package. tagged: false direction: in + component: utl-obs dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json index 76e6df3b..f58c7a7b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CTP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CTP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml index 4c7d44f9..e258bd60 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CTP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CTP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml index 3f5482b6..62d745e6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the CTP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json index 7eb97a2b..1499a62c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json @@ -114,7 +114,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml index 7d32dff5..d68ae55d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml @@ -108,6 +108,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml index d08a67fc..fa25e6f3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml @@ -111,6 +111,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json index a5516ccb..a2a579a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json @@ -110,7 +110,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml index da6349fd..9b3b0723 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml @@ -104,6 +104,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml index 54a084cd..a619fb00 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml @@ -110,6 +110,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json index 642c5d52..baf7d4dd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the ESL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ESL package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml index 6529288c..99c63a81 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the ESL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ESL package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml index d5747c6b..9b87bdc3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the ESL package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json index 7f5516d3..3f585ed3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json @@ -131,7 +131,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -150,7 +151,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the LKE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LKE package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml index 1b486aef..e7c6491c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml @@ -122,6 +122,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -138,6 +139,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the LKE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LKE package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml index aab1e7bf..75a879d0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml @@ -132,6 +132,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -148,6 +149,7 @@ blocks: observation type(s) supported by the LKE package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json index 1c1943da..179f795a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json @@ -2,7 +2,10 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "gwe-mve", - "parent": "gwe-nam", + "parent": [ + "exg-gwegwe", + "gwe-nam" + ], "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml index 68644362..8e2ae39d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml @@ -1,7 +1,10 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-mve" -parent = "gwe-nam" +parent = [ + "exg-gwegwe", + "gwe-nam", +] [blocks.options.fields.print_input] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml index d4c910fb..e6f2f6d1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml @@ -1,7 +1,9 @@ type: package schema_version: 2.0.0.dev2 name: gwe-mve -parent: gwe-nam +parent: + - exg-gwegwe + - gwe-nam blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json index 89b3dbda..6162fe15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json @@ -131,7 +131,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -150,7 +151,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the MWE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MWE package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml index cd4c9102..96d6b2e5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml @@ -122,6 +122,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -138,6 +139,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the MWE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MWE package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml index e3e85563..7279bf87 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml @@ -132,6 +132,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -148,6 +149,7 @@ blocks: observation type(s) supported by the MWE package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json index a9f4428c..f408bfcc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json @@ -112,11 +112,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml index 17a8fdf1..7c6151e5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml @@ -100,11 +100,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml index c0d4a06f..8af8a722 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml @@ -101,12 +101,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json index 43f50b5c..a4adb378 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json @@ -131,7 +131,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -150,7 +151,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the SFE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFE package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml index dfef754e..4aa63d17 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml @@ -122,6 +122,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -138,6 +139,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the SFE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFE package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml index 71fb6d6d..3865faff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml @@ -133,6 +133,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -149,6 +150,7 @@ blocks: observation type(s) supported by the SFE package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.json index b757a603..7cbc3506 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.json @@ -76,7 +76,11 @@ "longname": "spc file name", "description": "character string that defines the path and filename for the file containing source and sink input data for the flow package. The SPC6_FILENAME file is a flexible input file that allows temperatures to be specified by stress period and with time series. Instructions for creating the SPC6_FILENAME input file are provided in the next section on file input for boundary temperatures.", "tagged": false, - "direction": "in" + "direction": "in", + "component": [ + "utl-spc", + "utl-spca" + ] }, "mixed": { "type": "keyword", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.toml index dc182cd1..8e5e0b28 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.toml @@ -67,6 +67,10 @@ longname = "spc file name" description = "character string that defines the path and filename for the file containing source and sink input data for the flow package. The SPC6_FILENAME file is a flexible input file that allows temperatures to be specified by stress period and with time series. Instructions for creating the SPC6_FILENAME input file are provided in the next section on file input for boundary temperatures." tagged = false direction = "in" +component = [ + "utl-spc", + "utl-spca", +] [blocks.fileinput.fields.fileinput.item.fields.mixed] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.yaml index 6a839366..09f3aa37 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.yaml @@ -92,6 +92,9 @@ blocks: on file input for boundary temperatures. tagged: false direction: in + component: + - utl-spc + - utl-spca mixed: type: keyword longname: mixed keyword diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json index 0b0bbcc0..326ba287 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json @@ -131,7 +131,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -150,7 +151,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the UZE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZE package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml index df312e66..579d4d79 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml @@ -122,6 +122,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -138,6 +139,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the UZE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZE package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml index dfadd132..df69cb8f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml @@ -133,6 +133,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -149,6 +150,7 @@ blocks: observation type(s) supported by the UZE package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json index f1078d05..ce348ad6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json @@ -49,7 +49,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the api boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the api boundary package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml index eb6244c0..9e70100b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml @@ -45,6 +45,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the api boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the api boundary package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml index e55c28be..76ce164c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml @@ -50,6 +50,7 @@ blocks: {#2} lists observation type(s) supported by the api boundary package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the api boundary Package can be used with diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json index b3b4b62c..40563658 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml index 8a912c09..01a3f9ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.dev_no_newton] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml index 85c60363..6ea3f420 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the CHD package. tagged: false direction: in + component: utl-obs dev_no_newton: type: keyword longname: turn off Newton for unconfined cells diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json index db70a864..3f834522 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json @@ -68,7 +68,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml index 6b8e1816..bab4cf2f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml @@ -64,6 +64,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_netcdf] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml index a0a65fe6..e0a5dc99 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml @@ -76,6 +76,7 @@ blocks: observation type(s) supported by the CHD package. tagged: false direction: in + component: utl-obs export_array_netcdf: type: keyword longname: export array variables to netcdf output files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json index ab02c206..894db6fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json @@ -283,7 +283,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -302,7 +303,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CSUB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CSUB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml index d8ecc68f..507c1728 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml @@ -262,6 +262,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -278,6 +279,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CSUB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CSUB package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.ninterbeds] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml index 1428fdff..e74a0ce4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml @@ -279,6 +279,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -295,6 +296,7 @@ blocks: observation type(s) supported by the CSUB package. tagged: false direction: in + component: utl-obs dimensions: fields: ninterbeds: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json index 85218bed..fee7bc79 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json @@ -114,7 +114,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml index 2ec52846..dc860500 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml @@ -108,6 +108,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml index 781909e3..c93275ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml @@ -111,6 +111,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json index 8b3bc3d8..c37b00b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json @@ -110,7 +110,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml index be6d7ae9..8fa3e153 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml @@ -104,6 +104,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml index c59048cb..c078b762 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml @@ -110,6 +110,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json index 7d95ff49..3bd547b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json @@ -74,7 +74,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -93,7 +94,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DRN package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DRN package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml index 50214ea3..d2f47f00 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml @@ -71,6 +71,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -87,6 +88,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DRN package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DRN package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml index a7dcb25e..012098ee 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml @@ -85,6 +85,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -101,6 +102,7 @@ blocks: observation type(s) supported by the DRN package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the Drain Package can be used with the diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json index 7b1e36eb..526553c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json @@ -74,7 +74,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DRN package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DRN package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml index 8c6d30e6..fd444a1f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml @@ -70,6 +70,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DRN package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DRN package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml index e866a146..8e299335 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml @@ -89,6 +89,7 @@ blocks: observation type(s) supported by the DRN package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the Drain Package can be used with the diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json index 7b0e15d4..0ade65bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json @@ -77,7 +77,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -96,7 +97,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the EVT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml index 8def5b6c..b5a4c4b2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the EVT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVT package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.surf_rate_specified] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml index d48b7195..2bfc20d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml @@ -81,6 +81,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -97,6 +98,7 @@ blocks: observation type(s) supported by the EVT package. tagged: false direction: in + component: utl-obs surf_rate_specified: type: keyword longname: specify proportion of evapotranspiration rate at ET surface diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json index 525c81b9..e4c198e5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json @@ -72,7 +72,8 @@ "longname": "file name of time series information", "description": "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the Time-Variable Input section for instructions on using the time-array series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tas" } } } @@ -91,7 +92,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the EVT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml index 2e9183f9..4a865c86 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml @@ -69,6 +69,7 @@ longname = "file name of time series information" description = "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the Time-Variable Input section for instructions on using the time-array series capability." tagged = false direction = "in" +component = "utl-tas" [blocks.options.fields.obs_filerecord] type = "record" @@ -85,6 +86,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the EVT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVT package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_netcdf] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml index 89cf9f36..1dc4352a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml @@ -81,6 +81,7 @@ blocks: using the time-array series capability. tagged: false direction: in + component: utl-tas obs_filerecord: type: record optional: true @@ -97,6 +98,7 @@ blocks: observation type(s) supported by the EVT package. tagged: false direction: in + component: utl-obs export_array_netcdf: type: keyword longname: export array variables to netcdf output files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json index daa3c34b..4ccd543f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the GHB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the GHB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml index 5466457f..21aeff48 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the GHB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the GHB package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml index eaebee50..a7fbe11b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the GHB package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the General-Head Boundary Package can be diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json index 0cc218df..10b0075a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json @@ -68,7 +68,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the GHB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the GHB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml index f11e364d..bf56fb98 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml @@ -64,6 +64,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the GHB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the GHB package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml index 8bebddc3..80ef2e91 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml @@ -77,6 +77,7 @@ blocks: observation type(s) supported by the GHB package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the General-Head Boundary Package can be diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json index 7f285423..5ebfd07d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json @@ -2,7 +2,10 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "gwf-gnc", - "parent": "gwf-nam", + "parent": [ + "exg-gwfgwf", + "gwf-nam" + ], "dims": { "numgnc": { "value": "numgnc" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml index 0b0feb37..c460faa7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml @@ -1,7 +1,10 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-gnc" -parent = "gwf-nam" +parent = [ + "exg-gwfgwf", + "gwf-nam", +] [dims.numgnc] value = "numgnc" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml index b28818e7..03497fb3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml @@ -1,7 +1,9 @@ type: package schema_version: 2.0.0.dev2 name: gwf-gnc -parent: gwf-nam +parent: + - exg-gwfgwf + - gwf-nam dims: numgnc: value: numgnc diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json index ea7bee1f..5ef54996 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json @@ -149,7 +149,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -168,7 +169,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the LAK package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LAK package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, @@ -385,7 +387,8 @@ "longname": "table file name", "description": "character string that defines the path and filename for the file containing lake table data for the lake connection. The TAB6_FILENAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Instructions for creating the TAB6_FILENAME input file are provided in Lake Table Input File section.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-laktab" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml index 3c00aaff..5df3c4e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml @@ -138,6 +138,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -154,6 +155,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the LAK package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LAK package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" @@ -353,6 +355,7 @@ longname = "table file name" description = "character string that defines the path and filename for the file containing lake table data for the lake connection. The TAB6_FILENAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Instructions for creating the TAB6_FILENAME input file are provided in Lake Table Input File section." tagged = false direction = "in" +component = "utl-laktab" [blocks.outlets.fields.outlets] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml index 9cf29d48..47fbb24e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml @@ -139,6 +139,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -155,6 +156,7 @@ blocks: observation type(s) supported by the LAK package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the LAK Package can be used with the Water @@ -411,6 +413,7 @@ blocks: the TAB6_FILENAME input file are provided in Lake Table Input File section. tagged: false direction: in + component: utl-laktab shape: - ntables outlets: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json index 75e352f1..9e93e127 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json @@ -170,7 +170,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -189,7 +190,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the MAW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MAW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml index ce350cf7..2280c16d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml @@ -159,6 +159,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -175,6 +176,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the MAW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MAW package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml index c350a0c6..6d1eda37 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml @@ -181,6 +181,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -197,6 +198,7 @@ blocks: observation type(s) supported by the MAW package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the MAW Package can be used with the Water diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json index 6a541a6a..d20fccf3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json @@ -2,7 +2,10 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "gwf-mvr", - "parent": "gwf-nam", + "parent": [ + "exg-gwfgwf", + "gwf-nam" + ], "dims": { "maxmvr": { "value": "maxmvr" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml index bf035935..1736ef31 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml @@ -1,7 +1,10 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-mvr" -parent = "gwf-nam" +parent = [ + "exg-gwfgwf", + "gwf-nam", +] [dims.maxmvr] value = "maxmvr" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml index 85e448f3..c0c6358f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml @@ -1,7 +1,9 @@ type: package schema_version: 2.0.0.dev2 name: gwf-mvr -parent: gwf-nam +parent: + - exg-gwfgwf + - gwf-nam dims: maxmvr: value: maxmvr diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json index d43090e1..d3c8951c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json @@ -125,11 +125,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml index 6dc08f63..6c09b3a7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml @@ -111,11 +111,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml index 8d78a83e..bd50172a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml @@ -115,12 +115,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json index 81999035..8b75b254 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json @@ -149,7 +149,8 @@ "longname": "file name of TVK information", "description": "defines a time-varying hydraulic conductivity (TVK) input file. Records in the TVK file can be used to change hydraulic conductivity properties at specified times or stress periods.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tvk" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml index fca5b6dd..cbdc8b1d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml @@ -141,6 +141,7 @@ longname = "file name of TVK information" description = "defines a time-varying hydraulic conductivity (TVK) input file. Records in the TVK file can be used to change hydraulic conductivity properties at specified times or stress periods." tagged = false direction = "in" +component = "utl-tvk" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml index b0c4ce4c..5f7b55fe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml @@ -189,6 +189,7 @@ blocks: periods. tagged: false direction: in + component: utl-tvk export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json index 0b257b46..0314a89f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json @@ -74,7 +74,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -93,7 +94,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the RCH package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RCH package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml index 6be4cd81..5e97945b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml @@ -71,6 +71,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -87,6 +88,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the RCH package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RCH package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml index 1c5c87d0..e4a021ad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml @@ -79,6 +79,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -95,6 +96,7 @@ blocks: observation type(s) supported by the RCH package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json index 61f8faee..a3c886f3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json @@ -72,7 +72,8 @@ "longname": "file name of time series information", "description": "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-array series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tas" } } } @@ -91,7 +92,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the RCH package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RCH package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml index a10bf4ab..017d953b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml @@ -69,6 +69,7 @@ longname = "file name of time series information" description = "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-array series capability." tagged = false direction = "in" +component = "utl-tas" [blocks.options.fields.obs_filerecord] type = "record" @@ -85,6 +86,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the RCH package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RCH package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_netcdf] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml index 937392bd..d1abe05a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml @@ -81,6 +81,7 @@ blocks: on using the time-array series capability. tagged: false direction: in + component: utl-tas obs_filerecord: type: record optional: true @@ -97,6 +98,7 @@ blocks: observation type(s) supported by the RCH package. tagged: false direction: in + component: utl-obs export_array_netcdf: type: keyword longname: export array variables to netcdf output files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json index db424c72..4ea5a318 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the RIV package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RIV package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml index b16e9d78..9d0952b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the RIV package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RIV package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml index c309838d..ccc00fa0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml @@ -72,6 +72,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -88,6 +89,7 @@ blocks: observation type(s) supported by the RIV package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the River Package can be used with the diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json index 3e14deb9..e7dd623a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json @@ -68,7 +68,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the RIV package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RIV package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml index 1db555f4..e6676ce9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml @@ -64,6 +64,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the RIV package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RIV package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml index fc8d090c..13037d44 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml @@ -76,6 +76,7 @@ blocks: observation type(s) supported by the RIV package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the River Package can be used with the diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json index 1c55b909..ea9117d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json @@ -146,7 +146,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -165,7 +166,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the SFR package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFR package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, @@ -372,7 +374,8 @@ "longname": "table file name", "description": "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-sfrtab" } } } @@ -594,7 +597,8 @@ "longname": "table file name", "description": "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-sfrtab" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml index 7cd7bab6..9f55141f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml @@ -135,6 +135,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -151,6 +152,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the SFR package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFR package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" @@ -343,6 +345,7 @@ longname = "table file name" description = "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section." tagged = false direction = "in" +component = "utl-sfrtab" [blocks.connectiondata.fields.connectiondata] type = "list" @@ -539,6 +542,7 @@ longname = "table file name" description = "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section." tagged = false direction = "in" +component = "utl-sfrtab" [blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml index b5732246..ed013bfd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml @@ -140,6 +140,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -156,6 +157,7 @@ blocks: observation type(s) supported by the SFR package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the SFR Package can be used with the Water @@ -393,6 +395,7 @@ blocks: SFR Reach Cross-Section Table Input File section. tagged: false direction: in + component: utl-sfrtab connectiondata: fields: connectiondata: @@ -672,6 +675,7 @@ blocks: are provided in SFR Reach Cross-Section Table Input File section. tagged: false direction: in + component: utl-sfrtab auxiliaryrecord: type: record fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json index 3cdc8335..bac90e80 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json @@ -38,7 +38,8 @@ "longname": "file name of TVS information", "description": "defines a time-varying storage (TVS) input file. Records in the TVS file can be used to change specific storage and specific yield properties at specified times or stress periods.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tvs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml index 0881713e..00af4715 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml @@ -36,6 +36,7 @@ longname = "file name of TVS information" description = "defines a time-varying storage (TVS) input file. Records in the TVS file can be used to change specific storage and specific yield properties at specified times or stress periods." tagged = false direction = "in" +component = "utl-tvs" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml index 591f7faa..d6ff7b63 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml @@ -43,6 +43,7 @@ blocks: periods. tagged: false direction: in + component: utl-tvs export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json index 4cd1d7a2..c851ff96 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json @@ -146,7 +146,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -165,7 +166,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the UZF package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZF package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml index 6e90e2b0..9f8f6aa0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml @@ -135,6 +135,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -151,6 +152,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the UZF package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZF package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml index a803119b..55584a5d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml @@ -135,6 +135,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -151,6 +152,7 @@ blocks: observation type(s) supported by the UZF package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the UZF Package can be used with the Water diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json index 212818e8..85be37c3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json @@ -98,7 +98,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -117,7 +118,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the WEL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the WEL package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml index 933ea1c8..c3554571 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml @@ -93,6 +93,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -109,6 +110,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the WEL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the WEL package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml index bbdf384f..56697970 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml @@ -112,6 +112,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -128,6 +129,7 @@ blocks: observation type(s) supported by the WEL package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the Well Package can be used with the Water diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json index 134246ae..0c1641b8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json @@ -98,7 +98,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the WEL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the WEL package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml index 37386510..f80942db 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml @@ -92,6 +92,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the WEL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the WEL package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml index f098a0b0..7135f325 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml @@ -116,6 +116,7 @@ blocks: observation type(s) supported by the WEL package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the Well Package can be used with the Water diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json index 502fa543..092735db 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json @@ -49,7 +49,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the api boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the api boundary package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml index 79d4744f..04785a15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml @@ -45,6 +45,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the api boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the api boundary package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml index bc4350cf..36f7c006 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml @@ -50,6 +50,7 @@ blocks: {#2} lists observation type(s) supported by the api boundary package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the api boundary Package can be used with diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json index 97a30954..ed3bfaf3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CNC package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CNC package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml index 843eae19..3c0746f5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CNC package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CNC package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml index afdef1b3..fb0935b8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the CNC package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json index 47a04f7a..d65b3434 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json @@ -114,7 +114,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml index 1834b2a0..26056d5e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml @@ -108,6 +108,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml index 5bda9ed5..7470eb1a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml @@ -111,6 +111,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json index d0e552c6..67311326 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json @@ -110,7 +110,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml index 6a2b0da2..d112a22c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml @@ -104,6 +104,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml index c2d04035..68034617 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml @@ -110,6 +110,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json index 05c31c78..b968744e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json @@ -131,7 +131,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -150,7 +151,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the LKT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LKT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml index 16d290f7..7c4d2374 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml @@ -122,6 +122,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -138,6 +139,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the LKT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LKT package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml index 616ff761..4e91d431 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml @@ -132,6 +132,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -148,6 +149,7 @@ blocks: observation type(s) supported by the LKT package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json index 7a3af779..316caa6a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json @@ -2,7 +2,10 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "gwt-mvt", - "parent": "gwt-nam", + "parent": [ + "exg-gwtgwt", + "gwt-nam" + ], "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml index 989d4821..e4569812 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml @@ -1,7 +1,10 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-mvt" -parent = "gwt-nam" +parent = [ + "exg-gwtgwt", + "gwt-nam", +] [blocks.options.fields.print_input] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml index e77482dc..5d420d81 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml @@ -1,7 +1,9 @@ type: package schema_version: 2.0.0.dev2 name: gwt-mvt -parent: gwt-nam +parent: + - exg-gwtgwt + - gwt-nam blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json index 7e010097..47e71138 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json @@ -131,7 +131,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -150,7 +151,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the MWT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MWT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml index 7506b7af..a069cadf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml @@ -122,6 +122,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -138,6 +139,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the MWT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MWT package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml index ccb54dd2..8669ba9c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml @@ -132,6 +132,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -148,6 +149,7 @@ blocks: observation type(s) supported by the MWT package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json index d8dd9077..7b435f70 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json @@ -112,11 +112,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml index edcab7de..4dc6630f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml @@ -100,11 +100,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml index 05e31708..922ffef2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml @@ -101,12 +101,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json index 61e6716a..f4c7b5e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json @@ -131,7 +131,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -150,7 +151,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the SFT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml index dc1f83b3..853641d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml @@ -122,6 +122,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -138,6 +139,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the SFT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFT package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml index 59719fb2..c2331f54 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml @@ -132,6 +132,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -148,6 +149,7 @@ blocks: observation type(s) supported by the SFT package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json index 592dd324..5b2e5b00 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the SRC package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SRC package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml index 6e0a54b4..72d3d47c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the SRC package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SRC package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.highest_saturated] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml index c1efb7b6..ae273e9a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the SRC package. tagged: false direction: in + component: utl-obs highest_saturated: type: keyword longname: apply source to highest saturated cell diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.json index c7bc8d70..36365f84 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.json @@ -76,7 +76,11 @@ "longname": "spc file name", "description": "character string that defines the path and filename for the file containing source and sink input data for the flow package. The SPC6_FILENAME file is a flexible input file that allows concentrations to be specified by stress period and with time series. Instructions for creating the SPC6_FILENAME input file are provided in the next section on file input for boundary concentrations.", "tagged": false, - "direction": "in" + "direction": "in", + "component": [ + "utl-spc", + "utl-spca" + ] }, "mixed": { "type": "keyword", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.toml index 1b5791d4..9b89f5f9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.toml @@ -67,6 +67,10 @@ longname = "spc file name" description = "character string that defines the path and filename for the file containing source and sink input data for the flow package. The SPC6_FILENAME file is a flexible input file that allows concentrations to be specified by stress period and with time series. Instructions for creating the SPC6_FILENAME input file are provided in the next section on file input for boundary concentrations." tagged = false direction = "in" +component = [ + "utl-spc", + "utl-spca", +] [blocks.fileinput.fields.fileinput.item.fields.mixed] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.yaml index d65d0f85..17d8285c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.yaml @@ -92,6 +92,9 @@ blocks: on file input for boundary concentrations. tagged: false direction: in + component: + - utl-spc + - utl-spca mixed: type: keyword longname: mixed keyword diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json index 4d2b9e3f..21ba7030 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json @@ -131,7 +131,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -150,7 +151,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the UZT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml index 1f1289d7..2512baca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml @@ -122,6 +122,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -138,6 +139,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the UZT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZT package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml index c886cf17..ef97c88a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml @@ -133,6 +133,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -149,6 +150,7 @@ blocks: observation type(s) supported by the UZT package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json index 4b1f666b..7f928ea0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json @@ -60,7 +60,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml index dc5c8e15..76d9de5b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml @@ -56,6 +56,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml index 3b86a99b..44c1bfd1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml @@ -66,6 +66,7 @@ blocks: observation type(s) supported by the CDB package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json index 7856d500..39970259 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml index e71fef28..ef1a4cf1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml index 8ba894d3..a9963b17 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the CHD package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json index 306c1a73..79dd7e78 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json @@ -56,7 +56,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml index b7d0ebc2..2524ac53 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml @@ -54,6 +54,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml index eed60d83..fe95f7bf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml @@ -72,6 +72,7 @@ blocks: observation type(s) supported by the DFW package. tagged: false direction: in + component: utl-obs export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json index 70775b93..25480935 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the EVP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml index 5a7aef7f..d9530ef0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the EVP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml index d0b6402d..5b6fe418 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the EVP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json index 276a98eb..8009d06f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the FLW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the FLW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml index 8a748893..0d13b1dc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the FLW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the FLW package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml index 3a2c6bad..b661bf77 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml @@ -72,6 +72,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -88,6 +89,7 @@ blocks: observation type(s) supported by the FLW package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json index 28f48725..d26345bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json @@ -68,11 +68,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml index 90c615ee..39f7bbe6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml @@ -60,11 +60,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml index 7921c69b..ae13ea3b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml @@ -69,12 +69,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json index e8293531..3da0ed6b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the PCP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the PCP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml index 424a79c0..92e13f0d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the PCP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the PCP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml index faff352e..7d7034cc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: observation type(s) supported by the PCP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json index 794e490d..f4d871cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json @@ -62,7 +62,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -81,7 +82,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the ZDG package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ZDG package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml index febfd62a..cfd89569 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml @@ -59,6 +59,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -75,6 +76,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the ZDG package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ZDG package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml index d98899bf..994c340d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml @@ -68,6 +68,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -84,6 +85,7 @@ blocks: observation type(s) supported by the ZDG package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json index 2eb7b00b..a963336c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json @@ -114,7 +114,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml index 8acc6b2a..91a9b599 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml @@ -108,6 +108,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml index 49dd71f3..46460e4d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml @@ -111,6 +111,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json index a429f485..65a1f322 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json @@ -110,7 +110,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml index bed4b83e..d400c7bf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml @@ -104,6 +104,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml index b62dbe9a..3d9b17ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml @@ -109,6 +109,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json index 1ed951c4..8e06c5d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json @@ -47,11 +47,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml index d254562b..513785b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml @@ -41,11 +41,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml index 75da1675..873c082e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml @@ -48,12 +48,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.json index 5d55f816..2005d864 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.json @@ -56,7 +56,8 @@ "longname": "file name of time series information", "description": "name of input file to define HPC file settings for the HPC package. See the 'HPC File' section for instructions for preparing HPC input files.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-hpc" } } } @@ -65,11 +66,12 @@ "timing": { "fields": { "tdis6": { - "type": "string", + "type": "file", "longname": "name of tdis input file", "description": "is the name of the Temporal Discretization (TDIS) Input File.", - "optional": true, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "sim-tdis" } } }, @@ -91,11 +93,14 @@ "tagged": false }, "mfname": { - "type": "string", + "type": "file", "longname": "file name for model name file", "description": "is the file name of the model name file.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "model", + "component_ref": "mtype" }, "mname": { "type": "string", @@ -126,11 +131,14 @@ "tagged": false }, "exgfile": { - "type": "string", + "type": "file", "longname": "input file for exchange", "description": "is the input file for the exchange.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "exchange", + "component_ref": "exgtype" }, "exgmnamea": { "type": "string", @@ -176,11 +184,14 @@ ] }, "slnfname": { - "type": "string", + "type": "file", "longname": "file name for solution input", "description": "name of file containing solution input.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "solution", + "component_ref": "slntype" }, "slnmnames": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.toml index b5b6a085..8cee5fc5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.toml @@ -54,13 +54,15 @@ longname = "file name of time series information" description = "name of input file to define HPC file settings for the HPC package. See the 'HPC File' section for instructions for preparing HPC input files." tagged = false direction = "in" +component = "utl-hpc" [blocks.timing.fields.tdis6] -type = "string" +type = "file" longname = "name of tdis input file" description = "is the name of the Temporal Discretization (TDIS) Input File." -optional = true -case_sensitive = true +direction = "in" +mode_keyword = false +component = "sim-tdis" [blocks.models.fields.models] type = "list" @@ -79,11 +81,14 @@ description = "is the type of model to add to simulation." tagged = false [blocks.models.fields.models.item.fields.mfname] -type = "string" +type = "file" longname = "file name for model name file" description = "is the file name of the model name file." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "model" +component_ref = "mtype" [blocks.models.fields.models.item.fields.mname] type = "string" @@ -108,11 +113,14 @@ description = "is the exchange type." tagged = false [blocks.exchanges.fields.exchanges.item.fields.exgfile] -type = "string" +type = "file" longname = "input file for exchange" description = "is the input file for the exchange." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "exchange" +component_ref = "exgtype" [blocks.exchanges.fields.exchanges.item.fields.exgmnamea] type = "string" @@ -152,11 +160,14 @@ valid = [ ] [blocks.solutiongroup.fields.solutiongroup.item.fields.slnfname] -type = "string" +type = "file" longname = "file name for solution input" description = "name of file containing solution input." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "solution" +component_ref = "slntype" [blocks.solutiongroup.fields.solutiongroup.item.fields.slnmnames] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.yaml index 214e0ff9..39452350 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.yaml @@ -61,14 +61,16 @@ blocks: File' section for instructions for preparing HPC input files. tagged: false direction: in + component: utl-hpc timing: fields: tdis6: - type: string + type: file longname: name of tdis input file description: is the name of the Temporal Discretization (TDIS) Input File. - optional: true - case_sensitive: true + direction: in + mode_keyword: false + component: sim-tdis models: fields: models: @@ -86,11 +88,14 @@ blocks: description: is the type of model to add to simulation. tagged: false mfname: - type: string + type: file longname: file name for model name file description: is the file name of the model name file. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: model + component_ref: mtype mname: type: string longname: name of model @@ -115,11 +120,14 @@ blocks: description: is the exchange type. tagged: false exgfile: - type: string + type: file longname: input file for exchange description: is the input file for the exchange. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: exchange + component_ref: exgtype exgmnamea: type: string longname: name of model A @@ -156,11 +164,14 @@ blocks: - ims6 - ems6 slnfname: - type: string + type: file longname: file name for solution input description: name of file containing solution input. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: solution + component_ref: slntype slnmnames: type: array longname: array of model names in this solution diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.json index c001cbbc..c8c14231 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.json @@ -38,7 +38,8 @@ "longname": "file name of adaptive time series information", "description": "defines an adaptive time step (ATS) input file defining ATS controls. Records in the ATS file can be used to override the time step behavior for selected stress periods.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ats" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.toml index a52f82ea..c968f087 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.toml @@ -34,6 +34,7 @@ longname = "file name of adaptive time series information" description = "defines an adaptive time step (ATS) input file defining ATS controls. Records in the ATS file can be used to override the time step behavior for selected stress periods." tagged = false direction = "in" +component = "utl-ats" [blocks.dimensions.fields.nper] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.yaml index 90af242c..4d89770a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.yaml @@ -39,6 +39,7 @@ blocks: in the ATS file can be used to override the time step behavior for selected stress periods. tagged: false direction: in + component: utl-ats dimensions: fields: nper: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json index ec036011..fffba2f3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json @@ -60,7 +60,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the Zero-Depth-Gradient Boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Zero-Depth-Gradient Boundary package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml index c6acc428..65811cdd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml @@ -56,6 +56,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the Zero-Depth-Gradient Boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Zero-Depth-Gradient Boundary package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml index a980229d..ef0eb30a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml @@ -67,6 +67,7 @@ blocks: package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json index 6169cc10..737b1dcd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the constant-head package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the constant-head package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml index 2dd4937b..1ef59f54 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the constant-head package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the constant-head package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml index 4cbaf5c2..fa81d450 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: Table {#2} lists observation type(s) supported by the constant-head package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json index 1376ca8e..2aaffe04 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json @@ -56,7 +56,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml index a2d27e50..bdd80032 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml @@ -54,6 +54,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml index f3c6922c..501c29c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml @@ -72,6 +72,7 @@ blocks: observation type(s) supported by the DFW package. tagged: false direction: in + component: utl-obs export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json index 1e63898d..730315b4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the Evaporation package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Evaporation package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml index fa98c4ba..b62d2a01 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the Evaporation package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Evaporation package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml index b7e91191..75afa01b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: {#2} lists observation type(s) supported by the Evaporation package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json index ad0177d2..bbf56104 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the inflow package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the inflow package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml index bbee9e0a..065781a7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the inflow package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the inflow package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml index 58e4b606..30db903a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml @@ -72,6 +72,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -88,6 +89,7 @@ blocks: observation type(s) supported by the inflow package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json index 79d65712..250d4b62 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json @@ -68,11 +68,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml index 38acfa60..0c8bf203 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml @@ -60,11 +60,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml index 35f18e72..a776e97f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml @@ -69,12 +69,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json index 3f70cdac..8fe10d6a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json @@ -68,7 +68,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -87,7 +88,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the Precipitation package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Precipitation package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml index 5d9ba6c8..7d4b0be1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml @@ -65,6 +65,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -81,6 +82,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the Precipitation package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Precipitation package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml index d31d9e81..cff1de88 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml @@ -73,6 +73,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -89,6 +90,7 @@ blocks: Table {#2} lists observation type(s) supported by the Precipitation package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json index cd7b4f44..454a0f68 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json @@ -62,7 +62,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -81,7 +82,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the Zero-Depth-Gradient Boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Zero-Depth-Gradient Boundary package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml index f11fb40c..9a71114a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml @@ -59,6 +59,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -75,6 +76,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the Zero-Depth-Gradient Boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Zero-Depth-Gradient Boundary package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml index 5f974137..bde5be38 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml @@ -68,6 +68,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -85,6 +86,7 @@ blocks: package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json index 5abcc2b5..fad0ea0f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-ats", - "parent": "sim-nam", + "parent": "sim-tdis", "subtype": "utility", "dims": { "maxats": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml index bad45a5f..a9675c90 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-ats" -parent = "sim-nam" +parent = "sim-tdis" subtype = "utility" [dims.maxats] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml index 08d68d45..1c8e9dbd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-ats -parent: sim-nam +parent: sim-tdis subtype: utility dims: maxats: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json index a835426c..354351b9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-laktab", - "parent": "sim-nam", + "parent": "gwf-lak", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml index 8d052865..d981f7a2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-laktab" -parent = "sim-nam" +parent = "gwf-lak" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml index ea48b110..9dff493e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-laktab -parent: sim-nam +parent: gwf-lak multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json index 1f99d539..fae2d972 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-ncf", - "parent": "sim-nam", + "parent": "package", "subtype": "utility", "dims": { "ncpl": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml index 15fb3d2e..2ff1ad83 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-ncf" -parent = "sim-nam" +parent = "package" subtype = "utility" [dims.ncpl] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml index bcf16bce..9cb9b693 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-ncf -parent: sim-nam +parent: package subtype: utility dims: ncpl: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json index e4834692..c3e413fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-obs", - "parent": "sim-nam", + "parent": "package", "multi": true, "subtype": "utility", "blocks": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml index 6dbd0ec4..7af9ed48 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-obs" -parent = "sim-nam" +parent = "package" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml index 47db8b7a..4e3c8756 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-obs -parent: sim-nam +parent: package multi: true subtype: utility blocks: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json index ed655dc6..abb90935 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-sfrtab", - "parent": "sim-nam", + "parent": "gwf-sfr", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml index 5517edcc..c9b29167 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-sfrtab" -parent = "sim-nam" +parent = "gwf-sfr" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml index fd6eaaf2..6a9f8bbf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-sfrtab -parent: sim-nam +parent: gwf-sfr multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json index 1ba9c4da..23db1bc9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-spc", - "parent": "sim-nam", + "parent": "package", "multi": true, "subtype": "utility", "dims": { @@ -35,7 +35,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml index 1cb1ef0f..136e0318 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-spc" -parent = "sim-nam" +parent = "package" multi = true subtype = "utility" @@ -32,6 +32,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml index 92e38bf8..7bb3a3c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-spc -parent: sim-nam +parent: package multi: true subtype: utility dims: @@ -34,6 +34,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json index 48fb03d0..c50a227e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json @@ -36,7 +36,8 @@ "longname": "file name of time series information", "description": "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the Time-Variable Input section for instructions on using the time-array series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tas" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml index 80506cb4..34ecd023 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml @@ -35,6 +35,7 @@ longname = "file name of time series information" description = "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the Time-Variable Input section for instructions on using the time-array series capability." tagged = false direction = "in" +component = "utl-tas" [blocks.period.fields.concentration] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml index 509ab775..454c891f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml @@ -40,6 +40,7 @@ blocks: using the time-array series capability. tagged: false direction: in + component: utl-tas period: fields: concentration: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.json index e9eb6ccb..03dba193 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-ts", - "parent": "sim-nam", + "parent": "package", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.toml index 12a7f650..da867d36 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-ts" -parent = "sim-nam" +parent = "package" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.yaml index 60c82cd2..485f6011 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-ts -parent: sim-nam +parent: package multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json index 05650305..4a6eaa7f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-tvk", - "parent": "package", + "parent": "gwf-npf", "subtype": "utility", "blocks": { "options": { @@ -29,7 +29,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml index 980949f5..735c86f9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-tvk" -parent = "package" +parent = "gwf-npf" subtype = "utility" [blocks.options.fields.print_input] @@ -28,6 +28,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.period.fields.perioddata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml index 30f9c0de..44f1e5f2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-tvk -parent: package +parent: gwf-npf subtype: utility blocks: options: @@ -30,6 +30,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts period: fields: perioddata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json index 7eb60e32..12dab2a5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-tvs", - "parent": "package", + "parent": "gwf-sto", "subtype": "utility", "blocks": { "options": { @@ -35,7 +35,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml index e50f5185..69fa3788 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-tvs" -parent = "package" +parent = "gwf-sto" subtype = "utility" [blocks.options.fields.disable_storage_change_integration] @@ -34,6 +34,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.period.fields.perioddata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml index a8d47743..c3239743 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-tvs -parent: package +parent: gwf-sto subtype: utility blocks: options: @@ -38,6 +38,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts period: fields: perioddata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json index c1de37da..c8fe838e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json @@ -71,7 +71,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml index 6f13985b..7014e819 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml @@ -65,6 +65,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml index 01702566..cd61e8f8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml @@ -73,6 +73,7 @@ blocks: observation type(s) supported by the CDB package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json index 2193d0cd..e5a58b68 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml index 52e4ec1a..889ab35e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml index e1dc0e55..9bd088af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the CHD package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json index a0181a65..32146650 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json @@ -61,7 +61,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml index fcbda033..87c91038 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml @@ -57,6 +57,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml index 61a7f295..41207326 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml @@ -75,6 +75,7 @@ blocks: observation type(s) supported by the DFW package. tagged: false direction: in + component: utl-obs export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json index 6b6407d8..0d0e9531 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the EVP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml index 55d2fd53..62342893 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the EVP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml index 1deba133..75967b24 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the EVP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json index 965aa17b..e490cb34 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the FLW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the FLW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml index 0623cbda..a6fd97a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the FLW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the FLW package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml index efa9738e..0bd6f5bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml @@ -79,6 +79,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -95,6 +96,7 @@ blocks: observation type(s) supported by the FLW package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json index 92d45ec4..af52265c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json @@ -76,11 +76,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml index e2ec243b..d62191bf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml @@ -66,11 +66,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml index 7f1ed917..20edd95f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml @@ -74,12 +74,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json index 39b9a157..d1e43159 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the PCP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the PCP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml index 480bef0e..3e5fd4c6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the PCP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the PCP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml index 4a5686c6..b30e60c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the PCP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json index 7a3ef867..bbc9d9fb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json @@ -73,7 +73,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -92,7 +93,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the ZDG package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ZDG package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml index 79681d07..79817c2f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml @@ -68,6 +68,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -84,6 +85,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the ZDG package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ZDG package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml index befc8d12..fc97c3d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml @@ -75,6 +75,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -91,6 +92,7 @@ blocks: observation type(s) supported by the ZDG package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json index a179df71..cb542e27 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json @@ -45,7 +45,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the SWF-GWF package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml index ff095fc7..7a6cabe5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml @@ -41,6 +41,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the SWF-GWF package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml index f901e093..5bbaf401 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml @@ -45,6 +45,7 @@ blocks: lists observation type(s) supported by the SWF-GWF package. tagged: false direction: in + component: utl-obs dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json index 77d73d36..a415bd3e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json @@ -96,7 +96,8 @@ "longname": "mve6 input filename", "description": "is the file name of the transport mover input file to apply to this exchange. Information for the transport mover are provided in the file provided with these keywords.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "gwe-mve" } } }, @@ -114,7 +115,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwe-obstypetable} lists observation type(s) supported by the GWE-GWE Exchange Package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml index 96420a5c..4c965561 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml @@ -92,6 +92,7 @@ longname = "mve6 input filename" description = "is the file name of the transport mover input file to apply to this exchange. Information for the transport mover are provided in the file provided with these keywords." tagged = false direction = "in" +component = "gwe-mve" [blocks.options.fields.obs_filerecord] type = "record" @@ -108,6 +109,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwe-obstypetable} lists observation type(s) supported by the GWE-GWE Exchange Package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.dev_interfacemodel_on] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml index 6421de1a..e80f57ba 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml @@ -103,6 +103,7 @@ blocks: for the transport mover are provided in the file provided with these keywords. tagged: false direction: in + component: gwe-mve obs_filerecord: type: record optional: true @@ -119,6 +120,7 @@ blocks: lists observation type(s) supported by the GWE-GWE Exchange Package. tagged: false direction: in + component: utl-obs dev_interfacemodel_on: type: keyword longname: activate interface model on exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json index cabb9356..4610c868 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json @@ -105,7 +105,8 @@ "longname": "gnc6 input filename", "description": "is the file name for ghost node correction input file. Information for the ghost nodes are provided in the file provided with these keywords. The format for specifying the ghost nodes is the same as described for the GNC Package of the GWF Model. This includes specifying OPTIONS, DIMENSIONS, and GNCDATA blocks. The order of the ghost nodes must follow the same order as the order of the cells in the EXCHANGEDATA block. For the GNCDATA, noden and all of the nodej values are assumed to be located in model 1, and nodem is assumed to be in model 2.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "gwf-gnc" } } }, @@ -123,7 +124,8 @@ "longname": "mvr6 input filename", "description": "is the file name of the water mover input file to apply to this exchange. Information for the water mover are provided in the file provided with these keywords. The format for specifying the water mover information is the same as described for the Water Mover (MVR) Package of the GWF Model, with two exceptions. First, in the PACKAGES block, the model name must be included as a separate string before each package. Second, the appropriate model name must be included before package name 1 and package name 2 in the BEGIN PERIOD block. This allows providers and receivers to be located in both models listed as part of this exchange.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "gwf-mvr" } } }, @@ -141,7 +143,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the GWF-GWF package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml index 07bb58aa..546110d4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml @@ -99,6 +99,7 @@ longname = "gnc6 input filename" description = "is the file name for ghost node correction input file. Information for the ghost nodes are provided in the file provided with these keywords. The format for specifying the ghost nodes is the same as described for the GNC Package of the GWF Model. This includes specifying OPTIONS, DIMENSIONS, and GNCDATA blocks. The order of the ghost nodes must follow the same order as the order of the cells in the EXCHANGEDATA block. For the GNCDATA, noden and all of the nodej values are assumed to be located in model 1, and nodem is assumed to be in model 2." tagged = false direction = "in" +component = "gwf-gnc" [blocks.options.fields.mvr_filerecord] type = "record" @@ -115,6 +116,7 @@ longname = "mvr6 input filename" description = "is the file name of the water mover input file to apply to this exchange. Information for the water mover are provided in the file provided with these keywords. The format for specifying the water mover information is the same as described for the Water Mover (MVR) Package of the GWF Model, with two exceptions. First, in the PACKAGES block, the model name must be included as a separate string before each package. Second, the appropriate model name must be included before package name 1 and package name 2 in the BEGIN PERIOD block. This allows providers and receivers to be located in both models listed as part of this exchange." tagged = false direction = "in" +component = "gwf-mvr" [blocks.options.fields.obs_filerecord] type = "record" @@ -131,6 +133,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the GWF-GWF package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.dev_interfacemodel_on] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml index df8977c8..cd20a0dc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml @@ -127,6 +127,7 @@ blocks: be in model 2. tagged: false direction: in + component: gwf-gnc mvr_filerecord: type: record optional: true @@ -148,6 +149,7 @@ blocks: of this exchange. tagged: false direction: in + component: gwf-mvr obs_filerecord: type: record optional: true @@ -164,6 +166,7 @@ blocks: lists observation type(s) supported by the GWF-GWF package. tagged: false direction: in + component: utl-obs dev_interfacemodel_on: type: keyword longname: activate interface model on exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json index f6cbbe31..3515e11a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json @@ -96,7 +96,8 @@ "longname": "mvt6 input filename", "description": "is the file name of the transport mover input file to apply to this exchange. Information for the transport mover are provided in the file provided with these keywords.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "gwt-mvt" } } }, @@ -114,7 +115,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwt-obstypetable} lists observation type(s) supported by the GWT-GWT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml index 7aa6e859..dd7f38cf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml @@ -92,6 +92,7 @@ longname = "mvt6 input filename" description = "is the file name of the transport mover input file to apply to this exchange. Information for the transport mover are provided in the file provided with these keywords." tagged = false direction = "in" +component = "gwt-mvt" [blocks.options.fields.obs_filerecord] type = "record" @@ -108,6 +109,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwt-obstypetable} lists observation type(s) supported by the GWT-GWT package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.dev_interfacemodel_on] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml index cd4fdfb7..a14f34de 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml @@ -101,6 +101,7 @@ blocks: for the transport mover are provided in the file provided with these keywords. tagged: false direction: in + component: gwt-mvt obs_filerecord: type: record optional: true @@ -117,6 +118,7 @@ blocks: lists observation type(s) supported by the GWT-GWT package. tagged: false direction: in + component: utl-obs dev_interfacemodel_on: type: keyword longname: activate interface model on exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json index 7f620210..7baef565 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json @@ -45,7 +45,8 @@ "longname": "obs6 input filename", "description": "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the SWF-GWF package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml index b4bfef0f..76bd30c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml @@ -41,6 +41,7 @@ longname = "obs6 input filename" description = "is the file name of the observations input file for this exchange. See the 'Observation utility' section for instructions for preparing observation input files. Table ref{table:gwf-obstypetable} lists observation type(s) supported by the SWF-GWF package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.nexg] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml index 1057333f..b5f8c6c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml @@ -45,6 +45,7 @@ blocks: lists observation type(s) supported by the SWF-GWF package. tagged: false direction: in + component: utl-obs dimensions: fields: nexg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json index 60be2f29..de110dd1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CTP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CTP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml index 0f2e9e3c..693b7360 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CTP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CTP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml index e65120e7..62ef057a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the CTP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json index 7c33bf7a..10453f2a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json @@ -122,7 +122,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml index e749b55e..f421e532 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml @@ -114,6 +114,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml index 0f2b37a5..12f7c634 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml @@ -116,6 +116,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json index 50a79403..b940d62e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json @@ -118,7 +118,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml index 5e066363..71e5cd10 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml @@ -110,6 +110,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml index dab25fab..898bc79b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml @@ -115,6 +115,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json index ec3d2adb..9442b761 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the ESL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ESL package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml index f881e11e..c896787c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the ESL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ESL package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml index 0ae65003..533c7fde 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the ESL package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json index b34e74fa..8d8a5201 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json @@ -136,7 +136,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -155,7 +156,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the LKE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LKE package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml index fbf1749b..3ff6aee0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml @@ -125,6 +125,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -141,6 +142,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the LKE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LKE package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml index b4fe555e..98613c81 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml @@ -135,6 +135,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -151,6 +152,7 @@ blocks: observation type(s) supported by the LKE package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.json index 712c3fe6..83a333d5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.json @@ -2,7 +2,10 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "gwe-mve", - "parent": "gwe-nam", + "parent": [ + "exg-gwegwe", + "gwe-nam" + ], "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.toml index 36dc9549..1595e31b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.toml @@ -1,7 +1,10 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-mve" -parent = "gwe-nam" +parent = [ + "exg-gwegwe", + "gwe-nam", +] [blocks.options.fields.print_input] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.yaml index 8c0a19a2..10313286 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.yaml @@ -1,7 +1,9 @@ type: package schema_version: 2.0.0.dev3 name: gwe-mve -parent: gwe-nam +parent: + - exg-gwegwe + - gwe-nam blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json index cd6f143c..7f1f430e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json @@ -136,7 +136,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -155,7 +156,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the MWE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MWE package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml index fff34c4c..ae50c3f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml @@ -125,6 +125,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -141,6 +142,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the MWE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MWE package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml index 9f5892d3..d2f4454f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml @@ -135,6 +135,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -151,6 +152,7 @@ blocks: observation type(s) supported by the MWE package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json index 79c631e3..8ffc54d2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json @@ -120,11 +120,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml index 5c68a895..543c1b97 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml @@ -106,11 +106,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml index 2842d2c1..852c1ef3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml @@ -106,12 +106,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json index db98f995..61c33c58 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json @@ -136,7 +136,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -155,7 +156,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the SFE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFE package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml index ba898206..969cb629 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml @@ -125,6 +125,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -141,6 +142,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the SFE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFE package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml index 5f47a694..a68c0233 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml @@ -136,6 +136,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -152,6 +153,7 @@ blocks: observation type(s) supported by the SFE package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.json index ebbba234..83f10f88 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.json @@ -76,7 +76,11 @@ "longname": "spc file name", "description": "character string that defines the path and filename for the file containing source and sink input data for the flow package. The SPC6_FILENAME file is a flexible input file that allows temperatures to be specified by stress period and with time series. Instructions for creating the SPC6_FILENAME input file are provided in the next section on file input for boundary temperatures.", "tagged": false, - "direction": "in" + "direction": "in", + "component": [ + "utl-spc", + "utl-spca" + ] }, "mixed": { "type": "keyword", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.toml index cda702bf..042adfd4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.toml @@ -67,6 +67,10 @@ longname = "spc file name" description = "character string that defines the path and filename for the file containing source and sink input data for the flow package. The SPC6_FILENAME file is a flexible input file that allows temperatures to be specified by stress period and with time series. Instructions for creating the SPC6_FILENAME input file are provided in the next section on file input for boundary temperatures." tagged = false direction = "in" +component = [ + "utl-spc", + "utl-spca", +] [blocks.fileinput.fields.fileinput.item.fields.mixed] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.yaml index f2d74e35..f6c0f630 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.yaml @@ -92,6 +92,9 @@ blocks: on file input for boundary temperatures. tagged: false direction: in + component: + - utl-spc + - utl-spca mixed: type: keyword longname: mixed keyword diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json index c8e4805f..e245635b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json @@ -136,7 +136,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -155,7 +156,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the UZE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZE package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml index 97392c19..b3529cff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml @@ -125,6 +125,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -141,6 +142,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the UZE package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZE package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml index 62d71bab..21d19e9c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml @@ -136,6 +136,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -152,6 +153,7 @@ blocks: observation type(s) supported by the UZE package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json index 3fd58c16..db71a73c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json @@ -49,7 +49,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the api boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the api boundary package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml index 6769ef21..f85daa3a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml @@ -45,6 +45,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the api boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the api boundary package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml index 9d7d5e12..cfa8d488 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml @@ -50,6 +50,7 @@ blocks: {#2} lists observation type(s) supported by the api boundary package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the api boundary Package can be used with diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json index 312a8527..784335a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml index 6e4217ed..24278db2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.dev_no_newton] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml index ed467094..1d06058a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the CHD package. tagged: false direction: in + component: utl-obs dev_no_newton: type: keyword longname: turn off Newton for unconfined cells diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json index 6203882a..a2e062bc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json @@ -79,7 +79,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml index fa31901c..a8adb627 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml @@ -73,6 +73,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_netcdf] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml index 8db39c85..5aefa1b0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml @@ -83,6 +83,7 @@ blocks: observation type(s) supported by the CHD package. tagged: false direction: in + component: utl-obs export_array_netcdf: type: keyword longname: export array variables to netcdf output files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json index d95d1ebd..2e3bd480 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json @@ -291,7 +291,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -310,7 +311,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CSUB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CSUB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml index f903d5e2..cd92eaf0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml @@ -268,6 +268,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -284,6 +285,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CSUB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CSUB package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.ninterbeds] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml index c79eec2b..710e2277 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml @@ -284,6 +284,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -300,6 +301,7 @@ blocks: observation type(s) supported by the CSUB package. tagged: false direction: in + component: utl-obs dimensions: fields: ninterbeds: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json index 09317275..f01b73e3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json @@ -122,7 +122,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml index cb000ae5..6e74f857 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml @@ -114,6 +114,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml index 31a1234a..545b0fdc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml @@ -116,6 +116,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json index 8cdda593..312edb53 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json @@ -118,7 +118,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml index 20151227..4b8af02f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml @@ -110,6 +110,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml index e9fba3b8..92a7ba05 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml @@ -115,6 +115,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json index 1b26d5ef..9fde056e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json @@ -85,7 +85,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -104,7 +105,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DRN package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DRN package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml index e90b79ab..63e14b08 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml @@ -80,6 +80,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -96,6 +97,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DRN package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DRN package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml index d84b4feb..6837c8a2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml @@ -92,6 +92,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -108,6 +109,7 @@ blocks: observation type(s) supported by the DRN package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the Drain Package can be used with the diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json index 68237405..90a78675 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json @@ -85,7 +85,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DRN package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DRN package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml index f408b95c..965b7c61 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml @@ -79,6 +79,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DRN package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DRN package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml index 158f90c2..740c3dd3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml @@ -96,6 +96,7 @@ blocks: observation type(s) supported by the DRN package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the Drain Package can be used with the diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json index f69bc3b6..e6fdd811 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json @@ -88,7 +88,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -107,7 +108,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the EVT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml index ebdee74b..d49a6b92 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml @@ -83,6 +83,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -99,6 +100,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the EVT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVT package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.surf_rate_specified] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml index 18fa77c6..e04828c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml @@ -88,6 +88,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -104,6 +105,7 @@ blocks: observation type(s) supported by the EVT package. tagged: false direction: in + component: utl-obs surf_rate_specified: type: keyword longname: specify proportion of evapotranspiration rate at ET surface diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json index 2ad7a45e..2181013a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json @@ -83,7 +83,8 @@ "longname": "file name of time series information", "description": "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the Time-Variable Input section for instructions on using the time-array series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tas" } } } @@ -102,7 +103,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the EVT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml index 7aa05798..45a8975e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml @@ -78,6 +78,7 @@ longname = "file name of time series information" description = "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the Time-Variable Input section for instructions on using the time-array series capability." tagged = false direction = "in" +component = "utl-tas" [blocks.options.fields.obs_filerecord] type = "record" @@ -94,6 +95,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the EVT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVT package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_netcdf] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml index 46d9ddb1..04e767cc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml @@ -88,6 +88,7 @@ blocks: using the time-array series capability. tagged: false direction: in + component: utl-tas obs_filerecord: type: record optional: true @@ -104,6 +105,7 @@ blocks: observation type(s) supported by the EVT package. tagged: false direction: in + component: utl-obs export_array_netcdf: type: keyword longname: export array variables to netcdf output files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json index 53f63a6e..e22fa3ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the GHB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the GHB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml index 627eadae..40ae8f27 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the GHB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the GHB package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml index 7a4baf73..d737a43c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the GHB package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the General-Head Boundary Package can be diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json index eb6f8959..99d8f215 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json @@ -79,7 +79,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the GHB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the GHB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml index 4219d0c4..4ff8836c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml @@ -73,6 +73,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the GHB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the GHB package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml index d54f781b..d7776b73 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml @@ -84,6 +84,7 @@ blocks: observation type(s) supported by the GHB package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the General-Head Boundary Package can be diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json index 3977ad33..9db29c86 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json @@ -2,7 +2,10 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "gwf-gnc", - "parent": "gwf-nam", + "parent": [ + "exg-gwfgwf", + "gwf-nam" + ], "dims": { "numgnc": { "value": "numgnc" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml index 6fbaa854..d6be8392 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml @@ -1,7 +1,10 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-gnc" -parent = "gwf-nam" +parent = [ + "exg-gwfgwf", + "gwf-nam", +] [dims.numgnc] value = "numgnc" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml index 7a25dbe5..e8c46f4e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml @@ -1,7 +1,9 @@ type: package schema_version: 2.0.0.dev3 name: gwf-gnc -parent: gwf-nam +parent: + - exg-gwfgwf + - gwf-nam dims: numgnc: value: numgnc diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json index 3f6081bd..aa38753a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json @@ -149,7 +149,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -168,7 +169,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the LAK package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LAK package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, @@ -385,7 +387,8 @@ "longname": "table file name", "description": "character string that defines the path and filename for the file containing lake table data for the lake connection. The TAB6_FILENAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Instructions for creating the TAB6_FILENAME input file are provided in Lake Table Input File section.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-laktab" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml index fa8e4da3..6efb99e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml @@ -138,6 +138,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -154,6 +155,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the LAK package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LAK package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" @@ -353,6 +355,7 @@ longname = "table file name" description = "character string that defines the path and filename for the file containing lake table data for the lake connection. The TAB6_FILENAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Instructions for creating the TAB6_FILENAME input file are provided in Lake Table Input File section." tagged = false direction = "in" +component = "utl-laktab" [blocks.outlets.fields.outlets] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml index 26c80924..a0ebd137 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml @@ -139,6 +139,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -155,6 +156,7 @@ blocks: observation type(s) supported by the LAK package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the LAK Package can be used with the Water @@ -411,6 +413,7 @@ blocks: the TAB6_FILENAME input file are provided in Lake Table Input File section. tagged: false direction: in + component: utl-laktab shape: - ntables outlets: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json index acda86d9..861dd339 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json @@ -170,7 +170,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -189,7 +190,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the MAW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MAW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml index e390a945..dd84aca3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml @@ -159,6 +159,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -175,6 +176,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the MAW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MAW package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml index a41d2dff..6cce928c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml @@ -181,6 +181,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -197,6 +198,7 @@ blocks: observation type(s) supported by the MAW package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the MAW Package can be used with the Water diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json index e08ea3ab..1a50e9aa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json @@ -2,7 +2,10 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "gwf-mvr", - "parent": "gwf-nam", + "parent": [ + "exg-gwfgwf", + "gwf-nam" + ], "dims": { "maxmvr": { "value": "maxmvr" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml index 6c126bf5..ad6f1e02 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml @@ -1,7 +1,10 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-mvr" -parent = "gwf-nam" +parent = [ + "exg-gwfgwf", + "gwf-nam", +] [dims.maxmvr] value = "maxmvr" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml index eceffc43..fb098234 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml @@ -1,7 +1,9 @@ type: package schema_version: 2.0.0.dev3 name: gwf-mvr -parent: gwf-nam +parent: + - exg-gwfgwf + - gwf-nam dims: maxmvr: value: maxmvr diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json index 395aab7e..ef5f1d48 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json @@ -133,11 +133,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml index 0f02598d..025d9047 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml @@ -117,11 +117,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml index fe9e0432..e5d15186 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml @@ -120,12 +120,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json index 1be50c63..7502e972 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json @@ -157,7 +157,8 @@ "longname": "file name of TVK information", "description": "defines a time-varying hydraulic conductivity (TVK) input file. Records in the TVK file can be used to change hydraulic conductivity properties at specified times or stress periods.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tvk" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml index 314d32a8..daee5cb2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml @@ -147,6 +147,7 @@ longname = "file name of TVK information" description = "defines a time-varying hydraulic conductivity (TVK) input file. Records in the TVK file can be used to change hydraulic conductivity properties at specified times or stress periods." tagged = false direction = "in" +component = "utl-tvk" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml index c598f3f4..b22f2b3f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml @@ -194,6 +194,7 @@ blocks: periods. tagged: false direction: in + component: utl-tvk export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json index 101cab77..b157e106 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json @@ -85,7 +85,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -104,7 +105,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the RCH package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RCH package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml index dc9dee19..8f1915ae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml @@ -80,6 +80,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -96,6 +97,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the RCH package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RCH package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml index 16de7b8c..f919d87c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml @@ -86,6 +86,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -102,6 +103,7 @@ blocks: observation type(s) supported by the RCH package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json index 89d2463e..a487bb87 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json @@ -83,7 +83,8 @@ "longname": "file name of time series information", "description": "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-array series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tas" } } } @@ -102,7 +103,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the RCH package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RCH package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml index 6df36b82..3f7936fb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml @@ -78,6 +78,7 @@ longname = "file name of time series information" description = "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-array series capability." tagged = false direction = "in" +component = "utl-tas" [blocks.options.fields.obs_filerecord] type = "record" @@ -94,6 +95,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the RCH package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RCH package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_netcdf] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml index defd0fc0..c6df8692 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml @@ -88,6 +88,7 @@ blocks: on using the time-array series capability. tagged: false direction: in + component: utl-tas obs_filerecord: type: record optional: true @@ -104,6 +105,7 @@ blocks: observation type(s) supported by the RCH package. tagged: false direction: in + component: utl-obs export_array_netcdf: type: keyword longname: export array variables to netcdf output files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json index 8310df80..51741992 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the RIV package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RIV package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml index d712e200..80a67eb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the RIV package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RIV package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml index 3356fafb..2aff6dd2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml @@ -79,6 +79,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -95,6 +96,7 @@ blocks: observation type(s) supported by the RIV package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the River Package can be used with the diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json index 209bb39e..67cdc031 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json @@ -79,7 +79,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the RIV package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RIV package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml index a38444d8..47218b6b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml @@ -73,6 +73,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the RIV package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the RIV package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml index a278a713..9b86996f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml @@ -83,6 +83,7 @@ blocks: observation type(s) supported by the RIV package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the River Package can be used with the diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json index dd04f481..e2e923a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json @@ -151,7 +151,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -170,7 +171,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the SFR package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFR package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, @@ -377,7 +379,8 @@ "longname": "table file name", "description": "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-sfrtab" } } } @@ -599,7 +602,8 @@ "longname": "table file name", "description": "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-sfrtab" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml index e38c4e28..42605e1a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml @@ -138,6 +138,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -154,6 +155,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the SFR package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFR package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" @@ -346,6 +348,7 @@ longname = "table file name" description = "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section." tagged = false direction = "in" +component = "utl-sfrtab" [blocks.connectiondata.fields.connectiondata] type = "list" @@ -542,6 +545,7 @@ longname = "table file name" description = "character string that defines the path and filename for the file containing cross-section table data for the reach. The TAB6_FILENAME file includes the number of entries in the file and the station elevation data in terms of the fractional width and the reach depth. Instructions for creating the TAB6_FILENAME input file are provided in SFR Reach Cross-Section Table Input File section." tagged = false direction = "in" +component = "utl-sfrtab" [blocks.period.fields.perioddata.item.fields.sfrsetting.arms.auxiliaryrecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml index 23a595de..731a41cf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml @@ -143,6 +143,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -159,6 +160,7 @@ blocks: observation type(s) supported by the SFR package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the SFR Package can be used with the Water @@ -396,6 +398,7 @@ blocks: SFR Reach Cross-Section Table Input File section. tagged: false direction: in + component: utl-sfrtab connectiondata: fields: connectiondata: @@ -675,6 +678,7 @@ blocks: are provided in SFR Reach Cross-Section Table Input File section. tagged: false direction: in + component: utl-sfrtab auxiliaryrecord: type: record fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json index c463e2b3..d10365ef 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json @@ -43,7 +43,8 @@ "longname": "file name of TVS information", "description": "defines a time-varying storage (TVS) input file. Records in the TVS file can be used to change specific storage and specific yield properties at specified times or stress periods.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tvs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml index 4b3cbe25..9db1fedb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml @@ -39,6 +39,7 @@ longname = "file name of TVS information" description = "defines a time-varying storage (TVS) input file. Records in the TVS file can be used to change specific storage and specific yield properties at specified times or stress periods." tagged = false direction = "in" +component = "utl-tvs" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml index 299e69b1..8f492bf0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml @@ -46,6 +46,7 @@ blocks: periods. tagged: false direction: in + component: utl-tvs export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json index 22014606..68d44a73 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json @@ -146,7 +146,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -165,7 +166,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the UZF package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZF package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml index 5e924117..2fae01aa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml @@ -135,6 +135,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -151,6 +152,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the UZF package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZF package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml index 0ee126af..17052735 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml @@ -135,6 +135,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -151,6 +152,7 @@ blocks: observation type(s) supported by the UZF package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the UZF Package can be used with the Water diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json index f8c8d26b..a45195a6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json @@ -109,7 +109,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -128,7 +129,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the WEL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the WEL package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml index 19852248..c9b4fe2d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml @@ -102,6 +102,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -118,6 +119,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the WEL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the WEL package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml index 0c5f9d47..6c4d0b32 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml @@ -119,6 +119,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -135,6 +136,7 @@ blocks: observation type(s) supported by the WEL package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the Well Package can be used with the Water diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json index 21af99f4..bb7de570 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json @@ -109,7 +109,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the WEL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the WEL package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml index 97dd66ed..c05e97ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml @@ -101,6 +101,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the WEL package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the WEL package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml index d7d0f584..ba4481f6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml @@ -123,6 +123,7 @@ blocks: observation type(s) supported by the WEL package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the Well Package can be used with the Water diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json index 6b731855..3a8f617d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json @@ -49,7 +49,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the api boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the api boundary package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml index 007e880b..416c6e4e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml @@ -45,6 +45,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the api boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the api boundary package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.mover] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml index 7f4655cf..5b9fdf58 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml @@ -50,6 +50,7 @@ blocks: {#2} lists observation type(s) supported by the api boundary package. tagged: false direction: in + component: utl-obs mover: type: keyword description: keyword to indicate that this instance of the api boundary Package can be used with diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json index 79a6449c..5990d9b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CNC package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CNC package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml index cc6e18af..9eddc548 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CNC package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CNC package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml index eacbf255..435660ac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the CNC package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json index 7d1aa2ad..5c0b1367 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json @@ -122,7 +122,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml index e12156a6..294446f9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml @@ -114,6 +114,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml index fbf94636..4cc18590 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml @@ -116,6 +116,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json index 493c3ceb..ebb5092c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json @@ -118,7 +118,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml index 1a62e2f9..92b328ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml @@ -110,6 +110,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml index ce28d9d6..ca8cc40f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml @@ -115,6 +115,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json index 420ca32b..ff10ec40 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json @@ -136,7 +136,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -155,7 +156,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the LKT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LKT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml index b6552cfa..3e92c6c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml @@ -125,6 +125,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -141,6 +142,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the LKT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the LKT package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml index dc06a852..bb487287 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml @@ -135,6 +135,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -151,6 +152,7 @@ blocks: observation type(s) supported by the LKT package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.json index af2c826f..d035ab71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.json @@ -2,7 +2,10 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "gwt-mvt", - "parent": "gwt-nam", + "parent": [ + "exg-gwtgwt", + "gwt-nam" + ], "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.toml index 701f016c..5bbe6ffd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.toml @@ -1,7 +1,10 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-mvt" -parent = "gwt-nam" +parent = [ + "exg-gwtgwt", + "gwt-nam", +] [blocks.options.fields.print_input] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.yaml index 1c5743c1..b1a1a9cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.yaml @@ -1,7 +1,9 @@ type: package schema_version: 2.0.0.dev3 name: gwt-mvt -parent: gwt-nam +parent: + - exg-gwtgwt + - gwt-nam blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json index d1b0404d..77c9a58c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json @@ -136,7 +136,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -155,7 +156,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the MWT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MWT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml index e38c3a9a..40b23084 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml @@ -125,6 +125,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -141,6 +142,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the MWT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the MWT package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml index ccc364ea..a57b4699 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml @@ -135,6 +135,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -151,6 +152,7 @@ blocks: observation type(s) supported by the MWT package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json index ab552be3..6c0b3065 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json @@ -120,11 +120,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml index 663a0d17..f3985824 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml @@ -106,11 +106,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml index 5f13f2f4..68ab9e19 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml @@ -106,12 +106,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json index 292086db..97575f09 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json @@ -136,7 +136,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -155,7 +156,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the SFT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml index 22d95d2f..fc46caaf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml @@ -125,6 +125,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -141,6 +142,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the SFT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SFT package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml index 58bd4743..03b2e085 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml @@ -135,6 +135,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -151,6 +152,7 @@ blocks: observation type(s) supported by the SFT package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json index 94df617a..e0285d11 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the SRC package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SRC package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml index a4300542..32e47b20 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the SRC package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the SRC package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.highest_saturated] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml index fbcaab01..94b0240b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the SRC package. tagged: false direction: in + component: utl-obs highest_saturated: type: keyword longname: apply source to highest saturated cell diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.json index c63c771f..7423c3b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.json @@ -76,7 +76,11 @@ "longname": "spc file name", "description": "character string that defines the path and filename for the file containing source and sink input data for the flow package. The SPC6_FILENAME file is a flexible input file that allows concentrations to be specified by stress period and with time series. Instructions for creating the SPC6_FILENAME input file are provided in the next section on file input for boundary concentrations.", "tagged": false, - "direction": "in" + "direction": "in", + "component": [ + "utl-spc", + "utl-spca" + ] }, "mixed": { "type": "keyword", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.toml index 6123c0ce..c5ab9dd9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.toml @@ -67,6 +67,10 @@ longname = "spc file name" description = "character string that defines the path and filename for the file containing source and sink input data for the flow package. The SPC6_FILENAME file is a flexible input file that allows concentrations to be specified by stress period and with time series. Instructions for creating the SPC6_FILENAME input file are provided in the next section on file input for boundary concentrations." tagged = false direction = "in" +component = [ + "utl-spc", + "utl-spca", +] [blocks.fileinput.fields.fileinput.item.fields.mixed] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.yaml index bea5f8af..b7b980b5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.yaml @@ -92,6 +92,9 @@ blocks: on file input for boundary concentrations. tagged: false direction: in + component: + - utl-spc + - utl-spca mixed: type: keyword longname: mixed keyword diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json index 67ab2001..84138db0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json @@ -136,7 +136,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -155,7 +156,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the UZT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZT package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml index f6dca52f..d4f78827 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml @@ -125,6 +125,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -141,6 +142,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the UZT package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the UZT package." tagged = false direction = "in" +component = "utl-obs" [blocks.packagedata.fields.packagedata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml index 324fe59b..ed658832 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml @@ -136,6 +136,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -152,6 +153,7 @@ blocks: observation type(s) supported by the UZT package. tagged: false direction: in + component: utl-obs packagedata: fields: packagedata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json index 1bdf1362..6f5415ec 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json @@ -71,7 +71,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml index e39c1c8c..b14d9a80 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml @@ -65,6 +65,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CDB package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CDB package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml index 8f384690..6c32f4fe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml @@ -73,6 +73,7 @@ blocks: observation type(s) supported by the CDB package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json index fa6eed38..d3829d65 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml index f995bf98..75082878 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the CHD package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the CHD package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml index b0f194fa..280723d1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the CHD package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json index 09283454..9ebb4046 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json @@ -61,7 +61,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml index b563400b..0a364358 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml @@ -57,6 +57,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml index 229c6fe0..f5af52e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml @@ -75,6 +75,7 @@ blocks: observation type(s) supported by the DFW package. tagged: false direction: in + component: utl-obs export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json index f1fe9701..36358286 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the EVP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml index dcc40d62..2b27021c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the EVP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the EVP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml index d29bd955..cfdbd6c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the EVP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json index 6e556666..9069d630 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the FLW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the FLW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml index c1560fba..6db086f7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the FLW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the FLW package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml index 5d1a3167..a8c6e69f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml @@ -79,6 +79,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -95,6 +96,7 @@ blocks: observation type(s) supported by the FLW package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json index 2e6ffd9a..5418002a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json @@ -76,11 +76,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml index e6d6eb56..6b5f73b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml @@ -66,11 +66,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml index d74f8a1c..ff0ee5e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml @@ -74,12 +74,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json index 76faf24b..0f8f5744 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the PCP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the PCP package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml index 48acee82..817dd642 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the PCP package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the PCP package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml index 0b6f7776..dfdedac6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: observation type(s) supported by the PCP package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json index 33be1832..49b53dc6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json @@ -73,7 +73,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -92,7 +93,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the ZDG package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ZDG package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml index c8324431..b2c460f7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml @@ -68,6 +68,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -84,6 +85,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the ZDG package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the ZDG package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml index 5debb135..ecbbcfdd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml @@ -75,6 +75,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -91,6 +92,7 @@ blocks: observation type(s) supported by the ZDG package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json index 4fc878ba..c74c9c27 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json @@ -122,7 +122,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml index 5542b17b..287466ea 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml @@ -114,6 +114,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml index 6f54778e..69fcaf3b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml @@ -116,6 +116,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json index 0329961a..de4c8ca4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json @@ -118,7 +118,8 @@ "longname": "file name of NCF information", "description": "defines a NetCDF configuration (NCF) input file.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ncf" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml index da41e48b..4bc96244 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml @@ -110,6 +110,7 @@ longname = "file name of NCF information" description = "defines a NetCDF configuration (NCF) input file." tagged = false direction = "in" +component = "utl-ncf" [blocks.dimensions.fields.nlay] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml index b06ea315..70fb7dfb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml @@ -114,6 +114,7 @@ blocks: description: defines a NetCDF configuration (NCF) input file. tagged: false direction: in + component: utl-ncf dimensions: fields: nlay: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json index 4afc90c9..c796e061 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json @@ -55,11 +55,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml index 58ffddf6..14a5d310 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml @@ -47,11 +47,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml index 691e5e2b..3f0f75cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml @@ -53,12 +53,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.json index 3a0b60e9..b2193633 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.json @@ -56,7 +56,8 @@ "longname": "file name of time series information", "description": "name of input file to define HPC file settings for the HPC package. See the 'HPC File' section for instructions for preparing HPC input files.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-hpc" } } } @@ -65,11 +66,12 @@ "timing": { "fields": { "tdis6": { - "type": "string", + "type": "file", "longname": "name of tdis input file", "description": "is the name of the Temporal Discretization (TDIS) Input File.", - "optional": true, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "sim-tdis" } } }, @@ -91,11 +93,14 @@ "tagged": false }, "mfname": { - "type": "string", + "type": "file", "longname": "file name for model name file", "description": "is the file name of the model name file.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "model", + "component_ref": "mtype" }, "mname": { "type": "string", @@ -126,11 +131,14 @@ "tagged": false }, "exgfile": { - "type": "string", + "type": "file", "longname": "input file for exchange", "description": "is the input file for the exchange.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "exchange", + "component_ref": "exgtype" }, "exgmnamea": { "type": "string", @@ -176,11 +184,14 @@ ] }, "slnfname": { - "type": "string", + "type": "file", "longname": "file name for solution input", "description": "name of file containing solution input.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "solution", + "component_ref": "slntype" }, "slnmnames": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.toml index dd6e6361..a61cf8ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.toml @@ -54,13 +54,15 @@ longname = "file name of time series information" description = "name of input file to define HPC file settings for the HPC package. See the 'HPC File' section for instructions for preparing HPC input files." tagged = false direction = "in" +component = "utl-hpc" [blocks.timing.fields.tdis6] -type = "string" +type = "file" longname = "name of tdis input file" description = "is the name of the Temporal Discretization (TDIS) Input File." -optional = true -case_sensitive = true +direction = "in" +mode_keyword = false +component = "sim-tdis" [blocks.models.fields.models] type = "list" @@ -79,11 +81,14 @@ description = "is the type of model to add to simulation." tagged = false [blocks.models.fields.models.item.fields.mfname] -type = "string" +type = "file" longname = "file name for model name file" description = "is the file name of the model name file." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "model" +component_ref = "mtype" [blocks.models.fields.models.item.fields.mname] type = "string" @@ -108,11 +113,14 @@ description = "is the exchange type." tagged = false [blocks.exchanges.fields.exchanges.item.fields.exgfile] -type = "string" +type = "file" longname = "input file for exchange" description = "is the input file for the exchange." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "exchange" +component_ref = "exgtype" [blocks.exchanges.fields.exchanges.item.fields.exgmnamea] type = "string" @@ -152,11 +160,14 @@ valid = [ ] [blocks.solutiongroup.fields.solutiongroup.item.fields.slnfname] -type = "string" +type = "file" longname = "file name for solution input" description = "name of file containing solution input." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "solution" +component_ref = "slntype" [blocks.solutiongroup.fields.solutiongroup.item.fields.slnmnames] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.yaml index bb3b80f6..20f62b60 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.yaml @@ -61,14 +61,16 @@ blocks: File' section for instructions for preparing HPC input files. tagged: false direction: in + component: utl-hpc timing: fields: tdis6: - type: string + type: file longname: name of tdis input file description: is the name of the Temporal Discretization (TDIS) Input File. - optional: true - case_sensitive: true + direction: in + mode_keyword: false + component: sim-tdis models: fields: models: @@ -86,11 +88,14 @@ blocks: description: is the type of model to add to simulation. tagged: false mfname: - type: string + type: file longname: file name for model name file description: is the file name of the model name file. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: model + component_ref: mtype mname: type: string longname: name of model @@ -115,11 +120,14 @@ blocks: description: is the exchange type. tagged: false exgfile: - type: string + type: file longname: input file for exchange description: is the input file for the exchange. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: exchange + component_ref: exgtype exgmnamea: type: string longname: name of model A @@ -156,11 +164,14 @@ blocks: - ims6 - ems6 slnfname: - type: string + type: file longname: file name for solution input description: name of file containing solution input. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: solution + component_ref: slntype slnmnames: type: array longname: array of model names in this solution diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.json index bc0faec6..f233bdec 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.json @@ -38,7 +38,8 @@ "longname": "file name of adaptive time series information", "description": "defines an adaptive time step (ATS) input file defining ATS controls. Records in the ATS file can be used to override the time step behavior for selected stress periods.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ats" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.toml index be31dce7..b6977dbb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.toml @@ -34,6 +34,7 @@ longname = "file name of adaptive time series information" description = "defines an adaptive time step (ATS) input file defining ATS controls. Records in the ATS file can be used to override the time step behavior for selected stress periods." tagged = false direction = "in" +component = "utl-ats" [blocks.dimensions.fields.nper] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.yaml index 5fe2b088..348dc47e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.yaml @@ -39,6 +39,7 @@ blocks: in the ATS file can be used to override the time step behavior for selected stress periods. tagged: false direction: in + component: utl-ats dimensions: fields: nper: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json index 7c13bf74..75deeccd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json @@ -71,7 +71,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the Zero-Depth-Gradient Boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Zero-Depth-Gradient Boundary package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml index c241f76e..b1853f63 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml @@ -65,6 +65,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the Zero-Depth-Gradient Boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Zero-Depth-Gradient Boundary package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml index 8d30f969..51becdf8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml @@ -74,6 +74,7 @@ blocks: package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json index fb49dd36..77f51281 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the constant-head package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the constant-head package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml index a6ad1a74..f3043a30 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the constant-head package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the constant-head package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml index 1f30d415..c7d7dd74 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: Table {#2} lists observation type(s) supported by the constant-head package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json index 816969fb..42ab8671 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json @@ -61,7 +61,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } }, diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml index c677c5c0..f473237d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml @@ -57,6 +57,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the DFW package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the DFW package." tagged = false direction = "in" +component = "utl-obs" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml index b182114d..d841a7ca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml @@ -75,6 +75,7 @@ blocks: observation type(s) supported by the DFW package. tagged: false direction: in + component: utl-obs export_array_ascii: type: keyword longname: export array variables to layered ascii files. diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json index 67bfc9b5..0b339031 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the Evaporation package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Evaporation package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml index f24eced6..0c5fab8b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the Evaporation package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Evaporation package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml index a2eae394..ea04147d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: {#2} lists observation type(s) supported by the Evaporation package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json index 06361262..157668bc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the inflow package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the inflow package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml index 4f239cda..42e0d932 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the inflow package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the inflow package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml index be7e6088..2767b173 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml @@ -79,6 +79,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -95,6 +96,7 @@ blocks: observation type(s) supported by the inflow package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json index c1e1dd05..ec005df7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json @@ -76,11 +76,14 @@ "tagged": false }, "fname": { - "type": "string", + "type": "file", "longname": "file name", "description": "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run.", "tagged": false, - "case_sensitive": true + "direction": "in", + "mode_keyword": false, + "component": "package", + "component_ref": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml index acb99fa5..4154a24f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml @@ -66,11 +66,14 @@ description = "is the file type, which must be one of the following character va tagged = false [blocks.packages.fields.packages.item.fields.fname] -type = "string" +type = "file" longname = "file name" description = "is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run." tagged = false -case_sensitive = true +direction = "in" +mode_keyword = false +component = "package" +component_ref = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml index 9c551528..bf74204e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml @@ -74,12 +74,15 @@ blocks: lowercase. tagged: false fname: - type: string + type: file longname: file name description: is the name of the file containing the package input. The path to the file should be included if the file is not located in the folder where the program was run. tagged: false - case_sensitive: true + direction: in + mode_keyword: false + component: package + component_ref: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json index 2176abca..de374185 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json @@ -79,7 +79,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -98,7 +99,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the Precipitation package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Precipitation package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml index 686eea92..4a5b3c59 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml @@ -74,6 +74,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -90,6 +91,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the Precipitation package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Precipitation package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml index f012c4c2..1bbf4813 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml @@ -80,6 +80,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -96,6 +97,7 @@ blocks: Table {#2} lists observation type(s) supported by the Precipitation package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json index 2c49602b..f568a08a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json @@ -73,7 +73,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } @@ -92,7 +93,8 @@ "longname": "obs6 input filename", "description": "name of input file to define observations for the Zero-Depth-Gradient Boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Zero-Depth-Gradient Boundary package.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-obs" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml index 7a433e92..5db0ee9b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml @@ -68,6 +68,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.options.fields.obs_filerecord] type = "record" @@ -84,6 +85,7 @@ longname = "obs6 input filename" description = "name of input file to define observations for the Zero-Depth-Gradient Boundary package. See the 'Observation utility' section for instructions for preparing observation input files. Table {#2} lists observation type(s) supported by the Zero-Depth-Gradient Boundary package." tagged = false direction = "in" +component = "utl-obs" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml index 715bf4c5..c4c7f20c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml @@ -75,6 +75,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts obs_filerecord: type: record optional: true @@ -92,6 +93,7 @@ blocks: package. tagged: false direction: in + component: utl-obs dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json index e2aadb88..06291f5c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-ats", - "parent": "sim-nam", + "parent": "sim-tdis", "subtype": "utility", "dims": { "maxats": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml index 7ee28fac..b7d63c54 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-ats" -parent = "sim-nam" +parent = "sim-tdis" subtype = "utility" [dims.maxats] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml index 4a201293..645fb07e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-ats -parent: sim-nam +parent: sim-tdis subtype: utility dims: maxats: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json index 1569c037..e908280c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-laktab", - "parent": "sim-nam", + "parent": "gwf-lak", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml index 2e4a7447..013c5b09 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-laktab" -parent = "sim-nam" +parent = "gwf-lak" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml index 06ea96c8..b71cc3cb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-laktab -parent: sim-nam +parent: gwf-lak multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json index 5eb62390..b3cd541e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-ncf", - "parent": "sim-nam", + "parent": "package", "subtype": "utility", "dims": { "ncpl": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml index 9c3a0eb2..c969432b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-ncf" -parent = "sim-nam" +parent = "package" subtype = "utility" [dims.ncpl] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml index 8c73fcee..aac8f139 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-ncf -parent: sim-nam +parent: package subtype: utility dims: ncpl: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json index 46fa53b3..52457429 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-obs", - "parent": "sim-nam", + "parent": "package", "multi": true, "subtype": "utility", "blocks": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml index a71d2a78..e84a2688 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-obs" -parent = "sim-nam" +parent = "package" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml index 4cd0328c..1935cdbb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-obs -parent: sim-nam +parent: package multi: true subtype: utility blocks: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json index e30c3e55..504ce689 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-sfrtab", - "parent": "sim-nam", + "parent": "gwf-sfr", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml index 311179c9..1a023556 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-sfrtab" -parent = "sim-nam" +parent = "gwf-sfr" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml index fe14a7cd..8ae89a60 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-sfrtab -parent: sim-nam +parent: gwf-sfr multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json index 6827f3ad..6689d7c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-spc", - "parent": "sim-nam", + "parent": "package", "multi": true, "subtype": "utility", "dims": { @@ -35,7 +35,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml index c55a50f4..06ffb3f6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-spc" -parent = "sim-nam" +parent = "package" multi = true subtype = "utility" @@ -32,6 +32,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.dimensions.fields.maxbound] type = "integer" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml index 55084ead..3a254841 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-spc -parent: sim-nam +parent: package multi: true subtype: utility dims: @@ -34,6 +34,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts dimensions: fields: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json index 720a03de..de83d56b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json @@ -36,7 +36,8 @@ "longname": "file name of time series information", "description": "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the Time-Variable Input section for instructions on using the time-array series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-tas" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml index c0fb6528..5a4f8c45 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml @@ -35,6 +35,7 @@ longname = "file name of time series information" description = "defines a time-array-series file defining a time-array series that can be used to assign time-varying values. See the Time-Variable Input section for instructions on using the time-array series capability." tagged = false direction = "in" +component = "utl-tas" [blocks.period.fields.concentration] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml index 05445f28..19ee9bb6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml @@ -40,6 +40,7 @@ blocks: using the time-array series capability. tagged: false direction: in + component: utl-tas period: fields: concentration: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.json index e71ffa1c..13cc1a3a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-ts", - "parent": "sim-nam", + "parent": "package", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.toml index 4c2a07fc..ed4b1c8c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-ts" -parent = "sim-nam" +parent = "package" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.yaml index 587d91fe..36985940 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-ts -parent: sim-nam +parent: package multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json index 3224032d..57121072 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-tvk", - "parent": "package", + "parent": "gwf-npf", "subtype": "utility", "blocks": { "options": { @@ -29,7 +29,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml index 93fe7fa9..0d053f72 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-tvk" -parent = "package" +parent = "gwf-npf" subtype = "utility" [blocks.options.fields.print_input] @@ -28,6 +28,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.period.fields.perioddata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml index 36681255..4592f56a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-tvk -parent: package +parent: gwf-npf subtype: utility blocks: options: @@ -30,6 +30,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts period: fields: perioddata: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json index 9436e9c4..946dd958 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json @@ -2,7 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-tvs", - "parent": "package", + "parent": "gwf-sto", "subtype": "utility", "blocks": { "options": { @@ -35,7 +35,8 @@ "longname": "file name of time series information", "description": "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability.", "tagged": false, - "direction": "in" + "direction": "in", + "component": "utl-ts" } } } diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml index 08203327..836a0702 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml @@ -1,7 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-tvs" -parent = "package" +parent = "gwf-sto" subtype = "utility" [blocks.options.fields.disable_storage_change_integration] @@ -34,6 +34,7 @@ longname = "file name of time series information" description = "defines a time-series file defining time series that can be used to assign time-varying values. See the 'Time-Variable Input' section for instructions on using the time-series capability." tagged = false direction = "in" +component = "utl-ts" [blocks.period.fields.perioddata] type = "list" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml index 1df698dd..5a7b11ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml @@ -1,7 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-tvs -parent: package +parent: gwf-sto subtype: utility blocks: options: @@ -38,6 +38,7 @@ blocks: time-series capability. tagged: false direction: in + component: utl-ts period: fields: perioddata: diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index f19eab36..68b436d9 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -406,3 +406,159 @@ def test_migrate_keyword_aliases(dfn_dir): component = _migrate_dev3(dfn_dir, "utl-ts") record = component.blocks["attributes"].fields["time_series_namerecord"] assert record.fields["names"].aliases == ["name"] + + +# --- component links (File.component) and the parents derived from them --- + + +@pytest.fixture(scope="module") +def linked_spec(dfn_dir): + return v2.Dfns.load(dfn_dir) + + +def _linked_files(component, record: str) -> list: + """The input Files under the field named ``record``, anywhere.""" + found = [ + f + for f in component.get_fields(recurse=True).values(multi=True) + if f.name == record or getattr(getattr(f, "item", None), "name", None) == record + ] + assert found, f"{component.name} has no {record!r}" + return [ + file for f in found for file, _ in v2._iter_files({f.name: f}) if file.direction == "in" + ] + + +def _components(component, record: str) -> list: + return [f.component for f in _linked_files(component, record)] + + +@pytest.mark.parametrize( + "name", [f"{m}-{d}" for m in ("gwf", "gwt", "gwe", "prt") for d in ("dis", "disv")] +) +def test_migrate_links_ncf(linked_spec, name): + assert _components(linked_spec.components[name], "ncf_filerecord") == ["utl-ncf"] + + +def test_migrate_links_ts_and_obs_everywhere(linked_spec): + for name, c in linked_spec.components.items(): + fields = c.get_fields(recurse=True) + for record, target in (("ts_filerecord", "utl-ts"), ("obs_filerecord", "utl-obs")): + if record in fields: + assert set(_components(c, record)) == {target}, name + + +@pytest.mark.parametrize( + "name, record, target", + [ + ("gwf-npf", "tvk_filerecord", "utl-tvk"), + ("gwf-sto", "tvs_filerecord", "utl-tvs"), + ("sim-tdis", "ats_filerecord", "utl-ats"), + ("sim-nam", "hpc_filerecord", "utl-hpc"), + ("gwt-ssm", "fileinput", ["utl-spc", "utl-spca"]), + ("gwe-ssm", "fileinput", ["utl-spc", "utl-spca"]), + ("gwf-lak", "tables", "utl-laktab"), + ], +) +def test_migrate_links_subpackage(linked_spec, name, record, target): + assert _components(linked_spec.components[name], record) == [target] + + +def test_migrate_links_sfr_tables(linked_spec): + files = [ + f + for f in linked_spec.components["gwf-sfr"].get_fields(recurse=True).values(multi=True) + if isinstance(f, v2.File) and f.name == "tab6_filename" + ] + assert len(files) == 2 + assert {f.component for f in files} == {"utl-sfrtab"} + + +@pytest.mark.parametrize( + "field, selector, component_ref", + [ + ("tdis6", "sim-tdis", None), + ("mfname", "model", "mtype"), + ("exgfile", "exchange", "exgtype"), + ("slnfname", "solution", "slntype"), + ], +) +def test_migrate_links_sim_nam(linked_spec, field, selector, component_ref): + file = linked_spec.components["sim-nam"].get_fields(recurse=True)[field] + assert isinstance(file, v2.File) + assert (file.component, file.component_ref) == (selector, component_ref) + assert file.direction == "in" and not file.mode_keyword + assert not file.optional + + +def test_migrate_tdis6_renders_without_filein(linked_spec): + timing = linked_spec.components["sim-nam"].blocks["timing"] + assert "TDIS6 " in timing.fields["tdis6"].render() + + +def test_migrate_links_model_packages(linked_spec): + models = [c for c in linked_spec.components.values() if isinstance(c, v2.Model)] + assert models + for model in models: + file = model.get_fields(recurse=True)["fname"] + assert (file.component, file.component_ref) == ("package", "ftype"), model.name + + +def test_migrate_link_selectors_resolve(linked_spec): + for name, c in linked_spec.components.items(): + children = linked_spec.children(name) + for block in (c.blocks or {}).values(): + for file, _ in v2._iter_files(block.fields): + if file.component is None: + continue + targets = [n for n, t in children.items() if v2.admits(file.component, t)] + assert targets, (name, file.name) + if file.component_ref is None: + assert len({linked_spec.ftype(t) for t in targets}) == 1, (name, file.name) + + +def test_migrate_model_packages_exclude_utilities(linked_spec): + children = linked_spec.children("gwf-nam") + assert {"gwf-dis", "gwf-gnc", "gwf-mvr"} <= set(children) + assert not any(n.startswith("utl-") for n in children) + + +def test_migrate_unlinked_files(linked_spec): + """Output files (grb_filerecord, ...) and NetCDF input aren't links.""" + netcdf = {"nc_filerecord", "nc_mesh2d_filerecord", "nc_structured_filerecord"} + for name, c in linked_spec.components.items(): + for field in c.get_fields(recurse=True).values(multi=True): + for file, _ in v2._iter_files({field.name: field}): + if file.direction == "out" or field.name in netcdf: + assert file.component is None, (name, file.name) + + +@pytest.mark.parametrize( + "name, parent", + [ + ("utl-ts", "package"), + ("utl-obs", "package"), + ("utl-ncf", "package"), + ("utl-spc", "package"), + ("utl-spca", "package"), + ("utl-tas", "package"), + ("utl-tvk", "gwf-npf"), + ("utl-tvs", "gwf-sto"), + ("utl-sfrtab", "gwf-sfr"), + ("utl-laktab", "gwf-lak"), + ("utl-ats", "sim-tdis"), + ("utl-hpc", "sim-nam"), + ("gwf-gnc", ["exg-gwfgwf", "gwf-nam"]), + ("gwf-mvr", ["exg-gwfgwf", "gwf-nam"]), + ("gwt-mvt", ["exg-gwtgwt", "gwt-nam"]), + ("gwe-mve", ["exg-gwegwe", "gwe-nam"]), + ("sim-tdis", "sim-nam"), + ], +) +def test_migrate_derives_parents_from_links(linked_spec, name, parent): + assert linked_spec.components[name].parent == parent + + +def test_migrate_subpackage_keeps_model_dims(linked_spec): + # tvk's parent is now gwf-npf, not `package`; it must still see grid dims + assert {"nodes", "nlay"} <= linked_spec.inherited_dims("utl-tvk") diff --git a/modflow_devtools/dfns/migrate.py b/modflow_devtools/dfns/migrate.py index a4c61d5c..d33ce4b5 100644 --- a/modflow_devtools/dfns/migrate.py +++ b/modflow_devtools/dfns/migrate.py @@ -146,7 +146,7 @@ def migrate( ) elif schema_version == "2.0.0.dev2": from modflow_devtools.dfn import schema as v1 - from modflow_devtools.dfns.migrate_to_v2_0_0_dev2 import to_v2_0_0_dev2 + from modflow_devtools.dfns.migrate_to_v2_0_0_dev2 import migrate_corpus, to_v2_0_0_dev2 inpath = Path(inpath).expanduser().absolute() common_path = inpath / "common.dfn" @@ -156,13 +156,15 @@ def migrate( common, _ = v1.Dfn.load_dfn(f) # type: ignore[attr-defined] exclude = {"common", "flopy"} dfn_paths = [p for p in sorted(inpath.glob("*.dfn")) if p.stem not in exclude] + raw = {} for dfn_path in dfn_paths: with dfn_path.open() as f: - fields, meta = v1.Dfn.load_dfn(f, common=common) # type: ignore[attr-defined] - dfn = to_v2_0_0_dev2(name=dfn_path.stem, fields=fields, meta=meta) - _write(_scalars_first(_serialize_safe(dfn)), outdir / f"{dfn_path.stem}.{fmt}", fmt) + raw[dfn_path.stem] = v1.Dfn.load_dfn(f, common=common) # type: ignore[attr-defined] + for stem, dfn in migrate_corpus(raw, to_v2_0_0_dev2).items(): + _write(_scalars_first(_serialize_safe(dfn)), outdir / f"{stem}.{fmt}", fmt) elif schema_version == "2.0.0.dev3": from modflow_devtools.dfn import schema as v1 + from modflow_devtools.dfns.migrate_to_v2_0_0_dev2 import migrate_corpus from modflow_devtools.dfns.migrate_to_v2_0_0_dev3 import to_v2_0_0_dev3 inpath = Path(inpath).expanduser().absolute() @@ -173,11 +175,12 @@ def migrate( common, _ = v1.Dfn.load_dfn(f) # type: ignore[attr-defined] exclude = {"common", "flopy"} dfn_paths = [p for p in sorted(inpath.glob("*.dfn")) if p.stem not in exclude] + raw = {} for dfn_path in dfn_paths: with dfn_path.open() as f: - fields, meta = v1.Dfn.load_dfn(f, common=common) # type: ignore[attr-defined] - dfn = to_v2_0_0_dev3(name=dfn_path.stem, fields=fields, meta=meta) - _write(_scalars_first(_serialize_safe(dfn)), outdir / f"{dfn_path.stem}.{fmt}", fmt) + raw[dfn_path.stem] = v1.Dfn.load_dfn(f, common=common) # type: ignore[attr-defined] + for stem, dfn in migrate_corpus(raw, to_v2_0_0_dev3).items(): + _write(_scalars_first(_serialize_safe(dfn)), outdir / f"{stem}.{fmt}", fmt) else: raise ValueError( f"Unsupported schema version {schema_version}, supported " diff --git a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py index c909b849..7eac93b5 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -79,6 +79,31 @@ def try_parse_bool(v: Any, default: bool = False) -> bool: "prt": ["BUDGET"], } +# Subpackage links the `# flopy subpackage` keys miss, by the keyword leading +# the file record. mf6 loads SSM's `spc6` file as SPC or SPCA depending on the +# file's own READASARRAYS option, so it links the variant family. +_KEYWORD_LINKS: dict[tuple[str, str], str | list[str]] = { + ("gwf-sfr", "tab6"): "utl-sfrtab", + ("gwf-lak", "tab6"): "utl-laktab", + ("gwt-ssm", "spc6"): ["utl-spc", "utl-spca"], + ("gwe-ssm", "spc6"): ["utl-spc", "utl-spca"], +} + +# Name-file filename columns: (component, field) -> (selector, component_ref). +# `*-nam` means every model name file. +_NAMEFILE_LINKS: dict[tuple[str, str], tuple[str, str | None]] = { + ("sim-nam", "tdis6"): ("sim-tdis", None), + ("sim-nam", "mfname"): ("model", "mtype"), + ("sim-nam", "exgfile"): ("exchange", "exgtype"), + ("sim-nam", "slnfname"): ("solution", "slntype"), + ("*-nam", "fname"): ("package", "ftype"), +} + +# v1 marks these optional, but mf6 requires them. sim-nam's `tdis6`: "TIMING +# block variable TDIS6 is unset" (SimulationCreate.f90). Fixed upstream in +# sim-nam.dfn; drop the entry once the DFNs this migrates include the fix. +_V1_REQUIRED: frozenset[tuple[str, str]] = frozenset({("sim-nam", "tdis6")}) + def _scope_for( parent: "str | list[str] | None", @@ -566,6 +591,43 @@ def _fix_cellid_fields(name: str, blocks: dict[str, v2.Block]) -> dict[str, v2.B return {**blocks, block_name: new_block} +def _link_namefile_fields(name: str, blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: + """Turn a name file's filename columns (see `_NAMEFILE_LINKS`) from + Strings into input Files linking the components they name. Name-file + entries have no FILEIN keyword.""" + key = "*-nam" if name.endswith("-nam") and name != "sim-nam" else name + links = {f: link for (c, f), link in _NAMEFILE_LINKS.items() if c == key} + if not links: + return blocks + + def _link(field: Any) -> Any: + if isinstance(field, v2.String) and field.name in links: + selector, component_ref = links[field.name] + optional = field.optional and (name, field.name) not in _V1_REQUIRED + data = {k: getattr(field, k) for k in v2.InputFieldBase.model_fields} + return v2.File( + **{**data, "optional": optional}, + direction="in", + mode_keyword=False, + component=selector, + component_ref=component_ref, + ) + if isinstance(field, v2.Record): + return field.model_copy( + update={"fields": {n: _link(f) for n, f in field.fields.items()}} + ) + if isinstance(field, v2.List): + return field.model_copy(update={"item": _link(field.item)}) + return field + + return { + block_name: block.model_copy( + update={"fields": {n: _link(f) for n, f in block.fields.items()}} + ) + for block_name, block in blocks.items() + } + + def _mark_cellids(blocks: dict[str, v2.Block]) -> dict[str, v2.Block]: """Mark every cellid column `index=True, cellid=True`: an integer array in a list item whose first (fastest-varying) axis is `ncelldim`. Every v1 field @@ -1492,8 +1554,20 @@ def infer_parent(name: str, fields: OMD) -> str | None: return None -def to_v2_0_0_dev2(name: str, fields: OMD, meta: list[str]) -> v2.Component: - """Map a component definition from the raw v1 schema to 2.0.0.dev2.""" +def to_v2_0_0_dev2( + name: str, + fields: OMD, + meta: list[str], + subpackages: Mapping[str, str] | None = None, +) -> v2.Component: + """ + Map a component definition from the raw v1 schema to 2.0.0.dev2. + + ``subpackages`` maps a file record's name to the component its file is + input for (see `subpackage_keys`). Linked components' parents need the + whole corpus, so they are derived by `link_components`, not here. + """ + subpackages = subpackages or {} from modflow_devtools.dfn.migrate_to_v2_0_0_dev0 import ( is_advanced_package, @@ -1786,6 +1860,10 @@ def _lookup(rname: str) -> dict | None: None, ) + linked: str | list[str] | None = subpackages.get(_name) + for sname in subnames[:mode_idx]: + linked = linked or _KEYWORD_LINKS.get((name, sname)) + rec_fields: dict[str, v2.InputField] = {} for i, sname in enumerate(subnames): if i == mode_idx: @@ -1806,6 +1884,7 @@ def _lookup(rname: str) -> dict | None: deprecated=m.get("deprecated") or None, tagged=False, direction="in" if file_mode == "filein" else "out", + component=linked if file_mode == "filein" else None, ) continue m = _lookup(sname) @@ -1977,6 +2056,7 @@ def _lookup(rname: str) -> dict | None: blocks = _mark_cellids(blocks) blocks = _apply_fk_backfill(name, blocks) blocks = _apply_array_fk_backfill(name, blocks) + blocks = _link_namefile_fields(name, blocks) dims = {**explicit_dims, **array_dims, **derived_dims} or None d: dict[str, Any] = { @@ -2009,3 +2089,104 @@ def _lookup(rname: str) -> dict | None: is_stress_pkg = is_stress_package(name, meta) subtype = "advanced" if is_advanced else "stress" if is_stress_pkg else None return v2.Package(**d, subtype=subtype, multi=is_multi_package(meta)) + + +def subpackage_keys(metas: Mapping[str, list[str]]) -> dict[str, str]: + """ + Map each file record name a `# flopy subpackage ...` header line + declares to the component declaring it: any field named ```` holds + the name of one of its files (``ts_filerecord`` -> ``utl-ts``). + """ + keys: dict[str, str] = {} + for name, meta in metas.items(): + for line in meta: + parts = line.lstrip("#").split() + if parts[:2] == ["flopy", "subpackage"] and len(parts) > 2: + keys[parts[2]] = name + return keys + + +def _mf6_subpackages(meta: list[str]) -> list[str]: + """Components a `# mf6 subpackage ` header line names.""" + result = [] + for line in meta: + parts = line.lstrip("#").split() + if parts[:2] == ["mf6", "subpackage"] and len(parts) > 2: + result.append(parts[2]) + return result + + +def _links(component: v2.ComponentBase) -> list[str]: + """Concrete components this component's input files link.""" + return [ + t + for block in (component.blocks or {}).values() + for file, _ in v2._iter_files(block.fields) + for t in v2._parents_as_set(file.component) + ] + + +def link_components( + components: Mapping[str, v2.Component], metas: Mapping[str, list[str]] +) -> dict[str, v2.Component]: + """ + Corpus-wide link checks, then each linked component's parent derived from + the components that link to it (see `v2.covering_selector`). + + The links themselves are made per file, by `to_v2_0_0_dev2`. Only + concrete links count: a name file's type selectors (``model``, + ``package``, ...) pick among components whose parents are already known. + """ + links = {name: _links(c) for name, c in components.items()} + + for name, meta in metas.items(): + if name not in components: + continue + for target in _mf6_subpackages(meta): + if target in components and target not in links[name]: + raise ValueError(f"{name}: '# mf6 subpackage {target}' but no file links it") + for (name, keyword), selector in _KEYWORD_LINKS.items(): + selected = v2._parents_as_set(selector) + if name in components and not selected & set(links[name]): + raise ValueError(f"{name}: no {keyword!r} file record to link {selector!r}") + + linkers: dict[str, list[v2.ComponentBase]] = {} + for name, targets in links.items(): + for t in dict.fromkeys(targets): + if t in components: + linkers.setdefault(t, []).append(components[name]) + + result = dict(components) + for name, component in components.items(): + found = linkers.get(name, []) + if not name.startswith("utl-"): + # also listed in a name file (gwf-gnc, gwf-mvr, ...): keep that parent + if not found: + continue + found = [ + *(components[p] for p in v2._parents_as_set(component.parent) if p in components), + *found, + ] + elif not found: + raise ValueError(f"{name}: no component links this utility, so it has no parent") + parent = v2.covering_selector(found, components) + result[name] = component.model_copy(update={"parent": parent}) + return result + + +def migrate_corpus( + raw: Mapping[str, tuple[OMD, list[str]]], + convert: Callable[..., v2.Component] = to_v2_0_0_dev2, +) -> dict[str, v2.Component]: + """ + Migrate a whole corpus of v1 definitions, ``{name: (fields, meta)}``, + with ``convert`` (`to_v2_0_0_dev2`, or a later version's converter that + accepts ``subpackages``), then link the components to each other (see + `link_components`). + """ + metas = {name: meta for name, (_, meta) in raw.items()} + keys = subpackage_keys(metas) + components = { + name: convert(name, fields, meta, subpackages=keys) for name, (fields, meta) in raw.items() + } + return link_components(components, metas) diff --git a/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py b/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py index 991997e5..103c3704 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev3.py @@ -20,6 +20,7 @@ ``condsat``, ``area``) are hardcoded and override any entry with the same name. """ +from collections.abc import Mapping from typing import Literal from boltons.dictutils import OMD @@ -1317,11 +1318,17 @@ def _numerical_model_memory( # --------------------------------------------------------------------------- -def to_v2_0_0_dev3(name: str, fields: OMD, meta: list[str]) -> v2.Component: - """Map a component definition from the raw v1 schema to 2.0.0.dev3.""" +def to_v2_0_0_dev3( + name: str, + fields: OMD, + meta: list[str], + subpackages: Mapping[str, str] | None = None, +) -> v2.Component: + """Map a component definition from the raw v1 schema to 2.0.0.dev3. See + `to_v2_0_0_dev2` for ``subpackages``.""" # Step 1: run the dev2 migration to get blocks, dims, parent, subtype, etc. - component = to_v2_0_0_dev2(name, fields, meta) + component = to_v2_0_0_dev2(name, fields, meta, subpackages=subpackages) memory: dict[str, v2.MemoryScalar | v2.MemoryArray] = {} From 9592228c5f88b2ef461d5bbda193a59a313de4f2 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Sat, 3 Oct 2026 08:06:05 -0700 Subject: [PATCH 3/5] feat(dfns): declare each component's ftype token Name-file links resolve a token like DIS6 or GWF6-GWF6 to a component. That mapping was a naming-convention guess in the schema (Dfns.ftype); make it data instead: ComponentBase.ftype, set by the migration, with array-based variants sharing their base's token as mf6 does (InputLoadType.f90). Co-Authored-By: Claude Opus 5.5 --- .../__snapshots__/v2.0.0.dev2/chf-cdb.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-chd.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-chd.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-chd.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-cxs.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-cxs.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-cxs.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-dfw.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-disv1d.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-disv1d.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-disv1d.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-evp.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-evp.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-evp.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-flw.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-flw.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-flw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-ic.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-ic.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-nam.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-nam.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-oc.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-oc.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-pcp.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-pcp.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-pcp.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-sto.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev2/chf-zdg.json | 1 + .../__snapshots__/v2.0.0.dev2/chf-zdg.toml | 1 + .../__snapshots__/v2.0.0.dev2/chf-zdg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/exg-chfgwf.json | 1 + .../__snapshots__/v2.0.0.dev2/exg-chfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwegwe.json | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwegwe.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwe.json | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwe.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwe.yaml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwf.json | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwt.json | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwt.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfgwt.yaml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfprt.json | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfprt.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwfprt.yaml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwtgwt.json | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml | 1 + .../__snapshots__/v2.0.0.dev2/exg-olfgwf.json | 1 + .../__snapshots__/v2.0.0.dev2/exg-olfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-adv.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-adv.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-adv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-cnd.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-cnd.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-cnd.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ctp.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ctp.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ctp.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-dis.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-dis.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-disu.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-disu.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-disu.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-disv.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-disv.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-esl.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-esl.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-esl.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-est.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-est.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-est.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-fmi.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-fmi.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-fmi.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ic.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ic.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-lke.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-lke.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-lke.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-mve.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-mve.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-mve.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-mwe.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-mwe.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-mwe.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-nam.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-nam.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-oc.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-oc.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-sfe.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-sfe.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-sfe.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ssm.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ssm.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-ssm.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-uze.json | 1 + .../__snapshots__/v2.0.0.dev2/gwe-uze.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwe-uze.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-api.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-api.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-api.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-buy.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-buy.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-buy.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-chd.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-chd.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-chd.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-chdg.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-chdg.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-chdg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-csub.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-csub.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-csub.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-dis.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-dis.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-disu.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-disu.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-disu.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-disv.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-disv.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-drn.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-drn.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-drn.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-drng.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-drng.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-drng.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-evt.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-evt.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-evt.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-evta.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-evta.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-evta.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ghb.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ghb.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ghb.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ghbg.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ghbg.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-gnc.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-gnc.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-gnc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-hfb.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-hfb.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-hfb.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ic.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ic.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-lak.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-lak.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-lak.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-maw.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-maw.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-maw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-mvr.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-mvr.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-mvr.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-nam.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-nam.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-npf.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-npf.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-npf.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-oc.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-oc.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rch.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rch.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rch.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rcha.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rcha.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rcha.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-riv.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-riv.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-riv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rivg.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rivg.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-rivg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-sfr.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-sfr.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-sfr.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-sto.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-uzf.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-uzf.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-uzf.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-vsc.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-vsc.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-vsc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-wel.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-wel.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-wel.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-welg.json | 1 + .../__snapshots__/v2.0.0.dev2/gwf-welg.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwf-welg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-adv.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-adv.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-adv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-api.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-api.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-api.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-cnc.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-cnc.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-cnc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-dis.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-dis.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-disu.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-disu.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-disu.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-disv.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-disv.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-dsp.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-dsp.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-dsp.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-fmi.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-fmi.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-fmi.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-ic.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-ic.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-ist.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-ist.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-ist.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-lkt.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-lkt.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-lkt.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-mst.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-mst.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-mst.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-mvt.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-mvt.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-mvt.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-mwt.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-mwt.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-mwt.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-nam.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-nam.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-oc.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-oc.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-sft.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-sft.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-sft.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-src.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-src.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-src.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-ssm.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-ssm.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-ssm.yaml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-uzt.json | 1 + .../__snapshots__/v2.0.0.dev2/gwt-uzt.toml | 1 + .../__snapshots__/v2.0.0.dev2/gwt-uzt.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-cdb.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-chd.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-chd.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-chd.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-cxs.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-cxs.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-cxs.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-dfw.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-dis2d.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-dis2d.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-dis2d.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-disv1d.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-disv1d.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-disv1d.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-disv2d.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-disv2d.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-disv2d.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-evp.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-evp.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-evp.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-flw.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-flw.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-flw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-ic.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-ic.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-nam.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-nam.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-oc.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-oc.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-pcp.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-pcp.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-pcp.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-sto.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev2/olf-zdg.json | 1 + .../__snapshots__/v2.0.0.dev2/olf-zdg.toml | 1 + .../__snapshots__/v2.0.0.dev2/olf-zdg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/prt-dis.json | 1 + .../__snapshots__/v2.0.0.dev2/prt-dis.toml | 1 + .../__snapshots__/v2.0.0.dev2/prt-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/prt-disv.json | 1 + .../__snapshots__/v2.0.0.dev2/prt-disv.toml | 1 + .../__snapshots__/v2.0.0.dev2/prt-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev2/prt-fmi.json | 1 + .../__snapshots__/v2.0.0.dev2/prt-fmi.toml | 1 + .../__snapshots__/v2.0.0.dev2/prt-fmi.yaml | 1 + .../__snapshots__/v2.0.0.dev2/prt-mip.json | 1 + .../__snapshots__/v2.0.0.dev2/prt-mip.toml | 1 + .../__snapshots__/v2.0.0.dev2/prt-mip.yaml | 1 + .../__snapshots__/v2.0.0.dev2/prt-nam.json | 1 + .../__snapshots__/v2.0.0.dev2/prt-nam.toml | 1 + .../__snapshots__/v2.0.0.dev2/prt-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev2/prt-oc.json | 1 + .../__snapshots__/v2.0.0.dev2/prt-oc.toml | 1 + .../__snapshots__/v2.0.0.dev2/prt-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/prt-prp.json | 1 + .../__snapshots__/v2.0.0.dev2/prt-prp.toml | 1 + .../__snapshots__/v2.0.0.dev2/prt-prp.yaml | 1 + .../__snapshots__/v2.0.0.dev2/sim-tdis.json | 1 + .../__snapshots__/v2.0.0.dev2/sim-tdis.toml | 1 + .../__snapshots__/v2.0.0.dev2/sim-tdis.yaml | 1 + .../__snapshots__/v2.0.0.dev2/sln-ems.json | 1 + .../__snapshots__/v2.0.0.dev2/sln-ems.toml | 1 + .../__snapshots__/v2.0.0.dev2/sln-ems.yaml | 1 + .../__snapshots__/v2.0.0.dev2/sln-ims.json | 1 + .../__snapshots__/v2.0.0.dev2/sln-ims.toml | 1 + .../__snapshots__/v2.0.0.dev2/sln-ims.yaml | 1 + .../__snapshots__/v2.0.0.dev2/sln-pts.json | 1 + .../__snapshots__/v2.0.0.dev2/sln-pts.toml | 1 + .../__snapshots__/v2.0.0.dev2/sln-pts.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-cdb.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-chd.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-chd.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-chd.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-cxs.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-cxs.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-cxs.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-dfw.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-dis2d.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-dis2d.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-dis2d.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-disv1d.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-disv1d.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-disv1d.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-disv2d.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-disv2d.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-disv2d.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-evp.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-evp.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-evp.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-flw.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-flw.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-flw.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-ic.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-ic.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-nam.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-nam.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-oc.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-oc.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-pcp.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-pcp.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-pcp.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-sto.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev2/swf-zdg.json | 1 + .../__snapshots__/v2.0.0.dev2/swf-zdg.toml | 1 + .../__snapshots__/v2.0.0.dev2/swf-zdg.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-ats.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-ats.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-ats.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-hpc.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-hpc.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-hpc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-laktab.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-laktab.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-laktab.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-ncf.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-ncf.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-ncf.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-obs.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-obs.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-obs.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-sfrtab.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-sfrtab.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-spc.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-spc.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-spc.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-spca.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-spca.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-spca.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-tas.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-tas.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-tas.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-ts.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-ts.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-ts.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-tvk.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-tvk.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-tvk.yaml | 1 + .../__snapshots__/v2.0.0.dev2/utl-tvs.json | 1 + .../__snapshots__/v2.0.0.dev2/utl-tvs.toml | 1 + .../__snapshots__/v2.0.0.dev2/utl-tvs.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-cdb.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-chd.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-chd.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-chd.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-cxs.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-cxs.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-cxs.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-dfw.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-disv1d.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-disv1d.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-disv1d.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-evp.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-evp.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-evp.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-flw.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-flw.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-flw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-ic.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-ic.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-nam.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-nam.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-oc.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-oc.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-pcp.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-pcp.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-pcp.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-sto.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev3/chf-zdg.json | 1 + .../__snapshots__/v2.0.0.dev3/chf-zdg.toml | 1 + .../__snapshots__/v2.0.0.dev3/chf-zdg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/exg-chfgwf.json | 1 + .../__snapshots__/v2.0.0.dev3/exg-chfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwegwe.json | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwegwe.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwe.json | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwe.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwe.yaml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwf.json | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwt.json | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwt.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfgwt.yaml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfprt.json | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfprt.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwfprt.yaml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwtgwt.json | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml | 1 + .../__snapshots__/v2.0.0.dev3/exg-olfgwf.json | 1 + .../__snapshots__/v2.0.0.dev3/exg-olfgwf.toml | 1 + .../__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-adv.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-adv.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-adv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-cnd.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-cnd.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-cnd.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ctp.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ctp.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ctp.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-dis.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-dis.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-disu.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-disu.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-disu.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-disv.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-disv.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-esl.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-esl.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-esl.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-est.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-est.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-est.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-fmi.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-fmi.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-fmi.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ic.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ic.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-lke.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-lke.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-lke.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-mve.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-mve.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-mve.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-mwe.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-mwe.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-mwe.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-nam.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-nam.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-oc.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-oc.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-sfe.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-sfe.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-sfe.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ssm.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ssm.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-ssm.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-uze.json | 1 + .../__snapshots__/v2.0.0.dev3/gwe-uze.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwe-uze.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-api.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-api.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-api.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-buy.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-buy.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-buy.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-chd.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-chd.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-chd.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-chdg.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-chdg.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-chdg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-csub.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-csub.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-csub.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-dis.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-dis.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-disu.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-disu.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-disu.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-disv.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-disv.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-drn.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-drn.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-drn.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-drng.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-drng.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-drng.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-evt.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-evt.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-evt.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-evta.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-evta.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-evta.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ghb.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ghb.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ghb.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ghbg.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ghbg.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-gnc.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-gnc.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-gnc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-hfb.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-hfb.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-hfb.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ic.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ic.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-lak.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-lak.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-lak.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-maw.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-maw.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-maw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-mvr.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-mvr.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-mvr.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-nam.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-nam.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-npf.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-npf.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-npf.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-oc.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-oc.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rch.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rch.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rch.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rcha.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rcha.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rcha.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-riv.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-riv.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-riv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rivg.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rivg.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-rivg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-sfr.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-sfr.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-sfr.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-sto.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-uzf.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-uzf.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-uzf.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-vsc.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-vsc.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-vsc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-wel.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-wel.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-wel.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-welg.json | 1 + .../__snapshots__/v2.0.0.dev3/gwf-welg.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwf-welg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-adv.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-adv.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-adv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-api.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-api.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-api.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-cnc.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-cnc.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-cnc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-dis.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-dis.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-disu.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-disu.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-disu.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-disv.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-disv.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-dsp.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-dsp.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-dsp.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-fmi.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-fmi.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-fmi.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-ic.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-ic.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-ist.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-ist.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-ist.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-lkt.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-lkt.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-lkt.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-mst.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-mst.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-mst.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-mvt.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-mvt.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-mvt.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-mwt.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-mwt.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-mwt.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-nam.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-nam.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-oc.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-oc.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-sft.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-sft.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-sft.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-src.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-src.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-src.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-ssm.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-ssm.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-ssm.yaml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-uzt.json | 1 + .../__snapshots__/v2.0.0.dev3/gwt-uzt.toml | 1 + .../__snapshots__/v2.0.0.dev3/gwt-uzt.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-cdb.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-chd.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-chd.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-chd.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-cxs.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-cxs.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-cxs.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-dfw.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-dis2d.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-dis2d.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-dis2d.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-disv1d.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-disv1d.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-disv1d.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-disv2d.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-disv2d.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-disv2d.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-evp.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-evp.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-evp.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-flw.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-flw.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-flw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-ic.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-ic.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-nam.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-nam.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-oc.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-oc.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-pcp.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-pcp.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-pcp.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-sto.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev3/olf-zdg.json | 1 + .../__snapshots__/v2.0.0.dev3/olf-zdg.toml | 1 + .../__snapshots__/v2.0.0.dev3/olf-zdg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/prt-dis.json | 1 + .../__snapshots__/v2.0.0.dev3/prt-dis.toml | 1 + .../__snapshots__/v2.0.0.dev3/prt-dis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/prt-disv.json | 1 + .../__snapshots__/v2.0.0.dev3/prt-disv.toml | 1 + .../__snapshots__/v2.0.0.dev3/prt-disv.yaml | 1 + .../__snapshots__/v2.0.0.dev3/prt-fmi.json | 1 + .../__snapshots__/v2.0.0.dev3/prt-fmi.toml | 1 + .../__snapshots__/v2.0.0.dev3/prt-fmi.yaml | 1 + .../__snapshots__/v2.0.0.dev3/prt-mip.json | 1 + .../__snapshots__/v2.0.0.dev3/prt-mip.toml | 1 + .../__snapshots__/v2.0.0.dev3/prt-mip.yaml | 1 + .../__snapshots__/v2.0.0.dev3/prt-nam.json | 1 + .../__snapshots__/v2.0.0.dev3/prt-nam.toml | 1 + .../__snapshots__/v2.0.0.dev3/prt-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev3/prt-oc.json | 1 + .../__snapshots__/v2.0.0.dev3/prt-oc.toml | 1 + .../__snapshots__/v2.0.0.dev3/prt-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/prt-prp.json | 1 + .../__snapshots__/v2.0.0.dev3/prt-prp.toml | 1 + .../__snapshots__/v2.0.0.dev3/prt-prp.yaml | 1 + .../__snapshots__/v2.0.0.dev3/sim-tdis.json | 1 + .../__snapshots__/v2.0.0.dev3/sim-tdis.toml | 1 + .../__snapshots__/v2.0.0.dev3/sim-tdis.yaml | 1 + .../__snapshots__/v2.0.0.dev3/sln-ems.json | 1 + .../__snapshots__/v2.0.0.dev3/sln-ems.toml | 1 + .../__snapshots__/v2.0.0.dev3/sln-ems.yaml | 1 + .../__snapshots__/v2.0.0.dev3/sln-ims.json | 1 + .../__snapshots__/v2.0.0.dev3/sln-ims.toml | 1 + .../__snapshots__/v2.0.0.dev3/sln-ims.yaml | 1 + .../__snapshots__/v2.0.0.dev3/sln-pts.json | 1 + .../__snapshots__/v2.0.0.dev3/sln-pts.toml | 1 + .../__snapshots__/v2.0.0.dev3/sln-pts.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-cdb.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-cdb.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-cdb.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-chd.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-chd.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-chd.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-cxs.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-cxs.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-cxs.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-dfw.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-dfw.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-dfw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-dis2d.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-dis2d.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-dis2d.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-disv1d.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-disv1d.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-disv1d.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-disv2d.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-disv2d.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-disv2d.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-evp.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-evp.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-evp.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-flw.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-flw.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-flw.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-ic.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-ic.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-ic.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-nam.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-nam.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-nam.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-oc.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-oc.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-oc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-pcp.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-pcp.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-pcp.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-sto.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-sto.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-sto.yaml | 1 + .../__snapshots__/v2.0.0.dev3/swf-zdg.json | 1 + .../__snapshots__/v2.0.0.dev3/swf-zdg.toml | 1 + .../__snapshots__/v2.0.0.dev3/swf-zdg.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-ats.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-ats.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-ats.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-hpc.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-hpc.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-hpc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-laktab.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-laktab.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-laktab.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-ncf.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-ncf.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-ncf.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-obs.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-obs.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-obs.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-sfrtab.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-sfrtab.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-spc.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-spc.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-spc.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-spca.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-spca.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-spca.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-tas.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-tas.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-tas.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-ts.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-ts.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-ts.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-tvk.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-tvk.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-tvk.yaml | 1 + .../__snapshots__/v2.0.0.dev3/utl-tvs.json | 1 + .../__snapshots__/v2.0.0.dev3/utl-tvs.toml | 1 + .../__snapshots__/v2.0.0.dev3/utl-tvs.yaml | 1 + autotest/dfns/test_migrate.py | 38 ++++++++++++++++++- autotest/dfns/test_schema_relations.py | 15 +++----- docs/md/dfnspec.md | 18 +++++---- .../dfns/migrate_to_v2_0_0_dev2.py | 29 ++++++++++++++ modflow_devtools/dfns/schema.json | 36 ++++++++++++++++++ modflow_devtools/dfns/schema.py | 28 ++++---------- 876 files changed, 996 insertions(+), 38 deletions(-) diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json index dae0524c..39056b6f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-cdb", "parent": "chf-nam", + "ftype": "CDB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml index 314045ba..1c8d2095 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-cdb" parent = "chf-nam" +ftype = "CDB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml index 51252a9d..e600f862 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-cdb parent: chf-nam +ftype: CDB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json index 9df4a003..036c6e83 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-chd", "parent": "chf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml index e85398a1..4fe7d73f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-chd" parent = "chf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml index c80c8cc7..433236d1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-chd parent: chf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.json index 8a7f74c4..5dd8d681 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-cxs", "parent": "chf-nam", + "ftype": "CXS6", "dims": { "nsections": { "value": "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.toml index e679345f..674464ba 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-cxs" parent = "chf-nam" +ftype = "CXS6" [dims.nsections] value = "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.yaml index 256dad9f..63805874 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-cxs parent: chf-nam +ftype: CXS6 dims: nsections: value: nsections diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json index 585bf55e..2c78debe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-dfw", "parent": "chf-nam", + "ftype": "DFW6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml index 08173382..60987da9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-dfw" parent = "chf-nam" +ftype = "DFW6" [blocks.options.fields.central_in_space] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml index 2e8a8415..f8eb0b75 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-dfw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-dfw parent: chf-nam +ftype: DFW6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.json index be3f8f16..8049834f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-disv1d", "parent": "chf-nam", + "ftype": "DISV1D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.toml index 3124ae56..3800b9d9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-disv1d" parent = "chf-nam" +ftype = "DISV1D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.yaml index c21fb1ba..c067de6d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-disv1d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-disv1d parent: chf-nam +ftype: DISV1D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json index a0a7c313..7cabb15d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-evp", "parent": "chf-nam", + "ftype": "EVP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml index dda0861b..72b6f24f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-evp" parent = "chf-nam" +ftype = "EVP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml index 6361923b..e2172c6d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-evp parent: chf-nam +ftype: EVP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json index c2e6b00d..9481c406 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-flw", "parent": "chf-nam", + "ftype": "FLW6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml index cef2f8e4..f538b9c2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-flw" parent = "chf-nam" +ftype = "FLW6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml index 2fdfe9f6..72628e86 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-flw parent: chf-nam +ftype: FLW6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.json index 8c542f93..721573aa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-ic", "parent": "chf-nam", + "ftype": "IC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.toml index bda58cb9..10b4d187 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-ic" parent = "chf-nam" +ftype = "IC6" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.yaml index 7414c920..ebf12faf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-ic parent: chf-nam +ftype: IC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json index ad73e066..7c16a8c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-nam", "parent": "sim-nam", + "ftype": "CHF6", "dependent_variable": "stage", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml index 03b42c1b..33fbc73f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev2" name = "chf-nam" parent = "sim-nam" +ftype = "CHF6" dependent_variable = "stage" [blocks.options.fields.list] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml index 93980bf2..998f03d2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev2 name: chf-nam parent: sim-nam +ftype: CHF6 dependent_variable: stage blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.json index 10efb35d..ae3f6fa8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-oc", "parent": "chf-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.toml index dd113fb0..68a08f91 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-oc" parent = "chf-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.yaml index 7cdb656f..af1dd10c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-oc parent: chf-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json index 2fec5201..e095bc2b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-pcp", "parent": "chf-nam", + "ftype": "PCP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml index a125d829..057f84dc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-pcp" parent = "chf-nam" +ftype = "PCP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml index 6934e631..94009741 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-pcp parent: chf-nam +ftype: PCP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.json index 51c29f76..baa239c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-sto", "parent": "chf-nam", + "ftype": "STO6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.toml index 6724eb7b..1db8380c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-sto" parent = "chf-nam" +ftype = "STO6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.yaml index f212da90..fa78eae8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-sto.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-sto parent: chf-nam +ftype: STO6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json index 51fdb2c0..c835d1d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "chf-zdg", "parent": "chf-nam", + "ftype": "ZDG6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml index ee6a44b3..24135592 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "chf-zdg" parent = "chf-nam" +ftype = "ZDG6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml index 7ae1081e..9a9d7ee3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: chf-zdg parent: chf-nam +ftype: ZDG6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json index 16bce899..b3c850a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "exg-chfgwf", "parent": "sim-nam", + "ftype": "CHF6-GWF6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml index 5c925dd2..33e6b128 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "exg-chfgwf" parent = "sim-nam" +ftype = "CHF6-GWF6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml index a6d90de6..b31dcb7c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: exg-chfgwf parent: sim-nam +ftype: CHF6-GWF6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json index 25e43324..9a04e488 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "exg-gwegwe", "parent": "sim-nam", + "ftype": "GWE6-GWE6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml index 2fc38afe..8247087e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "exg-gwegwe" parent = "sim-nam" +ftype = "GWE6-GWE6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml index 10e1d5ca..c37a3f8d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: exg-gwegwe parent: sim-nam +ftype: GWE6-GWE6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.json index 7aeb3cf4..4d4a3320 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.json @@ -3,5 +3,6 @@ "schema_version": "2.0.0.dev2", "name": "exg-gwfgwe", "parent": "sim-nam", + "ftype": "GWF6-GWE6", "subtype": "exchange" } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.toml index 2e445dba..1888ec52 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.toml @@ -2,4 +2,5 @@ type = "package" schema_version = "2.0.0.dev2" name = "exg-gwfgwe" parent = "sim-nam" +ftype = "GWF6-GWE6" subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.yaml index 892a50dc..cf70ac4b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.yaml @@ -2,4 +2,5 @@ type: package schema_version: 2.0.0.dev2 name: exg-gwfgwe parent: sim-nam +ftype: GWF6-GWE6 subtype: exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json index d2b71d55..0b4514f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "exg-gwfgwf", "parent": "sim-nam", + "ftype": "GWF6-GWF6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml index 93189e59..085aaa49 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "exg-gwfgwf" parent = "sim-nam" +ftype = "GWF6-GWF6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml index 84544472..76ad6042 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: exg-gwfgwf parent: sim-nam +ftype: GWF6-GWF6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.json index 5c819907..fd252853 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.json @@ -3,5 +3,6 @@ "schema_version": "2.0.0.dev2", "name": "exg-gwfgwt", "parent": "sim-nam", + "ftype": "GWF6-GWT6", "subtype": "exchange" } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.toml index 8bc46d81..b5e385ed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.toml @@ -2,4 +2,5 @@ type = "package" schema_version = "2.0.0.dev2" name = "exg-gwfgwt" parent = "sim-nam" +ftype = "GWF6-GWT6" subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.yaml index a71f810e..a90667d7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.yaml @@ -2,4 +2,5 @@ type: package schema_version: 2.0.0.dev2 name: exg-gwfgwt parent: sim-nam +ftype: GWF6-GWT6 subtype: exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.json index 9bd8fa0b..1d9da0b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.json @@ -3,5 +3,6 @@ "schema_version": "2.0.0.dev2", "name": "exg-gwfprt", "parent": "sim-nam", + "ftype": "GWF6-PRT6", "subtype": "exchange" } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.toml index a2feb5a4..505a1090 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.toml @@ -2,4 +2,5 @@ type = "package" schema_version = "2.0.0.dev2" name = "exg-gwfprt" parent = "sim-nam" +ftype = "GWF6-PRT6" subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.yaml index 73e1dcb1..d02cf7c7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfprt.yaml @@ -2,4 +2,5 @@ type: package schema_version: 2.0.0.dev2 name: exg-gwfprt parent: sim-nam +ftype: GWF6-PRT6 subtype: exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json index 8976dcf2..3bbfcf01 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "exg-gwtgwt", "parent": "sim-nam", + "ftype": "GWT6-GWT6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml index 8e12a721..8378cb15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "exg-gwtgwt" parent = "sim-nam" +ftype = "GWT6-GWT6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml index 091a3945..96eb42e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: exg-gwtgwt parent: sim-nam +ftype: GWT6-GWT6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json index da586d7d..2f0161eb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "exg-olfgwf", "parent": "sim-nam", + "ftype": "OLF6-GWF6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml index 25958a80..5d1afe45 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "exg-olfgwf" parent = "sim-nam" +ftype = "OLF6-GWF6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml index d71925fe..d5f28cbd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: exg-olfgwf parent: sim-nam +ftype: OLF6-GWF6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.json index 811b5ab8..26e61415 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-adv", "parent": "gwe-nam", + "ftype": "ADV6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.toml index 9c462b15..359d798c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-adv" parent = "gwe-nam" +ftype = "ADV6" [blocks.options.fields.scheme] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.yaml index 34a5601d..85b25d72 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-adv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-adv parent: gwe-nam +ftype: ADV6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.json index 708aa49b..e6a4f101 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-cnd", "parent": "gwe-nam", + "ftype": "CND6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.toml index 14bf4b6b..264fa327 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-cnd" parent = "gwe-nam" +ftype = "CND6" [blocks.options.fields.xt3d_off] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.yaml index 66786d01..fab084ee 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-cnd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-cnd parent: gwe-nam +ftype: CND6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json index f58c7a7b..82b4181e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-ctp", "parent": "gwe-nam", + "ftype": "CTP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml index e258bd60..3cf08c26 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-ctp" parent = "gwe-nam" +ftype = "CTP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml index 62d745e6..b0b6a2a9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-ctp parent: gwe-nam +ftype: CTP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json index 1499a62c..2245dc1d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-dis", "parent": "gwe-nam", + "ftype": "DIS6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml index d68ae55d..1bc656a8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-dis" parent = "gwe-nam" +ftype = "DIS6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml index fa25e6f3..73c842eb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-dis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-dis parent: gwe-nam +ftype: DIS6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.json index 78e8d7e1..df47aca0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-disu", "parent": "gwe-nam", + "ftype": "DISU6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.toml index d3502205..15a9e119 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-disu" parent = "gwe-nam" +ftype = "DISU6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.yaml index 0131bbad..adf190bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disu.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-disu parent: gwe-nam +ftype: DISU6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json index a2a579a3..dc4e70d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-disv", "parent": "gwe-nam", + "ftype": "DISV6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml index 9b3b0723..c0edcf42 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-disv" parent = "gwe-nam" +ftype = "DISV6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml index a619fb00..f2740be0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-disv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-disv parent: gwe-nam +ftype: DISV6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json index baf7d4dd..1dc4142c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-esl", "parent": "gwe-nam", + "ftype": "ESL6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml index 99c63a81..ddfde8ea 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-esl" parent = "gwe-nam" +ftype = "ESL6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml index 9b87bdc3..63200052 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-esl parent: gwe-nam +ftype: ESL6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.json index d13d56f1..52920713 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-est", "parent": "gwe-nam", + "ftype": "EST6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.toml index 9bed2706..b87e9e19 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-est" parent = "gwe-nam" +ftype = "EST6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.yaml index 6612f84d..e4db526f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-est.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-est parent: gwe-nam +ftype: EST6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.json index 4d31417a..5108e94d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-fmi", "parent": "gwe-nam", + "ftype": "FMI6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.toml index aa1958bb..f9bce637 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-fmi" parent = "gwe-nam" +ftype = "FMI6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.yaml index 3fb1e371..f3241634 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-fmi.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-fmi parent: gwe-nam +ftype: FMI6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.json index 0bf4eeb0..e0644721 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-ic", "parent": "gwe-nam", + "ftype": "IC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.toml index e74a2f1f..ff69f8b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-ic" parent = "gwe-nam" +ftype = "IC6" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.yaml index 2514d05a..c3fc9c02 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-ic parent: gwe-nam +ftype: IC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json index 3f585ed3..858dcde9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-lke", "parent": "gwe-nam", + "ftype": "LKE6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml index e7c6491c..42bc091a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-lke" parent = "gwe-nam" +ftype = "LKE6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml index 75a879d0..12be2b62 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-lke.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-lke parent: gwe-nam +ftype: LKE6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json index 179f795a..e5b92888 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.json @@ -2,6 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "gwe-mve", + "ftype": "MVE6", "parent": [ "exg-gwegwe", "gwe-nam" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml index 8e2ae39d..b25d01af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.toml @@ -1,6 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-mve" +ftype = "MVE6" parent = [ "exg-gwegwe", "gwe-nam", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml index e6f2f6d1..48f67087 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mve.yaml @@ -1,6 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-mve +ftype: MVE6 parent: - exg-gwegwe - gwe-nam diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json index 6162fe15..0321bc25 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-mwe", "parent": "gwe-nam", + "ftype": "MWE6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml index 96d6b2e5..2962e7db 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-mwe" parent = "gwe-nam" +ftype = "MWE6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml index 7279bf87..16ea2988 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-mwe.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-mwe parent: gwe-nam +ftype: MWE6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json index f408bfcc..d525eae5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-nam", "parent": "sim-nam", + "ftype": "GWE6", "dependent_variable": "temperature", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml index 7c6151e5..deb5e153 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev2" name = "gwe-nam" parent = "sim-nam" +ftype = "GWE6" dependent_variable = "temperature" [blocks.options.fields.list] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml index 8af8a722..07c9487d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev2 name: gwe-nam parent: sim-nam +ftype: GWE6 dependent_variable: temperature blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.json index 15628040..6f35af34 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-oc", "parent": "gwe-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.toml index 56770bf1..2078b2ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-oc" parent = "gwe-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.yaml index 0bc2c9bc..fe5c26b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-oc parent: gwe-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json index a4adb378..c0adb27d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-sfe", "parent": "gwe-nam", + "ftype": "SFE6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml index 4aa63d17..8042c96d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-sfe" parent = "gwe-nam" +ftype = "SFE6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml index 3865faff..c0ae9d11 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-sfe.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-sfe parent: gwe-nam +ftype: SFE6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.json index 7cbc3506..754b2861 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-ssm", "parent": "gwe-nam", + "ftype": "SSM6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.toml index 8e5e0b28..66311323 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-ssm" parent = "gwe-nam" +ftype = "SSM6" [blocks.options.fields.print_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.yaml index 09f3aa37..515fb4bf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ssm.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-ssm parent: gwe-nam +ftype: SSM6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json index 326ba287..42deb19d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwe-uze", "parent": "gwe-nam", + "ftype": "UZE6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml index 579d4d79..cba74ae9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwe-uze" parent = "gwe-nam" +ftype = "UZE6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml index df69cb8f..44054d10 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-uze.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwe-uze parent: gwe-nam +ftype: UZE6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json index ce348ad6..04ca7307 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-api", "parent": "gwf-nam", + "ftype": "API6", "multi": true, "dims": { "maxbound": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml index 9e70100b..e3e8fa2e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-api" parent = "gwf-nam" +ftype = "API6" multi = true [dims.maxbound] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml index 76ce164c..41105509 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-api parent: gwf-nam +ftype: API6 multi: true dims: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json index e26a6ed9..023d7c43 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-buy", "parent": "gwf-nam", + "ftype": "BUY6", "dims": { "nrhospecies": { "value": "nrhospecies" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml index cef76240..ae62c4ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-buy" parent = "gwf-nam" +ftype = "BUY6" [dims.nrhospecies] value = "nrhospecies" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml index d8120876..d6482505 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-buy parent: gwf-nam +ftype: BUY6 dims: nrhospecies: value: nrhospecies diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json index 40563658..f3ffa465 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-chd", "parent": "gwf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml index 01a3f9ab..fbe4d268 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-chd" parent = "gwf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml index 6ea3f420..15143b5e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-chd parent: gwf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json index 3f834522..12863b2e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-chdg", "parent": "gwf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml index bab4cf2f..74853ae9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-chdg" parent = "gwf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml index e0a5dc99..f3c0c2f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-chdg parent: gwf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json index 894db6fd..16a4d5af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-csub", "parent": "gwf-nam", + "ftype": "CSUB6", "dims": { "ninterbeds": { "value": "ninterbeds" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml index 507c1728..feef71d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-csub" parent = "gwf-nam" +ftype = "CSUB6" [dims.ninterbeds] value = "ninterbeds" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml index e74a0ce4..ed0bbb3f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-csub parent: gwf-nam +ftype: CSUB6 dims: ninterbeds: value: ninterbeds diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json index fee7bc79..5618c7af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-dis", "parent": "gwf-nam", + "ftype": "DIS6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml index dc860500..c16d6558 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-dis" parent = "gwf-nam" +ftype = "DIS6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml index c93275ce..80f394a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-dis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-dis parent: gwf-nam +ftype: DIS6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.json index 23866203..76544f32 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-disu", "parent": "gwf-nam", + "ftype": "DISU6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.toml index 462a37f4..db74a9f1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-disu" parent = "gwf-nam" +ftype = "DISU6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.yaml index 4d81225d..ad823e50 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disu.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-disu parent: gwf-nam +ftype: DISU6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json index c37b00b6..a640ae17 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-disv", "parent": "gwf-nam", + "ftype": "DISV6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml index 8fa3e153..2131a8a9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-disv" parent = "gwf-nam" +ftype = "DISV6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml index c078b762..b3536cdc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-disv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-disv parent: gwf-nam +ftype: DISV6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json index 3bd547b1..dec10830 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-drn", "parent": "gwf-nam", + "ftype": "DRN6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml index d2f47f00..07a60b74 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-drn" parent = "gwf-nam" +ftype = "DRN6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml index 012098ee..84a581b2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-drn parent: gwf-nam +ftype: DRN6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json index 526553c4..f978cfea 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-drng", "parent": "gwf-nam", + "ftype": "DRN6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml index fd444a1f..7845db4a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-drng" parent = "gwf-nam" +ftype = "DRN6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml index 8e299335..c758c1bc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-drng parent: gwf-nam +ftype: DRN6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json index 0ade65bd..1e9d4e9f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-evt", "parent": "gwf-nam", + "ftype": "EVT6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml index b5a4c4b2..95156324 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-evt" parent = "gwf-nam" +ftype = "EVT6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml index 2bfc20d5..142b1426 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-evt parent: gwf-nam +ftype: EVT6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json index e4c198e5..0095db10 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-evta", "parent": "gwf-nam", + "ftype": "EVT6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml index 4a865c86..a645a4ee 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-evta" parent = "gwf-nam" +ftype = "EVT6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml index 1dc4352a..f9a4aa8d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evta.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-evta parent: gwf-nam +ftype: EVT6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json index 4ccd543f..aeea8157 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-ghb", "parent": "gwf-nam", + "ftype": "GHB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml index 21aeff48..da96489c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-ghb" parent = "gwf-nam" +ftype = "GHB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml index a7fbe11b..e90cbefa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-ghb parent: gwf-nam +ftype: GHB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json index 10b0075a..4dd54c0b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-ghbg", "parent": "gwf-nam", + "ftype": "GHB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml index bf56fb98..1a9f65b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-ghbg" parent = "gwf-nam" +ftype = "GHB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml index 80ef2e91..32105c78 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-ghbg parent: gwf-nam +ftype: GHB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json index 5ebfd07d..22b181b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json @@ -2,6 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "gwf-gnc", + "ftype": "GNC6", "parent": [ "exg-gwfgwf", "gwf-nam" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml index c460faa7..0de9a632 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml @@ -1,6 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-gnc" +ftype = "GNC6" parent = [ "exg-gwfgwf", "gwf-nam", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml index 03497fb3..6a6d9bcb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml @@ -1,6 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-gnc +ftype: GNC6 parent: - exg-gwfgwf - gwf-nam diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json index 55989a7a..6d697762 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-hfb", "parent": "gwf-nam", + "ftype": "HFB6", "dims": { "maxhfb": { "value": "maxhfb" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml index 02aee4d4..4b53a385 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-hfb" parent = "gwf-nam" +ftype = "HFB6" [dims.maxhfb] value = "maxhfb" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml index 3aefbe61..d4d5ab0a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-hfb parent: gwf-nam +ftype: HFB6 dims: maxhfb: value: maxhfb diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.json index fcd4aa5c..44e2aa28 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-ic", "parent": "gwf-nam", + "ftype": "IC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.toml index 83474caa..199d52e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-ic" parent = "gwf-nam" +ftype = "IC6" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.yaml index d0d073ef..8c21fbfd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-ic parent: gwf-nam +ftype: IC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json index 5ef54996..1a11d117 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-lak", "parent": "gwf-nam", + "ftype": "LAK6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml index 5df3c4e2..78712f11 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-lak" parent = "gwf-nam" +ftype = "LAK6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml index 47fbb24e..a4403ad9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-lak parent: gwf-nam +ftype: LAK6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json index 9e93e127..55954462 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-maw", "parent": "gwf-nam", + "ftype": "MAW6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml index 2280c16d..bea5b89e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-maw" parent = "gwf-nam" +ftype = "MAW6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml index 6d1eda37..46c7c691 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-maw parent: gwf-nam +ftype: MAW6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json index d20fccf3..d78e7853 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json @@ -2,6 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "gwf-mvr", + "ftype": "MVR6", "parent": [ "exg-gwfgwf", "gwf-nam" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml index 1736ef31..ee8c7171 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml @@ -1,6 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-mvr" +ftype = "MVR6" parent = [ "exg-gwfgwf", "gwf-nam", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml index c0c6358f..8a717139 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml @@ -1,6 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-mvr +ftype: MVR6 parent: - exg-gwfgwf - gwf-nam diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json index d3c8951c..9c6fd81e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-nam", "parent": "sim-nam", + "ftype": "GWF6", "dependent_variable": "head", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml index 6c09b3a7..4e2e1072 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev2" name = "gwf-nam" parent = "sim-nam" +ftype = "GWF6" dependent_variable = "head" [blocks.options.fields.list] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml index bd50172a..e5e79d2f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev2 name: gwf-nam parent: sim-nam +ftype: GWF6 dependent_variable: head blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json index 8b75b254..7ea92ac4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-npf", "parent": "gwf-nam", + "ftype": "NPF6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml index cbdc8b1d..1408b240 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-npf" parent = "gwf-nam" +ftype = "NPF6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml index 5f7b55fe..11add11d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-npf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-npf parent: gwf-nam +ftype: NPF6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.json index a7dfeaf2..2c32e0fe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-oc", "parent": "gwf-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.toml index cce5295f..ea4631a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-oc" parent = "gwf-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.yaml index 8fb7ff3d..8b523910 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-oc parent: gwf-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json index 0314a89f..a2f94889 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-rch", "parent": "gwf-nam", + "ftype": "RCH6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml index 5e97945b..4ffbbc67 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-rch" parent = "gwf-nam" +ftype = "RCH6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml index e4a021ad..6451ec7b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-rch parent: gwf-nam +ftype: RCH6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json index a3c886f3..592f88c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-rcha", "parent": "gwf-nam", + "ftype": "RCH6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml index 017d953b..c1d9316b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-rcha" parent = "gwf-nam" +ftype = "RCH6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml index d1abe05a..ee46e4e6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rcha.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-rcha parent: gwf-nam +ftype: RCH6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json index 4ea5a318..19e66213 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-riv", "parent": "gwf-nam", + "ftype": "RIV6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml index 9d0952b1..1e55d053 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-riv" parent = "gwf-nam" +ftype = "RIV6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml index ccc00fa0..12aef4c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-riv parent: gwf-nam +ftype: RIV6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json index e7dd623a..d6a819bc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-rivg", "parent": "gwf-nam", + "ftype": "RIV6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml index e6676ce9..31ae65c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-rivg" parent = "gwf-nam" +ftype = "RIV6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml index 13037d44..316b3be6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-rivg parent: gwf-nam +ftype: RIV6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json index ea9117d5..b6c9ee48 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-sfr", "parent": "gwf-nam", + "ftype": "SFR6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml index 9f55141f..211ac247 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-sfr" parent = "gwf-nam" +ftype = "SFR6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml index ed013bfd..6b8930a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-sfr parent: gwf-nam +ftype: SFR6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json index bac90e80..a0e284e7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-sto", "parent": "gwf-nam", + "ftype": "STO6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml index 00af4715..13ec8e0d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-sto" parent = "gwf-nam" +ftype = "STO6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml index d6ff7b63..fca6a977 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sto.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-sto parent: gwf-nam +ftype: STO6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json index c851ff96..a2cceb73 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-uzf", "parent": "gwf-nam", + "ftype": "UZF6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml index 9f8f6aa0..a895d8eb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-uzf" parent = "gwf-nam" +ftype = "UZF6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml index 55584a5d..66da04f2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-uzf parent: gwf-nam +ftype: UZF6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.json index 0682005a..336cc99d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-vsc", "parent": "gwf-nam", + "ftype": "VSC6", "dims": { "nviscspecies": { "value": "nviscspecies" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.toml index 874c805c..5bc46642 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-vsc" parent = "gwf-nam" +ftype = "VSC6" [dims.nviscspecies] value = "nviscspecies" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.yaml index 50878df5..2c0b1898 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-vsc parent: gwf-nam +ftype: VSC6 dims: nviscspecies: value: nviscspecies diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json index 85be37c3..57595838 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-wel", "parent": "gwf-nam", + "ftype": "WEL6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml index c3554571..ed830e00 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-wel" parent = "gwf-nam" +ftype = "WEL6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml index 56697970..e366dd17 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-wel parent: gwf-nam +ftype: WEL6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json index 0c1641b8..f5175baf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwf-welg", "parent": "gwf-nam", + "ftype": "WEL6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml index f80942db..842d8cfa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwf-welg" parent = "gwf-nam" +ftype = "WEL6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml index 7135f325..868152a5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwf-welg parent: gwf-nam +ftype: WEL6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.json index c00d949b..f37987de 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-adv", "parent": "gwt-nam", + "ftype": "ADV6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.toml index 4ab49f4a..ece53e85 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-adv" parent = "gwt-nam" +ftype = "ADV6" [blocks.options.fields.scheme] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.yaml index 3280e2e9..c753385a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-adv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-adv parent: gwt-nam +ftype: ADV6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json index 092735db..19ca7497 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-api", "parent": "gwt-nam", + "ftype": "API6", "multi": true, "dims": { "maxbound": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml index 04785a15..3d5ba0f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-api" parent = "gwt-nam" +ftype = "API6" multi = true [dims.maxbound] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml index 36f7c006..881b6ffe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-api parent: gwt-nam +ftype: API6 multi: true dims: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json index ed3bfaf3..364a8fce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-cnc", "parent": "gwt-nam", + "ftype": "CNC6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml index 3c0746f5..88494e6a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-cnc" parent = "gwt-nam" +ftype = "CNC6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml index fb0935b8..5a54f76e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-cnc parent: gwt-nam +ftype: CNC6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json index d65b3434..76609124 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-dis", "parent": "gwt-nam", + "ftype": "DIS6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml index 26056d5e..904985b8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-dis" parent = "gwt-nam" +ftype = "DIS6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml index 7470eb1a..ea4d4ca6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-dis parent: gwt-nam +ftype: DIS6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.json index d3c8ed37..c97bfd45 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-disu", "parent": "gwt-nam", + "ftype": "DISU6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.toml index 3249a7e2..529b56bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-disu" parent = "gwt-nam" +ftype = "DISU6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.yaml index a339e0a1..e5ee58a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disu.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-disu parent: gwt-nam +ftype: DISU6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json index 67311326..0d5f0e40 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-disv", "parent": "gwt-nam", + "ftype": "DISV6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml index d112a22c..26b4919b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-disv" parent = "gwt-nam" +ftype = "DISV6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml index 68034617..87aac0d0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-disv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-disv parent: gwt-nam +ftype: DISV6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.json index 431ed712..58a78f9d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-dsp", "parent": "gwt-nam", + "ftype": "DSP6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.toml index 05d7dce3..084fb2b2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-dsp" parent = "gwt-nam" +ftype = "DSP6" [blocks.options.fields.xt3d_off] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.yaml index 1b34e9fe..0d7b1aac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-dsp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-dsp parent: gwt-nam +ftype: DSP6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.json index a1ba8e6e..764824cb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-fmi", "parent": "gwt-nam", + "ftype": "FMI6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.toml index d41e5476..ba369d7b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-fmi" parent = "gwt-nam" +ftype = "FMI6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.yaml index ac9c1d86..ccfbfce3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-fmi.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-fmi parent: gwt-nam +ftype: FMI6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.json index a859f237..d4d4b96b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-ic", "parent": "gwt-nam", + "ftype": "IC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.toml index 1db58d3f..02cf7962 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-ic" parent = "gwt-nam" +ftype = "IC6" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.yaml index 5365eb04..d5ca8be2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-ic parent: gwt-nam +ftype: IC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.json index fde2b128..37b0ad42 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-ist", "parent": "gwt-nam", + "ftype": "IST6", "multi": true, "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.toml index 5bbba0b1..f86a1321 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-ist" parent = "gwt-nam" +ftype = "IST6" multi = true [blocks.options.fields.save_flows] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.yaml index 7bf04404..ae92dd58 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ist.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-ist parent: gwt-nam +ftype: IST6 multi: true blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json index b968744e..695abb55 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-lkt", "parent": "gwt-nam", + "ftype": "LKT6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml index 7c4d2374..49a1804c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-lkt" parent = "gwt-nam" +ftype = "LKT6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml index 4e91d431..a72a20a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-lkt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-lkt parent: gwt-nam +ftype: LKT6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.json index b39f6fae..aa705f84 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-mst", "parent": "gwt-nam", + "ftype": "MST6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.toml index a06ea634..9d95598f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-mst" parent = "gwt-nam" +ftype = "MST6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.yaml index 927ec440..4422238b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mst.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-mst parent: gwt-nam +ftype: MST6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json index 316caa6a..3cec3887 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.json @@ -2,6 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "gwt-mvt", + "ftype": "MVT6", "parent": [ "exg-gwtgwt", "gwt-nam" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml index e4569812..9eebc839 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.toml @@ -1,6 +1,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-mvt" +ftype = "MVT6" parent = [ "exg-gwtgwt", "gwt-nam", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml index 5d420d81..2e89d479 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mvt.yaml @@ -1,6 +1,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-mvt +ftype: MVT6 parent: - exg-gwtgwt - gwt-nam diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json index 47e71138..9b08f695 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-mwt", "parent": "gwt-nam", + "ftype": "MWT6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml index a069cadf..35c19575 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-mwt" parent = "gwt-nam" +ftype = "MWT6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml index 8669ba9c..23c0ecbd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-mwt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-mwt parent: gwt-nam +ftype: MWT6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json index 7b435f70..bc6eac50 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-nam", "parent": "sim-nam", + "ftype": "GWT6", "dependent_variable": "concentration", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml index 4dc6630f..46d4996d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev2" name = "gwt-nam" parent = "sim-nam" +ftype = "GWT6" dependent_variable = "concentration" [blocks.options.fields.list] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml index 922ffef2..3c8fff61 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev2 name: gwt-nam parent: sim-nam +ftype: GWT6 dependent_variable: concentration blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.json index 23ebdee2..89ce0198 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-oc", "parent": "gwt-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.toml index cd452ae2..44e5a69d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-oc" parent = "gwt-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.yaml index 01576352..f3e10d56 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-oc parent: gwt-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json index f4c7b5e3..098f65b2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-sft", "parent": "gwt-nam", + "ftype": "SFT6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml index 853641d5..6308c54a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-sft" parent = "gwt-nam" +ftype = "SFT6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml index c2331f54..e027a639 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-sft.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-sft parent: gwt-nam +ftype: SFT6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json index 5b2e5b00..db288a6c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-src", "parent": "gwt-nam", + "ftype": "SRC6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml index 72d3d47c..2c6a7318 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-src" parent = "gwt-nam" +ftype = "SRC6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml index ae273e9a..5a7d76f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-src parent: gwt-nam +ftype: SRC6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.json index 36365f84..7e146aab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-ssm", "parent": "gwt-nam", + "ftype": "SSM6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.toml index 9b89f5f9..16578041 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-ssm" parent = "gwt-nam" +ftype = "SSM6" [blocks.options.fields.print_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.yaml index 17d8285c..69fa16e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-ssm.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-ssm parent: gwt-nam +ftype: SSM6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json index 21ba7030..dddeacb8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "gwt-uzt", "parent": "gwt-nam", + "ftype": "UZT6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml index 2512baca..59fc18f6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "gwt-uzt" parent = "gwt-nam" +ftype = "UZT6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml index ef97c88a..7932f198 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-uzt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: gwt-uzt parent: gwt-nam +ftype: UZT6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json index 7f928ea0..de4f0869 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-cdb", "parent": "olf-nam", + "ftype": "CDB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml index 76d9de5b..d032c8ac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-cdb" parent = "olf-nam" +ftype = "CDB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml index 44c1bfd1..f07aa8b9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-cdb parent: olf-nam +ftype: CDB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json index 39970259..70fbe63b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-chd", "parent": "olf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml index ef1a4cf1..e83c9584 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-chd" parent = "olf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml index a9963b17..dc47b044 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-chd parent: olf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.json index b53e1725..8b2adf87 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-cxs", "parent": "olf-nam", + "ftype": "CXS6", "dims": { "nsections": { "value": "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.toml index 0eb54f36..24b4615c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-cxs" parent = "olf-nam" +ftype = "CXS6" [dims.nsections] value = "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.yaml index 9a809a88..39a2ad6d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-cxs parent: olf-nam +ftype: CXS6 dims: nsections: value: nsections diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json index 79dd7e78..cb64b7c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-dfw", "parent": "olf-nam", + "ftype": "DFW6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml index 2524ac53..8288b171 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-dfw" parent = "olf-nam" +ftype = "DFW6" [blocks.options.fields.central_in_space] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml index fe95f7bf..767d649a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dfw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-dfw parent: olf-nam +ftype: DFW6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.json index 1626fc8b..1c21a198 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-dis2d", "parent": "olf-nam", + "ftype": "DIS2D6", "dims": { "nrow": { "value": "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.toml index 612775a1..b5767a67 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-dis2d" parent = "olf-nam" +ftype = "DIS2D6" [dims.nrow] value = "nrow" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.yaml index 4faff874..6f105842 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-dis2d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-dis2d parent: olf-nam +ftype: DIS2D6 dims: nrow: value: nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.json index 9eca4770..25a81342 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-disv1d", "parent": "olf-nam", + "ftype": "DISV1D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.toml index 8c5abc49..76a15219 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-disv1d" parent = "olf-nam" +ftype = "DISV1D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.yaml index 8a69baa2..ae5c71f7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv1d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-disv1d parent: olf-nam +ftype: DISV1D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.json index a2b43209..5d325b35 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-disv2d", "parent": "olf-nam", + "ftype": "DISV2D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.toml index 546c80d7..6795a6a5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-disv2d" parent = "olf-nam" +ftype = "DISV2D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.yaml index cb899954..99e48bc2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-disv2d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-disv2d parent: olf-nam +ftype: DISV2D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json index 25480935..1bf4f1e9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-evp", "parent": "olf-nam", + "ftype": "EVP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml index d9530ef0..f5d3e3fb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-evp" parent = "olf-nam" +ftype = "EVP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml index 5b6fe418..31bb010d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-evp parent: olf-nam +ftype: EVP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json index 8009d06f..ba6c40c9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-flw", "parent": "olf-nam", + "ftype": "FLW6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml index 0d13b1dc..46142ec2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-flw" parent = "olf-nam" +ftype = "FLW6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml index b661bf77..c44f113d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-flw parent: olf-nam +ftype: FLW6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.json index f912d839..27d6307f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-ic", "parent": "olf-nam", + "ftype": "IC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.toml index e2c112df..f4e2cf93 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-ic" parent = "olf-nam" +ftype = "IC6" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.yaml index c0e9bd07..558a4fc2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-ic parent: olf-nam +ftype: IC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json index d26345bd..6312b226 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-nam", "parent": "sim-nam", + "ftype": "OLF6", "dependent_variable": "stage", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml index 39f7bbe6..6d9e86ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev2" name = "olf-nam" parent = "sim-nam" +ftype = "OLF6" dependent_variable = "stage" [blocks.options.fields.list] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml index ae13ea3b..bec2086f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev2 name: olf-nam parent: sim-nam +ftype: OLF6 dependent_variable: stage blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.json index a99fe4a0..39ba7c83 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-oc", "parent": "olf-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.toml index 0414d266..e3c53b90 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-oc" parent = "olf-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.yaml index 7f771604..9930c51e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-oc parent: olf-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json index 3da0ed6b..00760e11 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-pcp", "parent": "olf-nam", + "ftype": "PCP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml index 92e13f0d..f2d88106 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-pcp" parent = "olf-nam" +ftype = "PCP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml index 7d7034cc..0d1ea587 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-pcp parent: olf-nam +ftype: PCP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.json index 8511d158..d12400ae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-sto", "parent": "olf-nam", + "ftype": "STO6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.toml index 74158bab..0d6135fe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-sto" parent = "olf-nam" +ftype = "STO6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.yaml index a09c4430..bc0308f7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-sto.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-sto parent: olf-nam +ftype: STO6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json index f4d871cd..0ccd4d68 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "olf-zdg", "parent": "olf-nam", + "ftype": "ZDG6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml index cfd89569..56857700 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "olf-zdg" parent = "olf-nam" +ftype = "ZDG6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml index 994c340d..5187a916 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: olf-zdg parent: olf-nam +ftype: ZDG6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json index a963336c..d53213f2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "prt-dis", "parent": "prt-nam", + "ftype": "DIS6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml index 91a9b599..4ebac65a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "prt-dis" parent = "prt-nam" +ftype = "DIS6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml index 46460e4d..4ea4e4a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-dis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: prt-dis parent: prt-nam +ftype: DIS6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json index 65a1f322..33a4523d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "prt-disv", "parent": "prt-nam", + "ftype": "DISV6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml index d400c7bf..5f5b6088 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "prt-disv" parent = "prt-nam" +ftype = "DISV6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml index 3d9b17ff..3785f652 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-disv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: prt-disv parent: prt-nam +ftype: DISV6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.json index 123ad83b..dac4f580 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "prt-fmi", "parent": "prt-nam", + "ftype": "FMI6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.toml index 27f027c2..f5048887 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "prt-fmi" parent = "prt-nam" +ftype = "FMI6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.yaml index 38cf8977..0df3c3f1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-fmi.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: prt-fmi parent: prt-nam +ftype: FMI6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.json index 6d3bf059..0726348d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "prt-mip", "parent": "prt-nam", + "ftype": "MIP6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.toml index 2b81b644..5d41a321 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "prt-mip" parent = "prt-nam" +ftype = "MIP6" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.yaml index 46049f2d..61e59f27 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-mip.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: prt-mip parent: prt-nam +ftype: MIP6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json index 8e06c5d5..3e94190e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "prt-nam", "parent": "sim-nam", + "ftype": "PRT6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml index 513785b7..3151aeb8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev2" name = "prt-nam" parent = "sim-nam" +ftype = "PRT6" [blocks.options.fields.list] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml index 873c082e..3cf5343e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev2 name: prt-nam parent: sim-nam +ftype: PRT6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json index ad52aeb0..e20b3aa5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "prt-oc", "parent": "prt-nam", + "ftype": "OC6", "dims": { "ntracktimes": { "value": "ntracktimes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml index ceab5f52..60183047 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "prt-oc" parent = "prt-nam" +ftype = "OC6" [dims.ntracktimes] value = "ntracktimes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml index 52fb11ab..28421c15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: prt-oc parent: prt-nam +ftype: OC6 dims: ntracktimes: value: ntracktimes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json index b4402267..1580d010 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "prt-prp", "parent": "prt-nam", + "ftype": "PRP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml index 1ba9eddb..243bcf13 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "prt-prp" parent = "prt-nam" +ftype = "PRP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml index 7c9ca913..19942c62 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: prt-prp parent: prt-nam +ftype: PRP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.json index c8c14231..58b0b51a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "sim-tdis", "parent": "sim-nam", + "ftype": "TDIS6", "dims": { "nper": { "value": "nper", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.toml index c968f087..d3136867 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "sim-tdis" parent = "sim-nam" +ftype = "TDIS6" [dims.nper] value = "nper" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.yaml index 4d89770a..7fcb7f35 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-tdis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: sim-tdis parent: sim-nam +ftype: TDIS6 dims: nper: value: nper diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.json index 5df11938..c7f90c9d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.json @@ -3,5 +3,6 @@ "schema_version": "2.0.0.dev2", "name": "sln-ems", "parent": "sim-nam", + "ftype": "EMS6", "subtype": "solution" } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.toml index db426e83..ef6ac116 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.toml @@ -2,4 +2,5 @@ type = "package" schema_version = "2.0.0.dev2" name = "sln-ems" parent = "sim-nam" +ftype = "EMS6" subtype = "solution" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.yaml index a94088d8..c46fdbaa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ems.yaml @@ -2,4 +2,5 @@ type: package schema_version: 2.0.0.dev2 name: sln-ems parent: sim-nam +ftype: EMS6 subtype: solution diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json index 816755a9..28f3008e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "sln-ims", "parent": "sim-nam", + "ftype": "IMS6", "subtype": "solution", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml index bed1bab5..b93f9527 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "sln-ims" parent = "sim-nam" +ftype = "IMS6" subtype = "solution" [blocks.options.fields.print_option] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml index 1674de91..f27042a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: sln-ims parent: sim-nam +ftype: IMS6 subtype: solution blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.json index 3f03a81e..89631e69 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "sln-pts", "parent": "sim-nam", + "ftype": "PTS6", "subtype": "solution", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.toml index fef48e5b..7208be2c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "sln-pts" parent = "sim-nam" +ftype = "PTS6" subtype = "solution" [blocks.options.fields.print_option] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.yaml index 42da6409..7af1d81a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sln-pts.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: sln-pts parent: sim-nam +ftype: PTS6 subtype: solution blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json index fffba2f3..9cd380d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-cdb", "parent": "swf-nam", + "ftype": "CDB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml index 65811cdd..b77488ca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-cdb" parent = "swf-nam" +ftype = "CDB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml index ef0eb30a..09dcaf3f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-cdb parent: swf-nam +ftype: CDB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json index 737b1dcd..8ad76d36 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-chd", "parent": "swf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml index 1ef59f54..ba10bffb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-chd" parent = "swf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml index fa81d450..70981d24 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-chd parent: swf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.json index 0d3230d3..0695de62 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-cxs", "parent": "swf-nam", + "ftype": "CXS6", "dims": { "nsections": { "value": "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.toml index 904367c9..6ba87f05 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-cxs" parent = "swf-nam" +ftype = "CXS6" [dims.nsections] value = "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.yaml index bb154ae9..903c04ed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-cxs parent: swf-nam +ftype: CXS6 dims: nsections: value: nsections diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json index 2aaffe04..05749f98 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-dfw", "parent": "swf-nam", + "ftype": "DFW6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml index bdd80032..3f5a0444 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-dfw" parent = "swf-nam" +ftype = "DFW6" [blocks.options.fields.central_in_space] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml index 501c29c1..5df02455 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dfw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-dfw parent: swf-nam +ftype: DFW6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.json index 20f3d80e..99960b7e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-dis2d", "parent": "swf-nam", + "ftype": "DIS2D6", "dims": { "nrow": { "value": "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.toml index 618cefd7..c4a821fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-dis2d" parent = "swf-nam" +ftype = "DIS2D6" [dims.nrow] value = "nrow" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.yaml index bd12e585..1db50128 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-dis2d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-dis2d parent: swf-nam +ftype: DIS2D6 dims: nrow: value: nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.json index 10dd3446..2a3c0fa3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-disv1d", "parent": "swf-nam", + "ftype": "DISV1D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.toml index e3aecc57..9548c80e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-disv1d" parent = "swf-nam" +ftype = "DISV1D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.yaml index bee9abfe..26659458 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv1d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-disv1d parent: swf-nam +ftype: DISV1D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.json index 0351df0d..8a501c02 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-disv2d", "parent": "swf-nam", + "ftype": "DISV2D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.toml index 4f1ed4b6..0b463204 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-disv2d" parent = "swf-nam" +ftype = "DISV2D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.yaml index e0f7f85f..da743bb4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-disv2d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-disv2d parent: swf-nam +ftype: DISV2D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json index 730315b4..2df1cde3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-evp", "parent": "swf-nam", + "ftype": "EVP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml index b62d2a01..dd8a502c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-evp" parent = "swf-nam" +ftype = "EVP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml index 75afa01b..f2276a70 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-evp parent: swf-nam +ftype: EVP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json index bbf56104..1a4c8dfe 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-flw", "parent": "swf-nam", + "ftype": "FLW6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml index 065781a7..7b38facf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-flw" parent = "swf-nam" +ftype = "FLW6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml index 30db903a..b3eb3cfa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-flw parent: swf-nam +ftype: FLW6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.json index 1d8c5b80..454d41f1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-ic", "parent": "swf-nam", + "ftype": "IC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.toml index 0ad03d49..9ec4eb6f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-ic" parent = "swf-nam" +ftype = "IC6" [blocks.options.fields.export_array_ascii] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.yaml index 491bc870..516351e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-ic parent: swf-nam +ftype: IC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json index 250d4b62..0e406968 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-nam", "parent": "sim-nam", + "ftype": "SWF6", "dependent_variable": "stage", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml index 0c8bf203..920df1d8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev2" name = "swf-nam" parent = "sim-nam" +ftype = "SWF6" dependent_variable = "stage" [blocks.options.fields.list] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml index a776e97f..0e5bee30 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev2 name: swf-nam parent: sim-nam +ftype: SWF6 dependent_variable: stage blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.json index 68905d2c..8c14fcd6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-oc", "parent": "swf-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.toml index 5c67958f..4d75abb0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-oc" parent = "swf-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.yaml index 3e1485f1..0fc334d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-oc parent: swf-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json index 8fe10d6a..aa5a5eb0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-pcp", "parent": "swf-nam", + "ftype": "PCP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml index 7d4b0be1..e3fec434 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-pcp" parent = "swf-nam" +ftype = "PCP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml index cff1de88..422d720e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-pcp parent: swf-nam +ftype: PCP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.json index b0dd1bbc..ce4e8b95 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-sto", "parent": "swf-nam", + "ftype": "STO6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.toml index 8dc67fde..77483cd1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-sto" parent = "swf-nam" +ftype = "STO6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.yaml index 18b3d977..af22d975 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-sto.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-sto parent: swf-nam +ftype: STO6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json index 454a0f68..ac1a0a61 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "swf-zdg", "parent": "swf-nam", + "ftype": "ZDG6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml index 9a71114a..44b49f5c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "swf-zdg" parent = "swf-nam" +ftype = "ZDG6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml index bde5be38..ad886f9f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: swf-zdg parent: swf-nam +ftype: ZDG6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json index fad0ea0f..dc027709 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-ats", "parent": "sim-tdis", + "ftype": "ATS6", "subtype": "utility", "dims": { "maxats": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml index a9675c90..7bb6a4cc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-ats" parent = "sim-tdis" +ftype = "ATS6" subtype = "utility" [dims.maxats] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml index 1c8e9dbd..2711a4ce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-ats parent: sim-tdis +ftype: ATS6 subtype: utility dims: maxats: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.json index da11b809..adb450e7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-hpc", "parent": "sim-nam", + "ftype": "HPC6", "subtype": "utility", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.toml index 7804cc5a..137e3db9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-hpc" parent = "sim-nam" +ftype = "HPC6" subtype = "utility" [blocks.options.fields.print_table] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.yaml index bb54a24e..9ceeee3b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-hpc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-hpc parent: sim-nam +ftype: HPC6 subtype: utility blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json index 354351b9..a82324a2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-laktab", "parent": "gwf-lak", + "ftype": "LAKTAB6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml index d981f7a2..b6d35942 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-laktab" parent = "gwf-lak" +ftype = "LAKTAB6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml index 9dff493e..949bddf6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-laktab parent: gwf-lak +ftype: LAKTAB6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json index fae2d972..ec515779 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-ncf", "parent": "package", + "ftype": "NCF6", "subtype": "utility", "dims": { "ncpl": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml index 2ff1ad83..bc88b809 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-ncf" parent = "package" +ftype = "NCF6" subtype = "utility" [dims.ncpl] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml index 9cb9b693..3f3dc5c2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-ncf parent: package +ftype: NCF6 subtype: utility dims: ncpl: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json index c3e413fc..133305fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-obs", "parent": "package", + "ftype": "OBS6", "multi": true, "subtype": "utility", "blocks": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml index 7af9ed48..d879bfef 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-obs" parent = "package" +ftype = "OBS6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml index 4e3c8756..169f22d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-obs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-obs parent: package +ftype: OBS6 multi: true subtype: utility blocks: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json index abb90935..6f6849b5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-sfrtab", "parent": "gwf-sfr", + "ftype": "SFRTAB6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml index c9b29167..81c66353 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-sfrtab" parent = "gwf-sfr" +ftype = "SFRTAB6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml index 6a9f8bbf..6af74ce2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-sfrtab parent: gwf-sfr +ftype: SFRTAB6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json index 23db1bc9..135de0f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-spc", "parent": "package", + "ftype": "SPC6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml index 136e0318..b2935112 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-spc" parent = "package" +ftype = "SPC6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml index 7bb3a3c5..72f9b185 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-spc parent: package +ftype: SPC6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json index c50a227e..16dbbd7c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-spca", "parent": "package", + "ftype": "SPC6", "multi": true, "subtype": "utility", "blocks": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml index 34ecd023..90095a40 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-spca" parent = "package" +ftype = "SPC6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml index 454c891f..60fb6a48 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-spca parent: package +ftype: SPC6 multi: true subtype: utility blocks: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.json index 60c01470..62d2faf1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-tas", "parent": "package", + "ftype": "TAS6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.toml index 7f291b95..8a7b598f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-tas" parent = "package" +ftype = "TAS6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.yaml index 01829f17..90cc520b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-tas parent: package +ftype: TAS6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.json index 03dba193..506c676a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-ts", "parent": "package", + "ftype": "TS6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.toml index da867d36..20b021ca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-ts" parent = "package" +ftype = "TS6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.yaml index 485f6011..b77ad71c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ts.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-ts parent: package +ftype: TS6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json index 4a6eaa7f..fea0a063 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-tvk", "parent": "gwf-npf", + "ftype": "TVK6", "subtype": "utility", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml index 735c86f9..1a3800e9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-tvk" parent = "gwf-npf" +ftype = "TVK6" subtype = "utility" [blocks.options.fields.print_input] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml index 44f1e5f2..1efdc4e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvk.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-tvk parent: gwf-npf +ftype: TVK6 subtype: utility blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json index 12dab2a5..a2e580b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev2", "name": "utl-tvs", "parent": "gwf-sto", + "ftype": "TVS6", "subtype": "utility", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml index 69fa3788..d7a60842 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-tvs" parent = "gwf-sto" +ftype = "TVS6" subtype = "utility" [blocks.options.fields.disable_storage_change_integration] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml index c3239743..b420eed1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tvs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev2 name: utl-tvs parent: gwf-sto +ftype: TVS6 subtype: utility blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json index c8fe838e..d9463636 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-cdb", "parent": "chf-nam", + "ftype": "CDB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml index 7014e819..560541d1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-cdb" parent = "chf-nam" +ftype = "CDB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml index cd61e8f8..566631bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-cdb parent: chf-nam +ftype: CDB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json index e5a58b68..cce45ccf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-chd", "parent": "chf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml index 889ab35e..0c55331f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-chd" parent = "chf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml index 9bd088af..d01dc122 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-chd parent: chf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.json index d31dcac5..20517a99 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-cxs", "parent": "chf-nam", + "ftype": "CXS6", "dims": { "nsections": { "value": "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.toml index 8937e6c5..f68df92c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-cxs" parent = "chf-nam" +ftype = "CXS6" [dims.nsections] value = "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.yaml index c58287ed..0ba39749 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-cxs parent: chf-nam +ftype: CXS6 dims: nsections: value: nsections diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json index 32146650..eda9b60d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-dfw", "parent": "chf-nam", + "ftype": "DFW6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml index 87c91038..913c558a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-dfw" parent = "chf-nam" +ftype = "DFW6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml index 41207326..90f9d757 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-dfw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-dfw parent: chf-nam +ftype: DFW6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.json index 54f3c6d2..fe72222b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-disv1d", "parent": "chf-nam", + "ftype": "DISV1D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.toml index 9af3005c..1080820f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-disv1d" parent = "chf-nam" +ftype = "DISV1D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.yaml index 0c2993bd..cc9857fc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-disv1d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-disv1d parent: chf-nam +ftype: DISV1D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json index 0d0e9531..dbfce3c7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-evp", "parent": "chf-nam", + "ftype": "EVP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml index 62342893..c4db8416 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-evp" parent = "chf-nam" +ftype = "EVP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml index 75967b24..7693aa32 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-evp parent: chf-nam +ftype: EVP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json index e490cb34..b726ce41 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-flw", "parent": "chf-nam", + "ftype": "FLW6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml index a6fd97a4..e058ac60 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-flw" parent = "chf-nam" +ftype = "FLW6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml index 0bd6f5bb..40bef500 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-flw parent: chf-nam +ftype: FLW6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.json index 0ff6f734..ddefaeee 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-ic", "parent": "chf-nam", + "ftype": "IC6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.toml index 0de4a3be..d650d038 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-ic" parent = "chf-nam" +ftype = "IC6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.yaml index da7aeefd..4094873e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-ic parent: chf-nam +ftype: IC6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json index af52265c..11bccfda 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-nam", "parent": "sim-nam", + "ftype": "CHF6", "dependent_variable": "stage", "runtime_dims": { "nja": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml index d62191bf..6a3b15e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev3" name = "chf-nam" parent = "sim-nam" +ftype = "CHF6" dependent_variable = "stage" [runtime_dims.nja] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml index 20edd95f..c2350201 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev3 name: chf-nam parent: sim-nam +ftype: CHF6 dependent_variable: stage runtime_dims: nja: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.json index e47afe85..ac0ce655 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-oc", "parent": "chf-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.toml index 8a309562..fb4510c3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-oc" parent = "chf-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.yaml index 6a458c65..16149a3b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-oc parent: chf-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json index d1e43159..3f561a46 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-pcp", "parent": "chf-nam", + "ftype": "PCP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml index 3e5fd4c6..f940eb04 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-pcp" parent = "chf-nam" +ftype = "PCP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml index b30e60c5..c249ff5c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-pcp parent: chf-nam +ftype: PCP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.json index 4886db8b..ced76b7c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-sto", "parent": "chf-nam", + "ftype": "STO6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.toml index ac272764..f260f23a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-sto" parent = "chf-nam" +ftype = "STO6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.yaml index b86eb782..2dd20b14 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-sto.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-sto parent: chf-nam +ftype: STO6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json index bbc9d9fb..763473c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "chf-zdg", "parent": "chf-nam", + "ftype": "ZDG6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml index 79817c2f..593b6bb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "chf-zdg" parent = "chf-nam" +ftype = "ZDG6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml index fc97c3d6..f32d23d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: chf-zdg parent: chf-nam +ftype: ZDG6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json index cb542e27..caf2ae19 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "exg-chfgwf", "parent": "sim-nam", + "ftype": "CHF6-GWF6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml index 7a6cabe5..a517f13c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "exg-chfgwf" parent = "sim-nam" +ftype = "CHF6-GWF6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml index 5bbaf401..703fde46 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: exg-chfgwf parent: sim-nam +ftype: CHF6-GWF6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json index a415bd3e..ef48370b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "exg-gwegwe", "parent": "sim-nam", + "ftype": "GWE6-GWE6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml index 4c965561..cd0fc48b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "exg-gwegwe" parent = "sim-nam" +ftype = "GWE6-GWE6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml index e80f57ba..57cbcb72 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: exg-gwegwe parent: sim-nam +ftype: GWE6-GWE6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.json index 82ab6553..84441358 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.json @@ -3,5 +3,6 @@ "schema_version": "2.0.0.dev3", "name": "exg-gwfgwe", "parent": "sim-nam", + "ftype": "GWF6-GWE6", "subtype": "exchange" } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.toml index 33698e71..937210bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.toml @@ -2,4 +2,5 @@ type = "package" schema_version = "2.0.0.dev3" name = "exg-gwfgwe" parent = "sim-nam" +ftype = "GWF6-GWE6" subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.yaml index 8953b8d2..febe5521 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwe.yaml @@ -2,4 +2,5 @@ type: package schema_version: 2.0.0.dev3 name: exg-gwfgwe parent: sim-nam +ftype: GWF6-GWE6 subtype: exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json index 4610c868..4d920e2f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "exg-gwfgwf", "parent": "sim-nam", + "ftype": "GWF6-GWF6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml index 546110d4..9e862441 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "exg-gwfgwf" parent = "sim-nam" +ftype = "GWF6-GWF6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml index cd20a0dc..3d1716a7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: exg-gwfgwf parent: sim-nam +ftype: GWF6-GWF6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.json index 46dbfc30..bc5a0a97 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.json @@ -3,5 +3,6 @@ "schema_version": "2.0.0.dev3", "name": "exg-gwfgwt", "parent": "sim-nam", + "ftype": "GWF6-GWT6", "subtype": "exchange" } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.toml index 40c5138f..7edb54fa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.toml @@ -2,4 +2,5 @@ type = "package" schema_version = "2.0.0.dev3" name = "exg-gwfgwt" parent = "sim-nam" +ftype = "GWF6-GWT6" subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.yaml index dfcca465..293aa02e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwt.yaml @@ -2,4 +2,5 @@ type: package schema_version: 2.0.0.dev3 name: exg-gwfgwt parent: sim-nam +ftype: GWF6-GWT6 subtype: exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.json index 7184180f..4a6daa1e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.json @@ -3,5 +3,6 @@ "schema_version": "2.0.0.dev3", "name": "exg-gwfprt", "parent": "sim-nam", + "ftype": "GWF6-PRT6", "subtype": "exchange" } \ No newline at end of file diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.toml index 83fcaeb4..02148582 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.toml @@ -2,4 +2,5 @@ type = "package" schema_version = "2.0.0.dev3" name = "exg-gwfprt" parent = "sim-nam" +ftype = "GWF6-PRT6" subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.yaml index dad706b8..63e7eefb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfprt.yaml @@ -2,4 +2,5 @@ type: package schema_version: 2.0.0.dev3 name: exg-gwfprt parent: sim-nam +ftype: GWF6-PRT6 subtype: exchange diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json index 3515e11a..f3e52343 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "exg-gwtgwt", "parent": "sim-nam", + "ftype": "GWT6-GWT6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml index dd7f38cf..5e68a92e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "exg-gwtgwt" parent = "sim-nam" +ftype = "GWT6-GWT6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml index a14f34de..8774294f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: exg-gwtgwt parent: sim-nam +ftype: GWT6-GWT6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json index 7baef565..201e5be3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "exg-olfgwf", "parent": "sim-nam", + "ftype": "OLF6-GWF6", "multi": true, "subtype": "exchange", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml index 76bd30c8..bf750af0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "exg-olfgwf" parent = "sim-nam" +ftype = "OLF6-GWF6" multi = true subtype = "exchange" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml index b5f8c6c1..193f5c46 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: exg-olfgwf parent: sim-nam +ftype: OLF6-GWF6 multi: true subtype: exchange dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.json index ffd67a7f..42116ab7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-adv", "parent": "gwe-nam", + "ftype": "ADV6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.toml index 892d3f3c..d0bf73c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-adv" parent = "gwe-nam" +ftype = "ADV6" [blocks.options.fields.scheme] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.yaml index ca1b348a..a607e093 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-adv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-adv parent: gwe-nam +ftype: ADV6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.json index 17fb33e1..1cf9d214 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-cnd", "parent": "gwe-nam", + "ftype": "CND6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.toml index b150a6bd..2d02f2af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-cnd" parent = "gwe-nam" +ftype = "CND6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.yaml index 0e52911c..d2d680a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-cnd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-cnd parent: gwe-nam +ftype: CND6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json index de110dd1..93389f7e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-ctp", "parent": "gwe-nam", + "ftype": "CTP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml index 693b7360..b34c3bae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-ctp" parent = "gwe-nam" +ftype = "CTP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml index 62ef057a..d89c9f09 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-ctp parent: gwe-nam +ftype: CTP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json index 10453f2a..075375dc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-dis", "parent": "gwe-nam", + "ftype": "DIS6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml index f421e532..d006ba9c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-dis" parent = "gwe-nam" +ftype = "DIS6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml index 12f7c634..56a6a467 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-dis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-dis parent: gwe-nam +ftype: DIS6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.json index fe4e927a..0dc876fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-disu", "parent": "gwe-nam", + "ftype": "DISU6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.toml index d4c449f8..0a151ee0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-disu" parent = "gwe-nam" +ftype = "DISU6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.yaml index 285ae8d2..a9a7ea08 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disu.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-disu parent: gwe-nam +ftype: DISU6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json index b940d62e..be45132a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-disv", "parent": "gwe-nam", + "ftype": "DISV6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml index 71e5cd10..886ae947 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-disv" parent = "gwe-nam" +ftype = "DISV6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml index 898bc79b..c675536c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-disv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-disv parent: gwe-nam +ftype: DISV6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json index 9442b761..35ab8587 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-esl", "parent": "gwe-nam", + "ftype": "ESL6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml index c896787c..822c6cb0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-esl" parent = "gwe-nam" +ftype = "ESL6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml index 533c7fde..d9a0b92c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-esl parent: gwe-nam +ftype: ESL6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.json index 066ad3c0..ea1caf22 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-est", "parent": "gwe-nam", + "ftype": "EST6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.toml index b31a44e4..5d35f4bc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-est" parent = "gwe-nam" +ftype = "EST6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.yaml index c83e7b84..f2b04114 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-est.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-est parent: gwe-nam +ftype: EST6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.json index f2afcf4e..893056f1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-fmi", "parent": "gwe-nam", + "ftype": "FMI6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.toml index 86c0d2eb..00c40c4a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-fmi" parent = "gwe-nam" +ftype = "FMI6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.yaml index 619c90e2..547ce082 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-fmi.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-fmi parent: gwe-nam +ftype: FMI6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.json index 7c781f84..0e05ac24 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-ic", "parent": "gwe-nam", + "ftype": "IC6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.toml index 816ec519..3a6380c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-ic" parent = "gwe-nam" +ftype = "IC6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.yaml index 7525bc2d..0702f293 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-ic parent: gwe-nam +ftype: IC6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json index 8d8a5201..d104907e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-lke", "parent": "gwe-nam", + "ftype": "LKE6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml index 3ff6aee0..b7cfcd55 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-lke" parent = "gwe-nam" +ftype = "LKE6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml index 98613c81..6c6f303f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-lke.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-lke parent: gwe-nam +ftype: LKE6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.json index 83a333d5..a3388e93 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.json @@ -2,6 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "gwe-mve", + "ftype": "MVE6", "parent": [ "exg-gwegwe", "gwe-nam" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.toml index 1595e31b..d9db4401 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.toml @@ -1,6 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-mve" +ftype = "MVE6" parent = [ "exg-gwegwe", "gwe-nam", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.yaml index 10313286..db75361c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mve.yaml @@ -1,6 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-mve +ftype: MVE6 parent: - exg-gwegwe - gwe-nam diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json index 7f1f430e..e205d93e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-mwe", "parent": "gwe-nam", + "ftype": "MWE6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml index ae50c3f0..a9502f4c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-mwe" parent = "gwe-nam" +ftype = "MWE6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml index d2f4454f..2154e425 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-mwe.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-mwe parent: gwe-nam +ftype: MWE6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json index 8ffc54d2..6c1f679a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-nam", "parent": "sim-nam", + "ftype": "GWE6", "dependent_variable": "temperature", "runtime_dims": { "nja": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml index 543c1b97..9efc472c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev3" name = "gwe-nam" parent = "sim-nam" +ftype = "GWE6" dependent_variable = "temperature" [runtime_dims.nja] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml index 852c1ef3..604363ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev3 name: gwe-nam parent: sim-nam +ftype: GWE6 dependent_variable: temperature runtime_dims: nja: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.json index b9f13e2f..7085d4fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-oc", "parent": "gwe-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.toml index e3c82ede..33606751 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-oc" parent = "gwe-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.yaml index c1ab9dc3..deace0b2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-oc parent: gwe-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json index 61c33c58..a0df9c2f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-sfe", "parent": "gwe-nam", + "ftype": "SFE6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml index 969cb629..497d0364 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-sfe" parent = "gwe-nam" +ftype = "SFE6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml index a68c0233..1acb015e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-sfe.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-sfe parent: gwe-nam +ftype: SFE6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.json index 83f10f88..c60d4c1e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-ssm", "parent": "gwe-nam", + "ftype": "SSM6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.toml index 042adfd4..ba73879a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-ssm" parent = "gwe-nam" +ftype = "SSM6" [blocks.options.fields.print_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.yaml index f6c0f630..2885dcf1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ssm.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-ssm parent: gwe-nam +ftype: SSM6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json index e245635b..34e4922d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwe-uze", "parent": "gwe-nam", + "ftype": "UZE6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml index b3529cff..8ad3f953 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwe-uze" parent = "gwe-nam" +ftype = "UZE6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml index 21d19e9c..52bed8ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-uze.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwe-uze parent: gwe-nam +ftype: UZE6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json index db71a73c..235535cc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-api", "parent": "gwf-nam", + "ftype": "API6", "multi": true, "dims": { "maxbound": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml index f85daa3a..23bc645a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-api" parent = "gwf-nam" +ftype = "API6" multi = true [dims.maxbound] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml index cfa8d488..d52574b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-api parent: gwf-nam +ftype: API6 multi: true dims: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json index 6762cd61..e5f7a9bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-buy", "parent": "gwf-nam", + "ftype": "BUY6", "dims": { "nrhospecies": { "value": "nrhospecies" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml index a65cb5ff..198e62f8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-buy" parent = "gwf-nam" +ftype = "BUY6" [dims.nrhospecies] value = "nrhospecies" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml index a5f547f5..e0ad2e46 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-buy parent: gwf-nam +ftype: BUY6 dims: nrhospecies: value: nrhospecies diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json index 784335a0..e8bafef8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-chd", "parent": "gwf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml index 24278db2..0ddc9b70 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-chd" parent = "gwf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml index 1d06058a..d526faad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-chd parent: gwf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json index a2e062bc..21ef3126 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-chdg", "parent": "gwf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml index a8adb627..1a864549 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-chdg" parent = "gwf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml index 5aefa1b0..02b278e9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-chdg parent: gwf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json index 2e3bd480..1716a9c2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-csub", "parent": "gwf-nam", + "ftype": "CSUB6", "dims": { "ninterbeds": { "value": "ninterbeds" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml index cd92eaf0..612eca81 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-csub" parent = "gwf-nam" +ftype = "CSUB6" [dims.ninterbeds] value = "ninterbeds" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml index 710e2277..e0ebbab2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-csub parent: gwf-nam +ftype: CSUB6 dims: ninterbeds: value: ninterbeds diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json index f01b73e3..d621bc22 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-dis", "parent": "gwf-nam", + "ftype": "DIS6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml index 6e74f857..ea4b4969 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-dis" parent = "gwf-nam" +ftype = "DIS6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml index 545b0fdc..e3d15d24 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-dis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-dis parent: gwf-nam +ftype: DIS6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.json index c4b502a7..b97e91fa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-disu", "parent": "gwf-nam", + "ftype": "DISU6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.toml index 21640548..8efa9741 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-disu" parent = "gwf-nam" +ftype = "DISU6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.yaml index f2ccfe22..f9680d4d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disu.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-disu parent: gwf-nam +ftype: DISU6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json index 312edb53..bd6e3d02 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-disv", "parent": "gwf-nam", + "ftype": "DISV6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml index 4b8af02f..19abc267 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-disv" parent = "gwf-nam" +ftype = "DISV6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml index 92a7ba05..542ec517 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-disv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-disv parent: gwf-nam +ftype: DISV6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json index 9fde056e..efb00ac2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-drn", "parent": "gwf-nam", + "ftype": "DRN6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml index 63e14b08..f5a3a2d8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-drn" parent = "gwf-nam" +ftype = "DRN6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml index 6837c8a2..834f46ad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-drn parent: gwf-nam +ftype: DRN6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json index 90a78675..c3aa4c66 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-drng", "parent": "gwf-nam", + "ftype": "DRN6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml index 965b7c61..9e59d1ed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-drng" parent = "gwf-nam" +ftype = "DRN6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml index 740c3dd3..3f50220e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-drng parent: gwf-nam +ftype: DRN6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json index e6fdd811..64bb8377 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-evt", "parent": "gwf-nam", + "ftype": "EVT6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml index d49a6b92..69e10ecf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-evt" parent = "gwf-nam" +ftype = "EVT6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml index e04828c4..3e31b32f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-evt parent: gwf-nam +ftype: EVT6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json index 2181013a..5f517620 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-evta", "parent": "gwf-nam", + "ftype": "EVT6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml index 45a8975e..1193a834 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-evta" parent = "gwf-nam" +ftype = "EVT6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml index 04e767cc..8b3203db 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evta.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-evta parent: gwf-nam +ftype: EVT6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json index e22fa3ff..5f6e6d9e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-ghb", "parent": "gwf-nam", + "ftype": "GHB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml index 40ae8f27..3dd305d8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-ghb" parent = "gwf-nam" +ftype = "GHB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml index d737a43c..29c410dd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-ghb parent: gwf-nam +ftype: GHB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json index 99d8f215..4501d814 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-ghbg", "parent": "gwf-nam", + "ftype": "GHB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml index 4ff8836c..1ee3341f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-ghbg" parent = "gwf-nam" +ftype = "GHB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml index d7776b73..a96ae5b9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-ghbg parent: gwf-nam +ftype: GHB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json index 9db29c86..ca492e93 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json @@ -2,6 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "gwf-gnc", + "ftype": "GNC6", "parent": [ "exg-gwfgwf", "gwf-nam" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml index d6be8392..61f76cc3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml @@ -1,6 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-gnc" +ftype = "GNC6" parent = [ "exg-gwfgwf", "gwf-nam", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml index e8c46f4e..5427158f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml @@ -1,6 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-gnc +ftype: GNC6 parent: - exg-gwfgwf - gwf-nam diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json index 2bf8791f..059997eb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-hfb", "parent": "gwf-nam", + "ftype": "HFB6", "dims": { "maxhfb": { "value": "maxhfb" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml index fa987b80..6144a85f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-hfb" parent = "gwf-nam" +ftype = "HFB6" [dims.maxhfb] value = "maxhfb" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml index 1f081d6d..7f914904 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-hfb parent: gwf-nam +ftype: HFB6 dims: maxhfb: value: maxhfb diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.json index c258cd8d..a7ec3c67 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-ic", "parent": "gwf-nam", + "ftype": "IC6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.toml index 4a564cf4..4884980b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-ic" parent = "gwf-nam" +ftype = "IC6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.yaml index 0e736932..450bb673 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-ic parent: gwf-nam +ftype: IC6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json index aa38753a..ef6ea488 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-lak", "parent": "gwf-nam", + "ftype": "LAK6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml index 6efb99e8..09eadcf6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-lak" parent = "gwf-nam" +ftype = "LAK6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml index a0ebd137..decf60fb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-lak parent: gwf-nam +ftype: LAK6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json index 861dd339..b5c07be7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-maw", "parent": "gwf-nam", + "ftype": "MAW6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml index dd84aca3..e633003f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-maw" parent = "gwf-nam" +ftype = "MAW6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml index 6cce928c..40738e1a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-maw parent: gwf-nam +ftype: MAW6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json index 1a50e9aa..b7df88ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json @@ -2,6 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "gwf-mvr", + "ftype": "MVR6", "parent": [ "exg-gwfgwf", "gwf-nam" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml index ad6f1e02..ed55cb90 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml @@ -1,6 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-mvr" +ftype = "MVR6" parent = [ "exg-gwfgwf", "gwf-nam", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml index fb098234..4ed491a9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml @@ -1,6 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-mvr +ftype: MVR6 parent: - exg-gwfgwf - gwf-nam diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json index ef5f1d48..283f7891 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-nam", "parent": "sim-nam", + "ftype": "GWF6", "dependent_variable": "head", "runtime_dims": { "nja": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml index 025d9047..4b2e3280 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev3" name = "gwf-nam" parent = "sim-nam" +ftype = "GWF6" dependent_variable = "head" [runtime_dims.nja] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml index e5d15186..678d456a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev3 name: gwf-nam parent: sim-nam +ftype: GWF6 dependent_variable: head runtime_dims: nja: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json index 7502e972..09178049 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-npf", "parent": "gwf-nam", + "ftype": "NPF6", "runtime_dims": { "njas": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml index daee5cb2..75f79fb3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-npf" parent = "gwf-nam" +ftype = "NPF6" [runtime_dims.njas] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml index b22f2b3f..de1456d8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-npf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-npf parent: gwf-nam +ftype: NPF6 runtime_dims: njas: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.json index bfe56023..995b8975 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-oc", "parent": "gwf-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.toml index 766f67f8..68a3aed5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-oc" parent = "gwf-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.yaml index b8de4a7c..92ba57e0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-oc parent: gwf-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json index b157e106..291c2c89 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-rch", "parent": "gwf-nam", + "ftype": "RCH6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml index 8f1915ae..3c23d0cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-rch" parent = "gwf-nam" +ftype = "RCH6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml index f919d87c..acc180cc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-rch parent: gwf-nam +ftype: RCH6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json index a487bb87..fff530d7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-rcha", "parent": "gwf-nam", + "ftype": "RCH6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml index 3f7936fb..e015fb54 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-rcha" parent = "gwf-nam" +ftype = "RCH6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml index c6df8692..67f1f062 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rcha.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-rcha parent: gwf-nam +ftype: RCH6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json index 51741992..1cafa539 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-riv", "parent": "gwf-nam", + "ftype": "RIV6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml index 80a67eb9..14d31586 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-riv" parent = "gwf-nam" +ftype = "RIV6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml index 2aff6dd2..dd530ee2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-riv parent: gwf-nam +ftype: RIV6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json index 67cdc031..e3f96fb6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-rivg", "parent": "gwf-nam", + "ftype": "RIV6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml index 47218b6b..cffe3dfc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-rivg" parent = "gwf-nam" +ftype = "RIV6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml index 9b86996f..7be0aa41 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-rivg parent: gwf-nam +ftype: RIV6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json index e2e923a0..dcbb6720 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-sfr", "parent": "gwf-nam", + "ftype": "SFR6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml index 42605e1a..1f50922f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-sfr" parent = "gwf-nam" +ftype = "SFR6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml index 731a41cf..f0f98ec5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-sfr parent: gwf-nam +ftype: SFR6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json index d10365ef..a078567b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-sto", "parent": "gwf-nam", + "ftype": "STO6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml index 9db1fedb..2ecdafbf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-sto" parent = "gwf-nam" +ftype = "STO6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml index 8f492bf0..f3fec19e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sto.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-sto parent: gwf-nam +ftype: STO6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json index 68d44a73..60a27947 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-uzf", "parent": "gwf-nam", + "ftype": "UZF6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml index 2fae01aa..2d48df10 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-uzf" parent = "gwf-nam" +ftype = "UZF6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml index 17052735..ad89b5b0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-uzf parent: gwf-nam +ftype: UZF6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.json index eb4706c0..788e05e7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-vsc", "parent": "gwf-nam", + "ftype": "VSC6", "dims": { "nviscspecies": { "value": "nviscspecies" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.toml index c688c6ec..f44829d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-vsc" parent = "gwf-nam" +ftype = "VSC6" [dims.nviscspecies] value = "nviscspecies" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.yaml index 19c300b7..34772a83 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-vsc parent: gwf-nam +ftype: VSC6 dims: nviscspecies: value: nviscspecies diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json index a45195a6..67b8f92a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-wel", "parent": "gwf-nam", + "ftype": "WEL6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml index c9b4fe2d..1c5d9589 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-wel" parent = "gwf-nam" +ftype = "WEL6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml index 6c4d0b32..cca0a0a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-wel parent: gwf-nam +ftype: WEL6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json index bb7de570..6750148e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwf-welg", "parent": "gwf-nam", + "ftype": "WEL6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml index c05e97ab..f0c5489f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwf-welg" parent = "gwf-nam" +ftype = "WEL6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml index ba4481f6..3272797d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwf-welg parent: gwf-nam +ftype: WEL6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.json index ab992b07..b34997c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-adv", "parent": "gwt-nam", + "ftype": "ADV6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.toml index 18bfa473..9b87594d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-adv" parent = "gwt-nam" +ftype = "ADV6" [blocks.options.fields.scheme] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.yaml index ba5341f2..e00a53c9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-adv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-adv parent: gwt-nam +ftype: ADV6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json index 3a8f617d..1d6c1def 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-api", "parent": "gwt-nam", + "ftype": "API6", "multi": true, "dims": { "maxbound": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml index 416c6e4e..58b0483d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-api" parent = "gwt-nam" +ftype = "API6" multi = true [dims.maxbound] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml index 5b9fdf58..94997ac8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-api parent: gwt-nam +ftype: API6 multi: true dims: maxbound: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json index 5990d9b6..17da5f4b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-cnc", "parent": "gwt-nam", + "ftype": "CNC6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml index 9eddc548..b28213c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-cnc" parent = "gwt-nam" +ftype = "CNC6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml index 435660ac..2d206a27 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-cnc parent: gwt-nam +ftype: CNC6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json index 5c0b1367..d9d9a909 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-dis", "parent": "gwt-nam", + "ftype": "DIS6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml index 294446f9..49a4cd66 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-dis" parent = "gwt-nam" +ftype = "DIS6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml index 4cc18590..2229455e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-dis parent: gwt-nam +ftype: DIS6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.json index 7c9c9a2c..3040e452 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-disu", "parent": "gwt-nam", + "ftype": "DISU6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.toml index cfbef4d7..e6c4c7f1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-disu" parent = "gwt-nam" +ftype = "DISU6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.yaml index 44a22ab8..73224f31 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disu.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-disu parent: gwt-nam +ftype: DISU6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json index ebb5092c..2c68c430 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-disv", "parent": "gwt-nam", + "ftype": "DISV6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml index 92b328ff..f5db0607 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-disv" parent = "gwt-nam" +ftype = "DISV6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml index ca8cc40f..09060fff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-disv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-disv parent: gwt-nam +ftype: DISV6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.json index 6747c6a1..835bd826 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-dsp", "parent": "gwt-nam", + "ftype": "DSP6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.toml index fbf45fa0..a0d840b0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-dsp" parent = "gwt-nam" +ftype = "DSP6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.yaml index be16a639..47a9a56b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-dsp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-dsp parent: gwt-nam +ftype: DSP6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.json index 0fcb24c4..f775d293 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-fmi", "parent": "gwt-nam", + "ftype": "FMI6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.toml index 77c38b84..56aabd22 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-fmi" parent = "gwt-nam" +ftype = "FMI6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.yaml index b0df67cb..20dd54d4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-fmi.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-fmi parent: gwt-nam +ftype: FMI6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.json index a21146c9..d409ac09 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-ic", "parent": "gwt-nam", + "ftype": "IC6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.toml index 59f91cd0..576050a9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-ic" parent = "gwt-nam" +ftype = "IC6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.yaml index 0ae458d6..16728726 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-ic parent: gwt-nam +ftype: IC6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.json index 52b4a494..ac90b123 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-ist", "parent": "gwt-nam", + "ftype": "IST6", "multi": true, "runtime_dims": { "nodes": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.toml index 3856ba5f..1ff5c943 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-ist" parent = "gwt-nam" +ftype = "IST6" multi = true [runtime_dims.nodes] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.yaml index 9154d2d0..bd2e49b1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ist.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-ist parent: gwt-nam +ftype: IST6 multi: true runtime_dims: nodes: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json index ff10ec40..365a6eb8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-lkt", "parent": "gwt-nam", + "ftype": "LKT6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml index 3e92c6c1..315ff2e4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-lkt" parent = "gwt-nam" +ftype = "LKT6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml index bb487287..f042f9df 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-lkt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-lkt parent: gwt-nam +ftype: LKT6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.json index 41de8948..f0ca6cdd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-mst", "parent": "gwt-nam", + "ftype": "MST6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.toml index 74984e3a..24be6f58 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-mst" parent = "gwt-nam" +ftype = "MST6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.yaml index 5631a91e..ad0a24b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mst.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-mst parent: gwt-nam +ftype: MST6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.json index d035ab71..b26b565f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.json @@ -2,6 +2,7 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "gwt-mvt", + "ftype": "MVT6", "parent": [ "exg-gwtgwt", "gwt-nam" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.toml index 5bbe6ffd..f0ab1920 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.toml @@ -1,6 +1,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-mvt" +ftype = "MVT6" parent = [ "exg-gwtgwt", "gwt-nam", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.yaml index b1a1a9cd..fe454e35 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mvt.yaml @@ -1,6 +1,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-mvt +ftype: MVT6 parent: - exg-gwtgwt - gwt-nam diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json index 77c9a58c..28970c7b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-mwt", "parent": "gwt-nam", + "ftype": "MWT6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml index 40b23084..2f20d3b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-mwt" parent = "gwt-nam" +ftype = "MWT6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml index a57b4699..1639a729 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-mwt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-mwt parent: gwt-nam +ftype: MWT6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json index 6c0b3065..0b1342f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-nam", "parent": "sim-nam", + "ftype": "GWT6", "dependent_variable": "concentration", "runtime_dims": { "nja": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml index f3985824..e1518384 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev3" name = "gwt-nam" parent = "sim-nam" +ftype = "GWT6" dependent_variable = "concentration" [runtime_dims.nja] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml index 68ab9e19..883b8401 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev3 name: gwt-nam parent: sim-nam +ftype: GWT6 dependent_variable: concentration runtime_dims: nja: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.json index 4b5d16e5..576c980f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-oc", "parent": "gwt-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.toml index 27b085be..e3c50cff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-oc" parent = "gwt-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.yaml index e7477448..329847a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-oc parent: gwt-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json index 97575f09..a847b037 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-sft", "parent": "gwt-nam", + "ftype": "SFT6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml index fc46caaf..a0342685 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-sft" parent = "gwt-nam" +ftype = "SFT6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml index 03b2e085..13bbac1b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-sft.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-sft parent: gwt-nam +ftype: SFT6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json index e0285d11..a84aeba6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-src", "parent": "gwt-nam", + "ftype": "SRC6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml index 32e47b20..57078a9b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-src" parent = "gwt-nam" +ftype = "SRC6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml index 94b0240b..4958eba1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-src parent: gwt-nam +ftype: SRC6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.json index 7423c3b3..eb432d41 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-ssm", "parent": "gwt-nam", + "ftype": "SSM6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.toml index c5ab9dd9..35c5a89d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-ssm" parent = "gwt-nam" +ftype = "SSM6" [blocks.options.fields.print_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.yaml index b7b980b5..e4688a87 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-ssm.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-ssm parent: gwt-nam +ftype: SSM6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json index 84138db0..feac2831 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "gwt-uzt", "parent": "gwt-nam", + "ftype": "UZT6", "multi": true, "subtype": "advanced", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml index d4f78827..016434a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "gwt-uzt" parent = "gwt-nam" +ftype = "UZT6" multi = true subtype = "advanced" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml index ed658832..ba0ea976 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-uzt.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: gwt-uzt parent: gwt-nam +ftype: UZT6 multi: true subtype: advanced dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json index 6f5415ec..90d5aa62 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-cdb", "parent": "olf-nam", + "ftype": "CDB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml index b14d9a80..4a48d23a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-cdb" parent = "olf-nam" +ftype = "CDB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml index 6c32f4fe..3499950a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-cdb parent: olf-nam +ftype: CDB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json index d3829d65..95515e97 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-chd", "parent": "olf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml index 75082878..db75bfbb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-chd" parent = "olf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml index 280723d1..c2fd4928 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-chd parent: olf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.json index a571c5a0..867fc149 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-cxs", "parent": "olf-nam", + "ftype": "CXS6", "dims": { "nsections": { "value": "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.toml index 7097e221..f43bca8a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-cxs" parent = "olf-nam" +ftype = "CXS6" [dims.nsections] value = "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.yaml index 9d65f451..d6885740 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-cxs parent: olf-nam +ftype: CXS6 dims: nsections: value: nsections diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json index 9ebb4046..8899ec4a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-dfw", "parent": "olf-nam", + "ftype": "DFW6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml index 0a364358..6e0e358e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-dfw" parent = "olf-nam" +ftype = "DFW6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml index f5af52e1..5bf91695 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dfw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-dfw parent: olf-nam +ftype: DFW6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.json index 45e634c0..1afa0490 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-dis2d", "parent": "olf-nam", + "ftype": "DIS2D6", "dims": { "nrow": { "value": "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.toml index ac54cb1a..943f10b9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-dis2d" parent = "olf-nam" +ftype = "DIS2D6" [dims.nrow] value = "nrow" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.yaml index 8aaac3f8..b95fbcb3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-dis2d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-dis2d parent: olf-nam +ftype: DIS2D6 dims: nrow: value: nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.json index 549fe875..c214db90 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-disv1d", "parent": "olf-nam", + "ftype": "DISV1D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.toml index 741ee7e6..9f592c7d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-disv1d" parent = "olf-nam" +ftype = "DISV1D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.yaml index 9562cbc5..b2a21bb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv1d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-disv1d parent: olf-nam +ftype: DISV1D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.json index 80a8fb40..76f01802 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-disv2d", "parent": "olf-nam", + "ftype": "DISV2D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.toml index 116cfa5f..175cadf3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-disv2d" parent = "olf-nam" +ftype = "DISV2D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.yaml index ec3f9eba..b0f94f64 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-disv2d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-disv2d parent: olf-nam +ftype: DISV2D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json index 36358286..ea878c70 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-evp", "parent": "olf-nam", + "ftype": "EVP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml index 2b27021c..0134f246 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-evp" parent = "olf-nam" +ftype = "EVP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml index cfdbd6c0..b9f89752 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-evp parent: olf-nam +ftype: EVP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json index 9069d630..38a83789 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-flw", "parent": "olf-nam", + "ftype": "FLW6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml index 6db086f7..e46420e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-flw" parent = "olf-nam" +ftype = "FLW6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml index a8c6e69f..e39a7d2e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-flw parent: olf-nam +ftype: FLW6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.json index da92aa01..caf9d687 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-ic", "parent": "olf-nam", + "ftype": "IC6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.toml index f16c0aff..a80042d0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-ic" parent = "olf-nam" +ftype = "IC6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.yaml index e17ae6c4..03e604aa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-ic parent: olf-nam +ftype: IC6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json index 5418002a..d125edaa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-nam", "parent": "sim-nam", + "ftype": "OLF6", "dependent_variable": "stage", "runtime_dims": { "nja": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml index 6b5f73b6..77910fd9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev3" name = "olf-nam" parent = "sim-nam" +ftype = "OLF6" dependent_variable = "stage" [runtime_dims.nja] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml index ff0ee5e2..9ff6d4ec 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev3 name: olf-nam parent: sim-nam +ftype: OLF6 dependent_variable: stage runtime_dims: nja: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.json index 09ed671a..577599bd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-oc", "parent": "olf-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.toml index fe3d1492..5abf055e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-oc" parent = "olf-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.yaml index 7e66ed6c..19fe88d2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-oc parent: olf-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json index 0f8f5744..1ec3996d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-pcp", "parent": "olf-nam", + "ftype": "PCP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml index 817dd642..1ffaa5e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-pcp" parent = "olf-nam" +ftype = "PCP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml index dfdedac6..656ad9ea 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-pcp parent: olf-nam +ftype: PCP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.json index f4a3efee..f5259a9a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-sto", "parent": "olf-nam", + "ftype": "STO6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.toml index 8b23dc74..67f9fda2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-sto" parent = "olf-nam" +ftype = "STO6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.yaml index 6f193da7..a4e6f204 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-sto.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-sto parent: olf-nam +ftype: STO6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json index 49b53dc6..e064745d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "olf-zdg", "parent": "olf-nam", + "ftype": "ZDG6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml index b2c460f7..233c0814 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "olf-zdg" parent = "olf-nam" +ftype = "ZDG6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml index ecbbcfdd..b03ad3de 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: olf-zdg parent: olf-nam +ftype: ZDG6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json index c74c9c27..96107f10 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "prt-dis", "parent": "prt-nam", + "ftype": "DIS6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml index 287466ea..b06e78e9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "prt-dis" parent = "prt-nam" +ftype = "DIS6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml index 69fcaf3b..60784382 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-dis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: prt-dis parent: prt-nam +ftype: DIS6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json index de4c8ca4..c36ba1bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "prt-disv", "parent": "prt-nam", + "ftype": "DISV6", "dims": { "nlay": { "value": "nlay", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml index 4bc96244..5816993a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "prt-disv" parent = "prt-nam" +ftype = "DISV6" [dims.nlay] value = "nlay" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml index 70fb7dfb..a2b3d262 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-disv.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: prt-disv parent: prt-nam +ftype: DISV6 dims: nlay: value: nlay diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.json index 40861754..52703edc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "prt-fmi", "parent": "prt-nam", + "ftype": "FMI6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.toml index cad51fcc..91885393 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "prt-fmi" parent = "prt-nam" +ftype = "FMI6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.yaml index 269389e3..993ced23 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-fmi.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: prt-fmi parent: prt-nam +ftype: FMI6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.json index cf1d91c8..e0978a29 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "prt-mip", "parent": "prt-nam", + "ftype": "MIP6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.toml index 10f3b6a2..e5155fa1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "prt-mip" parent = "prt-nam" +ftype = "MIP6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.yaml index 963e4b3b..8b676028 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-mip.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: prt-mip parent: prt-nam +ftype: MIP6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json index c796e061..1d91ad47 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "prt-nam", "parent": "sim-nam", + "ftype": "PRT6", "runtime_dims": { "nja": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml index 14a5d310..42ef8247 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev3" name = "prt-nam" parent = "sim-nam" +ftype = "PRT6" [runtime_dims.nja] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml index 3f0f75cd..a4c9e9c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev3 name: prt-nam parent: sim-nam +ftype: PRT6 runtime_dims: nja: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json index 3bd61e7d..9d95e5ec 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "prt-oc", "parent": "prt-nam", + "ftype": "OC6", "dims": { "ntracktimes": { "value": "ntracktimes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml index fe92900f..15ddddb3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "prt-oc" parent = "prt-nam" +ftype = "OC6" [dims.ntracktimes] value = "ntracktimes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml index ffd3146f..1f392556 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: prt-oc parent: prt-nam +ftype: OC6 dims: ntracktimes: value: ntracktimes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json index 9aad9cca..ee089407 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "prt-prp", "parent": "prt-nam", + "ftype": "PRP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml index ac749639..2bc329e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "prt-prp" parent = "prt-nam" +ftype = "PRP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml index a9baf3a1..edbe121c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: prt-prp parent: prt-nam +ftype: PRP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.json index f233bdec..30a8b3f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "sim-tdis", "parent": "sim-nam", + "ftype": "TDIS6", "dims": { "nper": { "value": "nper", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.toml index b6977dbb..e75ea00f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "sim-tdis" parent = "sim-nam" +ftype = "TDIS6" [dims.nper] value = "nper" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.yaml index 348dc47e..a471a5ac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-tdis.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: sim-tdis parent: sim-nam +ftype: TDIS6 dims: nper: value: nper diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.json index 2b084188..d531e2e4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "sln-ems", "parent": "sim-nam", + "ftype": "EMS6", "subtype": "solution", "memory": { "icnvg": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.toml index 2751fc0a..85cff8b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "sln-ems" parent = "sim-nam" +ftype = "EMS6" subtype = "solution" [memory.icnvg] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.yaml index 06609375..62c59216 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ems.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: sln-ems parent: sim-nam +ftype: EMS6 subtype: solution memory: icnvg: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.json index d04e2c78..331fe877 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "sln-ims", "parent": "sim-nam", + "ftype": "IMS6", "subtype": "solution", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.toml index e7d64940..62f7a4fb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "sln-ims" parent = "sim-nam" +ftype = "IMS6" subtype = "solution" [blocks.options.fields.print_option] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.yaml index 7c5e60dd..116b5727 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-ims.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: sln-ims parent: sim-nam +ftype: IMS6 subtype: solution blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.json index 44dbb337..c192d43d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "sln-pts", "parent": "sim-nam", + "ftype": "PTS6", "subtype": "solution", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.toml index 6ae04373..ca7d05cf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "sln-pts" parent = "sim-nam" +ftype = "PTS6" subtype = "solution" [blocks.options.fields.print_option] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.yaml index 5fd84579..fb7a2055 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sln-pts.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: sln-pts parent: sim-nam +ftype: PTS6 subtype: solution blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json index 75deeccd..dfeb9664 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-cdb", "parent": "swf-nam", + "ftype": "CDB6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml index b1853f63..1220aa15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-cdb" parent = "swf-nam" +ftype = "CDB6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml index 51becdf8..f942f99d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-cdb parent: swf-nam +ftype: CDB6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json index 77f51281..641f064b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-chd", "parent": "swf-nam", + "ftype": "CHD6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml index f3043a30..6c6cd57c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-chd" parent = "swf-nam" +ftype = "CHD6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml index c7d7dd74..1e501e3d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-chd parent: swf-nam +ftype: CHD6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.json index 73d00aad..18ddf8eb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-cxs", "parent": "swf-nam", + "ftype": "CXS6", "dims": { "nsections": { "value": "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.toml index 58a70457..db25a5e4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-cxs" parent = "swf-nam" +ftype = "CXS6" [dims.nsections] value = "nsections" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.yaml index 5ebbf120..180f2c9f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-cxs parent: swf-nam +ftype: CXS6 dims: nsections: value: nsections diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json index 42ab8671..86bfa351 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-dfw", "parent": "swf-nam", + "ftype": "DFW6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml index f473237d..95d4388a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-dfw" parent = "swf-nam" +ftype = "DFW6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml index d841a7ca..5394e32c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dfw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-dfw parent: swf-nam +ftype: DFW6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.json index 8f2ef48b..cfb62e35 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-dis2d", "parent": "swf-nam", + "ftype": "DIS2D6", "dims": { "nrow": { "value": "nrow", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.toml index ca504265..9b2c8172 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-dis2d" parent = "swf-nam" +ftype = "DIS2D6" [dims.nrow] value = "nrow" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.yaml index c5c5bdb9..bff2a4a3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-dis2d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-dis2d parent: swf-nam +ftype: DIS2D6 dims: nrow: value: nrow diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.json index c4940162..a3de225a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-disv1d", "parent": "swf-nam", + "ftype": "DISV1D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.toml index 856f425e..d08e0a70 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-disv1d" parent = "swf-nam" +ftype = "DISV1D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.yaml index 4c0e46db..3d32a12b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv1d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-disv1d parent: swf-nam +ftype: DISV1D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.json index 888dceb2..a9a6f4c3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-disv2d", "parent": "swf-nam", + "ftype": "DISV2D6", "dims": { "nodes": { "value": "nodes", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.toml index 694d3bf4..18649821 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-disv2d" parent = "swf-nam" +ftype = "DISV2D6" [dims.nodes] value = "nodes" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.yaml index 6703adfc..16373044 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-disv2d.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-disv2d parent: swf-nam +ftype: DISV2D6 dims: nodes: value: nodes diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json index 0b339031..bff332d4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-evp", "parent": "swf-nam", + "ftype": "EVP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml index 0c5fab8b..2d185536 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-evp" parent = "swf-nam" +ftype = "EVP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml index ea04147d..ec1f9e31 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-evp parent: swf-nam +ftype: EVP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json index 157668bc..88238f6d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-flw", "parent": "swf-nam", + "ftype": "FLW6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml index 42e0d932..bffef9df 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-flw" parent = "swf-nam" +ftype = "FLW6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml index 2767b173..db379352 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-flw parent: swf-nam +ftype: FLW6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.json index bc7d0a17..d1f70808 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-ic", "parent": "swf-nam", + "ftype": "IC6", "runtime_dims": { "nodes": { "set_in": "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.toml index ae2a1f45..b5d512ac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-ic" parent = "swf-nam" +ftype = "IC6" [runtime_dims.nodes] set_in = "ar" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.yaml index 609ac918..932de5a9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-ic.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-ic parent: swf-nam +ftype: IC6 runtime_dims: nodes: set_in: ar diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json index ec005df7..944036b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-nam", "parent": "sim-nam", + "ftype": "SWF6", "dependent_variable": "stage", "runtime_dims": { "nja": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml index 4154a24f..3ccc0108 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml @@ -2,6 +2,7 @@ type = "model" schema_version = "2.0.0.dev3" name = "swf-nam" parent = "sim-nam" +ftype = "SWF6" dependent_variable = "stage" [runtime_dims.nja] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml index bf74204e..4fef7ec7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml @@ -2,6 +2,7 @@ type: model schema_version: 2.0.0.dev3 name: swf-nam parent: sim-nam +ftype: SWF6 dependent_variable: stage runtime_dims: nja: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.json index 51d48181..bd70a334 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-oc", "parent": "swf-nam", + "ftype": "OC6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.toml index 2e13b8cf..6209c103 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-oc" parent = "swf-nam" +ftype = "OC6" [blocks.options.fields.budget_filerecord] type = "record" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.yaml index 5a5450f8..ecbb7388 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-oc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-oc parent: swf-nam +ftype: OC6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json index de374185..6eceea29 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-pcp", "parent": "swf-nam", + "ftype": "PCP6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml index 4a5b3c59..b967e0b4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-pcp" parent = "swf-nam" +ftype = "PCP6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml index 1bbf4813..efd3cc9b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-pcp parent: swf-nam +ftype: PCP6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.json index 8f1e8a2d..b1daa9f0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-sto", "parent": "swf-nam", + "ftype": "STO6", "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.toml index c10ec821..cc9b3d71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-sto" parent = "swf-nam" +ftype = "STO6" [blocks.options.fields.save_flows] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.yaml index f8670b1c..6fa2a9f8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-sto.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-sto parent: swf-nam +ftype: STO6 blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json index f568a08a..d6f9e958 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "swf-zdg", "parent": "swf-nam", + "ftype": "ZDG6", "multi": true, "subtype": "stress", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml index 5db0ee9b..7a5d1c22 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "swf-zdg" parent = "swf-nam" +ftype = "ZDG6" multi = true subtype = "stress" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml index c4c7f20c..f378b91f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: swf-zdg parent: swf-nam +ftype: ZDG6 multi: true subtype: stress dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json index 06291f5c..59965bed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-ats", "parent": "sim-tdis", + "ftype": "ATS6", "subtype": "utility", "dims": { "maxats": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml index b7d63c54..48ae71a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-ats" parent = "sim-tdis" +ftype = "ATS6" subtype = "utility" [dims.maxats] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml index 645fb07e..8aa76e49 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-ats parent: sim-tdis +ftype: ATS6 subtype: utility dims: maxats: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.json index cd55459d..abbcdd7c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-hpc", "parent": "sim-nam", + "ftype": "HPC6", "subtype": "utility", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.toml index e23823e5..6267ecd2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-hpc" parent = "sim-nam" +ftype = "HPC6" subtype = "utility" [blocks.options.fields.print_table] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.yaml index 711d70d3..ca214dc7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-hpc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-hpc parent: sim-nam +ftype: HPC6 subtype: utility blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json index e908280c..b3268a86 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-laktab", "parent": "gwf-lak", + "ftype": "LAKTAB6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml index 013c5b09..5f1f81f3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-laktab" parent = "gwf-lak" +ftype = "LAKTAB6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml index b71cc3cb..e4864cb4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-laktab parent: gwf-lak +ftype: LAKTAB6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json index b3cd541e..3ea06204 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-ncf", "parent": "package", + "ftype": "NCF6", "subtype": "utility", "dims": { "ncpl": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml index c969432b..0b82dd49 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-ncf" parent = "package" +ftype = "NCF6" subtype = "utility" [dims.ncpl] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml index aac8f139..8c6b9b63 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-ncf parent: package +ftype: NCF6 subtype: utility dims: ncpl: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json index 52457429..5497f2b5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-obs", "parent": "package", + "ftype": "OBS6", "multi": true, "subtype": "utility", "blocks": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml index e84a2688..181d20ca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-obs" parent = "package" +ftype = "OBS6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml index 1935cdbb..f14468c9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-obs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-obs parent: package +ftype: OBS6 multi: true subtype: utility blocks: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json index 504ce689..6e9b57dd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-sfrtab", "parent": "gwf-sfr", + "ftype": "SFRTAB6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml index 1a023556..d6c53989 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-sfrtab" parent = "gwf-sfr" +ftype = "SFRTAB6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml index 8ae89a60..b1263d93 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-sfrtab parent: gwf-sfr +ftype: SFRTAB6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json index 6689d7c8..4be49441 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-spc", "parent": "package", + "ftype": "SPC6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml index 06ffb3f6..168e90e1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-spc" parent = "package" +ftype = "SPC6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml index 3a254841..61fd62cf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-spc parent: package +ftype: SPC6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json index de83d56b..6eac3ae0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-spca", "parent": "package", + "ftype": "SPC6", "multi": true, "subtype": "utility", "blocks": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml index 5a4f8c45..96650be6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-spca" parent = "package" +ftype = "SPC6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml index 19ee9bb6..94dd2e9d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-spca parent: package +ftype: SPC6 multi: true subtype: utility blocks: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.json index 8e8031ef..3cbeb447 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-tas", "parent": "package", + "ftype": "TAS6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.toml index f773f3b6..49c80d06 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-tas" parent = "package" +ftype = "TAS6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.yaml index 05b8675c..418da9c1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-tas parent: package +ftype: TAS6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.json index 13cc1a3a..cf74efe3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-ts", "parent": "package", + "ftype": "TS6", "multi": true, "subtype": "utility", "dims": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.toml index ed4b1c8c..4f8cd035 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-ts" parent = "package" +ftype = "TS6" multi = true subtype = "utility" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.yaml index 36985940..4342054f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ts.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-ts parent: package +ftype: TS6 multi: true subtype: utility dims: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json index 57121072..a0a14ef3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-tvk", "parent": "gwf-npf", + "ftype": "TVK6", "subtype": "utility", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml index 0d053f72..70e904d1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-tvk" parent = "gwf-npf" +ftype = "TVK6" subtype = "utility" [blocks.options.fields.print_input] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml index 4592f56a..465defb1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvk.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-tvk parent: gwf-npf +ftype: TVK6 subtype: utility blocks: options: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json index 946dd958..b945cfa7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.json @@ -3,6 +3,7 @@ "schema_version": "2.0.0.dev3", "name": "utl-tvs", "parent": "gwf-sto", + "ftype": "TVS6", "subtype": "utility", "blocks": { "options": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml index 836a0702..4c66be51 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.toml @@ -2,6 +2,7 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-tvs" parent = "gwf-sto" +ftype = "TVS6" subtype = "utility" [blocks.options.fields.disable_storage_change_integration] diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml index 5a7b11ce..12708996 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tvs.yaml @@ -2,6 +2,7 @@ type: package schema_version: 2.0.0.dev3 name: utl-tvs parent: gwf-sto +ftype: TVS6 subtype: utility blocks: options: diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index 68b436d9..0e643ffb 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -514,7 +514,8 @@ def test_migrate_link_selectors_resolve(linked_spec): targets = [n for n, t in children.items() if v2.admits(file.component, t)] assert targets, (name, file.name) if file.component_ref is None: - assert len({linked_spec.ftype(t) for t in targets}) == 1, (name, file.name) + ftypes = {linked_spec.components[t].ftype for t in targets} + assert len(ftypes) == 1, (name, file.name) def test_migrate_model_packages_exclude_utilities(linked_spec): @@ -562,3 +563,38 @@ def test_migrate_derives_parents_from_links(linked_spec, name, parent): def test_migrate_subpackage_keeps_model_dims(linked_spec): # tvk's parent is now gwf-npf, not `package`; it must still see grid dims assert {"nodes", "nlay"} <= linked_spec.inherited_dims("utl-tvk") + + +@pytest.mark.parametrize( + "name, ftype", + [ + ("sim-nam", None), + ("gwf-nam", "GWF6"), + ("gwf-dis", "DIS6"), + ("gwf-rch", "RCH6"), + ("gwf-rcha", "RCH6"), + ("gwf-chdg", "CHD6"), + ("utl-spca", "SPC6"), + ("exg-gwfgwf", "GWF6-GWF6"), + ("exg-gwfprt", "GWF6-PRT6"), + ("sln-ims", "IMS6"), + ("sim-tdis", "TDIS6"), + ("utl-ncf", "NCF6"), + ], +) +def test_migrate_ftype(linked_spec, name, ftype): + assert linked_spec.components[name].ftype == ftype + + +def test_migrate_ftypes_unique_among_name_file_children(linked_spec): + """Within a name file, one ftype names one component, or a base and its + array-based variants.""" + for name, c in linked_spec.components.items(): + if not name.endswith("-nam"): + continue + by_ftype: dict = {} + for child, cc in linked_spec.children(name).items(): + by_ftype.setdefault(cc.ftype, []).append(child) + for ftype, children in by_ftype.items(): + base = min(children, key=len) + assert all(n in (base, f"{base}a", f"{base}g") for n in children), (name, children) diff --git a/autotest/dfns/test_schema_relations.py b/autotest/dfns/test_schema_relations.py index b8f39b70..3052ce47 100644 --- a/autotest/dfns/test_schema_relations.py +++ b/autotest/dfns/test_schema_relations.py @@ -261,11 +261,11 @@ def _link_spec(file: File, owner: str = "gwf-dis", **siblings) -> dict: utility attached by packages; ``file`` goes in ``owner``.""" components = { "sim-nam": Simulation(name="sim-nam"), - "gwf-nam": Model(name="gwf-nam", parent="sim-nam"), - "gwf-dis": Package(name="gwf-dis", parent="gwf-nam"), - "gwf-rch": Package(name="gwf-rch", parent="gwf-nam", subtype="stress"), - "gwf-rcha": Package(name="gwf-rcha", parent="gwf-nam", subtype="stress"), - "utl-ncf": Package(name="utl-ncf", parent="package", subtype="utility"), + "gwf-nam": Model(name="gwf-nam", parent="sim-nam", ftype="GWF6"), + "gwf-dis": Package(name="gwf-dis", parent="gwf-nam", ftype="DIS6"), + "gwf-rch": Package(name="gwf-rch", parent="gwf-nam", subtype="stress", ftype="RCH6"), + "gwf-rcha": Package(name="gwf-rcha", parent="gwf-nam", subtype="stress", ftype="RCH6"), + "utl-ncf": Package(name="utl-ncf", parent="package", subtype="utility", ftype="NCF6"), } components[owner] = components[owner].model_copy( update={"blocks": _file_block(file, **siblings)} @@ -367,10 +367,7 @@ def test_children_list_parent(): def test_ftype_family(): spec = Dfns(components=_link_spec(File(name="f", direction="in"))) - spec.components["exg-gwfgwf"] = Package(name="exg-gwfgwf", parent="sim-nam") - assert spec.ftype("gwf-nam") == "GWF6" - assert spec.ftype("gwf-rcha") == "RCH6" - assert spec.ftype("exg-gwfgwf") == "GWF6-GWF6" + spec.components["exg-gwfgwf"] = Package(name="exg-gwfgwf", parent="sim-nam", ftype="GWF6-GWF6") assert spec.ftype_family("DIS6", "gwf-nam") == ["gwf-dis"] assert spec.ftype_family("rch6", "gwf-nam") == ["gwf-rch", "gwf-rcha"] assert spec.ftype_family("GWF6", "sim-nam") == ["gwf-nam"] diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index 72290526..55f7f2a2 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -9,6 +9,7 @@ This document describes the MODFLOW 6 component definition (DFN) system. This sy - [`name`](#name) - [`blocks`](#blocks) - [`parent`](#parent) + - [`ftype`](#ftype) - [`schema_version`](#schema_version) - [`dims`](#dims) - [`memory`](#memory) @@ -116,6 +117,7 @@ Component definitions consist of a number of attributes: - `name`: the component's name - `blocks`: block definitions - `parent`: parent component(s) +- `ftype`: the token naming the component's file type in name files - `schema_version`: DFN schema version - `dims`: named dimensions resolvable from input fields, available for use in array shapes - `runtime_dims`: named dimensions whose value is only known once MODFLOW runs, available for use in memory variable shapes @@ -158,7 +160,11 @@ A term **admits** a component if it equals the component's name, type, or subtyp **Note:** Terms may be mixed. A type or subtype subsumes any named component of the same type or subtype: e.g., `["gwf-sfr", "package"]` reduces to `["package"]` since `gwf-sfr` is a package. -A component that other components' input files link (see [File](#file)), such as a utility, has its `parent` derived from the components that link to it: the simplest selector that admits all of them, i.e. the fewest terms, then the narrowest (a concrete name before a subtype before a type). It is a superset of the actual linkers: it says what kind of component can attach this one, and the linking `file` field says exactly which ones do. For example, `utl-tvk` is linked only by `gwf-npf`, so its parent is `"gwf-npf"`; `utl-ts` is linked by stress, advanced, and utility packages and by `gwf-csub`, which has no subtype, so its parent is `"package"`; `gwf-gnc` is listed in a model name file and also linked by `exg-gwfgwf`, so its parent is `["exg-gwfgwf", "gwf-nam"]`. +A component that other components' input files link (see [File](#file)), such as a utility, has its `parent` derived from the components that link to it: the simplest selector that admits all of them. + +#### `ftype` + +`string | null (default: null)`. The token naming the component's file type in name files and file records, e.g. `GWF6` for `gwf-nam`, `DIS6` for `gwf-dis`, `IMS6` for `sln-ims`, `GWF6-GWF6` for `exg-gwfgwf`. Array-based variants share their base's token: `gwf-rcha` is `RCH6`, `gwf-chdg` is `CHD6`, and MODFLOW 6 picks the variant from the file's own `READASARRAYS`/`READARRAYGRID` option. Within a component's children, one token names one component, or a base and its variants (an **ftype family**). `null` only for the simulation name file. See [`component_ref`](#component_ref). #### `schema_version` @@ -445,17 +451,13 @@ If a file option is introduced by one or more leading keywords (e.g. `CROSS_SECT ###### `component` -`string | [string] | null (default: null)`. The component the file is input for, as a selector (see [`parent`](#parent)). It resolves among this component's **children** only, i.e. the components whose `parent` admits this one: `"package"` in `gwf-nam` means `gwf-nam`'s packages, and `"model"` in `sim-nam` means the model name files. Only valid when `direction` is `"in"`. - -Without `component_ref`, the selector must resolve to one **ftype family**: a component and its array-based variants (e.g. `["utl-spc", "utl-spca"]` for SSM's `SPC6` file). MODFLOW 6 picks the variant from the file's own options: `READASARRAYS` selects the `…a` component and `READARRAYGRID` the `…g` component. - -For example, `ncf_filerecord`'s file in `gwf-dis` has `component: "utl-ncf"`, and `sim-nam`'s `tdis6` has `component: "sim-tdis"`. +`string | [string] | null (default: null)`. The component the file is input for. Valid for components whose `parent` admits this one. Only valid when `direction` is `"in"`. ###### `component_ref` -`string | null (default: null)`. Names a sibling `string` field in the same record whose value is the target's **ftype token** (e.g. `GWF6`, `DIS6`, `IMS6`, `GWF6-GWF6`), like [`fk_ref`](#fk_ref) for keys. The token picks one ftype family among `component`'s matches; the target file's own options then pick the variant, as above. For example, a model name file's `packages` rows have `fname` with `component: "package"` and `component_ref: "ftype"`, and `sim-nam`'s `models` rows have `mfname` with `component: "model"` and `component_ref: "mtype"`. +`string | null (default: null)`. Names a sibling `string` field in the same record whose value is the target component's **ftype** (e.g. `GWF6`, `DIS6`, `IMS6`, `GWF6-GWF6`). Behaves like [`fk_ref`](#fk_ref) for keys. The token picks one ftype family among `component`'s matches; the target file's own options then pick the variant, as above. For example, a model name file's `packages` rows have `fname` with `component: "package"` and `component_ref: "ftype"`, and `sim-nam`'s `models` rows have `mfname` with `component: "model"` and `component_ref: "mtype"`. -A component's ftype token is its name's suffix, upper-cased, plus `6` (`gwf-dis` → `DIS6`, `sln-ims` → `IMS6`); a model's is its prefix (`gwf-nam` → `GWF6`), and an exchange's names both models (`exg-gwfgwf` → `GWF6-GWF6`). Array-based variants share their base's token (`gwf-rcha` → `RCH6`). +Each component declares its token in [`ftype`](#ftype). ### Composites diff --git a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py index 7eac93b5..c5091ba8 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -99,6 +99,34 @@ def try_parse_bool(v: Any, default: bool = False) -> bool: ("*-nam", "fname"): ("package", "ftype"), } +# Array-based variants, which share their base's ftype token: mf6 maps these +# to the base type when matching name-file ftypes (InputLoadType.f90). +_FTYPE_VARIANTS = frozenset({"evta", "rcha", "spca", "rivg", "chdg", "welg", "drng", "ghbg"}) + +_MODEL_TYPES = frozenset({*_DEPENDENT_VARS, "prt"}) + + +def _ftype(name: str) -> str | None: + """ + The token naming a component's file type (`v2.ComponentBase.ftype`): + `gwf-nam` -> `GWF6`, `gwf-dis` -> `DIS6`, `exg-gwfgwf` -> `GWF6-GWF6`, + `gwf-rcha` -> `RCH6`. None for the simulation name file, which has none. + """ + prefix, _, suffix = name.partition("-") + if name == "sim-nam": + return None + if suffix == "nam": + return f"{prefix.upper()}6" + if prefix == "exg": + for m in _MODEL_TYPES: + if suffix.startswith(m) and suffix[len(m) :] in _MODEL_TYPES: + return f"{m.upper()}6-{suffix[len(m) :].upper()}6" + raise ValueError(f"{name}: can't split exchange into two model types") + if suffix in _FTYPE_VARIANTS: + suffix = suffix[:-1] + return f"{suffix.upper()}6" + + # v1 marks these optional, but mf6 requires them. sim-nam's `tdis6`: "TIMING # block variable TDIS6 is unset" (SimulationCreate.f90). Fixed upstream in # sim-nam.dfn; drop the entry once the DFNs this migrates include the fix. @@ -2063,6 +2091,7 @@ def _lookup(rname: str) -> dict | None: "schema_version": "2.0.0.dev2", "name": name, "parent": parent, + "ftype": _ftype(name), "blocks": blocks or None, "dims": dims, } diff --git a/modflow_devtools/dfns/schema.json b/modflow_devtools/dfns/schema.json index c531aca0..03944acd 100644 --- a/modflow_devtools/dfns/schema.json +++ b/modflow_devtools/dfns/schema.json @@ -1247,6 +1247,18 @@ "default": null, "title": "Parent" }, + "ftype": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Ftype" + }, "dims": { "anyOf": [ { @@ -1403,6 +1415,18 @@ "default": null, "title": "Parent" }, + "ftype": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Ftype" + }, "dims": { "anyOf": [ { @@ -1729,6 +1753,18 @@ "default": null, "title": "Parent" }, + "ftype": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Ftype" + }, "dims": { "anyOf": [ { diff --git a/modflow_devtools/dfns/schema.py b/modflow_devtools/dfns/schema.py index b8febe45..a45dadd3 100644 --- a/modflow_devtools/dfns/schema.py +++ b/modflow_devtools/dfns/schema.py @@ -926,6 +926,11 @@ class ComponentBase(BaseModel): schema_version: str | None = None name: str parent: str | list[str] | None = None + # The token naming this component's file type in name files and file + # records (`GWF6`, `DIS6`, `GWF6-GWF6`). Array-based variants share their + # base's (`gwf-rcha` is `RCH6`): mf6 picks the variant from the file's own + # READASARRAYS/READARRAYGRID option. See `Dfns.ftype_family`. + ftype: str | None = None dims: dict[str, InputDim] | None = None runtime_dims: dict[str, RuntimeDim] | None = None blocks: dict[str, Block] | None = None @@ -1364,7 +1369,8 @@ def _validate_file_links(component: "ComponentBase", spec: "Dfns") -> None: f"component's children" ) if file.component_ref is None: - families = {spec.ftype(n) for n in targets} + components = spec.components + families = {components[n].ftype or n for n in targets} if len(families) > 1: raise ValueError( f"{where}: component={file.component!r} matches several " @@ -1609,24 +1615,6 @@ def children(self, name: str) -> "dict[str, Component]": n: c for n, c in self.components.items() if n != name and admits(c.parent, component) } - def ftype(self, name: str) -> str: - """ - The ftype token naming a component's family in name files: ``gwf-nam`` - → ``GWF6``, ``gwf-dis`` → ``DIS6``, ``exg-gwfgwf`` → ``GWF6-GWF6``, - ``sln-ims`` → ``IMS6``. An array-based variant (``gwf-rcha``, - ``gwf-chdg``, ``utl-spca``) shares its base's token: mf6 picks the - variant from the file's own ``READASARRAYS``/``READARRAYGRID`` option. - """ - prefix, _, suffix = name.partition("-") - if suffix == "nam": - return f"{prefix.upper()}6" - if prefix == "exg": - # model type prefixes are all three letters - return f"{suffix[:3].upper()}6-{suffix[3:].upper()}6" - if suffix[-1:] in ("a", "g") and f"{prefix}-{suffix[:-1]}" in self.components: - suffix = suffix[:-1] - return f"{suffix.upper()}6" - def ftype_family(self, token: str, context: str) -> list[str]: """ The components a name-file ftype token can mean among ``context``'s @@ -1635,7 +1623,7 @@ def ftype_family(self, token: str, context: str) -> list[str]: the target file's own options pick between. """ token = token.upper() - return sorted(n for n in self.children(context) if self.ftype(n) == token) + return sorted(n for n, c in self.children(context).items() if c.ftype == token) def _parents_in_models(self, parent: "str | list[str] | None") -> set[str]: """ From a8e63d7b8eca9a93faac2d52c40f31e2501b2ae1 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Sat, 3 Oct 2026 10:35:47 -0700 Subject: [PATCH 4/5] refactor(dfns): rename File.component_ref to component_ftype The sibling it names holds an ftype token, not a component name. Co-Authored-By: Claude Opus 5.5 --- .../__snapshots__/v2.0.0.dev2/chf-nam.json | 2 +- .../__snapshots__/v2.0.0.dev2/chf-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev2/chf-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-nam.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwe-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-nam.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwf-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-nam.json | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev2/gwt-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/olf-nam.json | 2 +- .../__snapshots__/v2.0.0.dev2/olf-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev2/olf-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/prt-nam.json | 2 +- .../__snapshots__/v2.0.0.dev2/prt-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev2/prt-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev2/sim-nam.json | 6 +++--- .../__snapshots__/v2.0.0.dev2/sim-nam.toml | 6 +++--- .../__snapshots__/v2.0.0.dev2/sim-nam.yaml | 6 +++--- .../__snapshots__/v2.0.0.dev2/swf-nam.json | 2 +- .../__snapshots__/v2.0.0.dev2/swf-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev2/swf-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/chf-nam.json | 2 +- .../__snapshots__/v2.0.0.dev3/chf-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev3/chf-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-nam.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev3/gwe-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-nam.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev3/gwf-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-nam.json | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev3/gwt-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/olf-nam.json | 2 +- .../__snapshots__/v2.0.0.dev3/olf-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev3/olf-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/prt-nam.json | 2 +- .../__snapshots__/v2.0.0.dev3/prt-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev3/prt-nam.yaml | 2 +- .../__snapshots__/v2.0.0.dev3/sim-nam.json | 6 +++--- .../__snapshots__/v2.0.0.dev3/sim-nam.toml | 6 +++--- .../__snapshots__/v2.0.0.dev3/sim-nam.yaml | 6 +++--- .../__snapshots__/v2.0.0.dev3/swf-nam.json | 2 +- .../__snapshots__/v2.0.0.dev3/swf-nam.toml | 2 +- .../__snapshots__/v2.0.0.dev3/swf-nam.yaml | 2 +- autotest/dfns/test_migrate.py | 10 +++++----- autotest/dfns/test_schema_relations.py | 16 +++++++-------- docs/md/dfnspec.md | 6 +++--- .../dfns/migrate_to_v2_0_0_dev2.py | 6 +++--- modflow_devtools/dfns/schema.json | 4 ++-- modflow_devtools/dfns/schema.py | 20 +++++++++---------- 54 files changed, 91 insertions(+), 91 deletions(-) diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json index 7c16a8c1..34d31a3b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.json @@ -76,7 +76,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml index 33fbc73f..89ce7377 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.toml @@ -68,7 +68,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml index 998f03d2..7034cc16 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-nam.yaml @@ -78,7 +78,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json index d525eae5..f74685e5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.json @@ -120,7 +120,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml index deb5e153..098f37b0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.toml @@ -108,7 +108,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml index 07c9487d..edd76bb4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-nam.yaml @@ -110,7 +110,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json index 9c6fd81e..a48b33fd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.json @@ -133,7 +133,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml index 4e2e1072..46015dd9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.toml @@ -119,7 +119,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml index e5e79d2f..2c422904 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-nam.yaml @@ -124,7 +124,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json index bc6eac50..3250cccc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.json @@ -120,7 +120,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml index 46d4996d..73a680ae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.toml @@ -108,7 +108,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml index 3c8fff61..c5f9fb17 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-nam.yaml @@ -110,7 +110,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json index 6312b226..42536a7b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.json @@ -76,7 +76,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml index 6d9e86ce..5afd0b51 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.toml @@ -68,7 +68,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml index bec2086f..fabf1579 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-nam.yaml @@ -78,7 +78,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json index 3e94190e..d0d7cccb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.json @@ -55,7 +55,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml index 3151aeb8..093d1d10 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.toml @@ -49,7 +49,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml index 3cf5343e..3ae6e313 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-nam.yaml @@ -57,7 +57,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.json index 2005d864..9b9f8574 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.json @@ -100,7 +100,7 @@ "direction": "in", "mode_keyword": false, "component": "model", - "component_ref": "mtype" + "component_ftype": "mtype" }, "mname": { "type": "string", @@ -138,7 +138,7 @@ "direction": "in", "mode_keyword": false, "component": "exchange", - "component_ref": "exgtype" + "component_ftype": "exgtype" }, "exgmnamea": { "type": "string", @@ -191,7 +191,7 @@ "direction": "in", "mode_keyword": false, "component": "solution", - "component_ref": "slntype" + "component_ftype": "slntype" }, "slnmnames": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.toml index 8cee5fc5..457a0cd0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.toml @@ -88,7 +88,7 @@ tagged = false direction = "in" mode_keyword = false component = "model" -component_ref = "mtype" +component_ftype = "mtype" [blocks.models.fields.models.item.fields.mname] type = "string" @@ -120,7 +120,7 @@ tagged = false direction = "in" mode_keyword = false component = "exchange" -component_ref = "exgtype" +component_ftype = "exgtype" [blocks.exchanges.fields.exchanges.item.fields.exgmnamea] type = "string" @@ -167,7 +167,7 @@ tagged = false direction = "in" mode_keyword = false component = "solution" -component_ref = "slntype" +component_ftype = "slntype" [blocks.solutiongroup.fields.solutiongroup.item.fields.slnmnames] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.yaml index 39452350..70cdd1f5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/sim-nam.yaml @@ -95,7 +95,7 @@ blocks: direction: in mode_keyword: false component: model - component_ref: mtype + component_ftype: mtype mname: type: string longname: name of model @@ -127,7 +127,7 @@ blocks: direction: in mode_keyword: false component: exchange - component_ref: exgtype + component_ftype: exgtype exgmnamea: type: string longname: name of model A @@ -171,7 +171,7 @@ blocks: direction: in mode_keyword: false component: solution - component_ref: slntype + component_ftype: slntype slnmnames: type: array longname: array of model names in this solution diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json index 0e406968..48c4bccf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.json @@ -76,7 +76,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml index 920df1d8..e8a546ae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.toml @@ -68,7 +68,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml index 0e5bee30..fa48bbd1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-nam.yaml @@ -78,7 +78,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json index 11bccfda..c97cb30b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.json @@ -84,7 +84,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml index 6a3b15e1..43db7e90 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.toml @@ -74,7 +74,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml index c2350201..7138080e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-nam.yaml @@ -83,7 +83,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json index 6c1f679a..2224ea12 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.json @@ -128,7 +128,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml index 9efc472c..fa7543f3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.toml @@ -114,7 +114,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml index 604363ff..36534a95 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-nam.yaml @@ -115,7 +115,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json index 283f7891..1fb07bd7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.json @@ -141,7 +141,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml index 4b2e3280..c2ff48a4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.toml @@ -125,7 +125,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml index 678d456a..ab17a4da 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-nam.yaml @@ -129,7 +129,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json index 0b1342f4..f0ff3d3b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.json @@ -128,7 +128,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml index e1518384..4f4aacdd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.toml @@ -114,7 +114,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml index 883b8401..6eddd197 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-nam.yaml @@ -115,7 +115,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json index d125edaa..0cf9a043 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.json @@ -84,7 +84,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml index 77910fd9..94a6ee57 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.toml @@ -74,7 +74,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml index 9ff6d4ec..23b48774 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-nam.yaml @@ -83,7 +83,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json index 1d91ad47..b5d97374 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.json @@ -63,7 +63,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml index 42ef8247..447c0371 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.toml @@ -55,7 +55,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml index a4c9e9c5..5f0f8481 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-nam.yaml @@ -62,7 +62,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.json index b2193633..b722423d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.json @@ -100,7 +100,7 @@ "direction": "in", "mode_keyword": false, "component": "model", - "component_ref": "mtype" + "component_ftype": "mtype" }, "mname": { "type": "string", @@ -138,7 +138,7 @@ "direction": "in", "mode_keyword": false, "component": "exchange", - "component_ref": "exgtype" + "component_ftype": "exgtype" }, "exgmnamea": { "type": "string", @@ -191,7 +191,7 @@ "direction": "in", "mode_keyword": false, "component": "solution", - "component_ref": "slntype" + "component_ftype": "slntype" }, "slnmnames": { "type": "array", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.toml index a61cf8ab..848021da 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.toml @@ -88,7 +88,7 @@ tagged = false direction = "in" mode_keyword = false component = "model" -component_ref = "mtype" +component_ftype = "mtype" [blocks.models.fields.models.item.fields.mname] type = "string" @@ -120,7 +120,7 @@ tagged = false direction = "in" mode_keyword = false component = "exchange" -component_ref = "exgtype" +component_ftype = "exgtype" [blocks.exchanges.fields.exchanges.item.fields.exgmnamea] type = "string" @@ -167,7 +167,7 @@ tagged = false direction = "in" mode_keyword = false component = "solution" -component_ref = "slntype" +component_ftype = "slntype" [blocks.solutiongroup.fields.solutiongroup.item.fields.slnmnames] type = "array" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.yaml index 20f62b60..13afcae1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/sim-nam.yaml @@ -95,7 +95,7 @@ blocks: direction: in mode_keyword: false component: model - component_ref: mtype + component_ftype: mtype mname: type: string longname: name of model @@ -127,7 +127,7 @@ blocks: direction: in mode_keyword: false component: exchange - component_ref: exgtype + component_ftype: exgtype exgmnamea: type: string longname: name of model A @@ -171,7 +171,7 @@ blocks: direction: in mode_keyword: false component: solution - component_ref: slntype + component_ftype: slntype slnmnames: type: array longname: array of model names in this solution diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json index 944036b3..3ea85c7b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.json @@ -84,7 +84,7 @@ "direction": "in", "mode_keyword": false, "component": "package", - "component_ref": "ftype" + "component_ftype": "ftype" }, "pname": { "type": "string", diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml index 3ccc0108..2a720c64 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.toml @@ -74,7 +74,7 @@ tagged = false direction = "in" mode_keyword = false component = "package" -component_ref = "ftype" +component_ftype = "ftype" [blocks.packages.fields.packages.item.fields.pname] type = "string" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml index 4fef7ec7..4e56b35f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-nam.yaml @@ -83,7 +83,7 @@ blocks: direction: in mode_keyword: false component: package - component_ref: ftype + component_ftype: ftype pname: type: string longname: user name for package diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index 0e643ffb..afefba0c 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -475,7 +475,7 @@ def test_migrate_links_sfr_tables(linked_spec): @pytest.mark.parametrize( - "field, selector, component_ref", + "field, selector, component_ftype", [ ("tdis6", "sim-tdis", None), ("mfname", "model", "mtype"), @@ -483,10 +483,10 @@ def test_migrate_links_sfr_tables(linked_spec): ("slnfname", "solution", "slntype"), ], ) -def test_migrate_links_sim_nam(linked_spec, field, selector, component_ref): +def test_migrate_links_sim_nam(linked_spec, field, selector, component_ftype): file = linked_spec.components["sim-nam"].get_fields(recurse=True)[field] assert isinstance(file, v2.File) - assert (file.component, file.component_ref) == (selector, component_ref) + assert (file.component, file.component_ftype) == (selector, component_ftype) assert file.direction == "in" and not file.mode_keyword assert not file.optional @@ -501,7 +501,7 @@ def test_migrate_links_model_packages(linked_spec): assert models for model in models: file = model.get_fields(recurse=True)["fname"] - assert (file.component, file.component_ref) == ("package", "ftype"), model.name + assert (file.component, file.component_ftype) == ("package", "ftype"), model.name def test_migrate_link_selectors_resolve(linked_spec): @@ -513,7 +513,7 @@ def test_migrate_link_selectors_resolve(linked_spec): continue targets = [n for n, t in children.items() if v2.admits(file.component, t)] assert targets, (name, file.name) - if file.component_ref is None: + if file.component_ftype is None: ftypes = {linked_spec.components[t].ftype for t in targets} assert len(ftypes) == 1, (name, file.name) diff --git a/autotest/dfns/test_schema_relations.py b/autotest/dfns/test_schema_relations.py index 3052ce47..039b8601 100644 --- a/autotest/dfns/test_schema_relations.py +++ b/autotest/dfns/test_schema_relations.py @@ -248,7 +248,7 @@ def test_dfns_validate_cellid_outside_list_item(): Dfns(components={"gwf-nam": gwf, "gwf-gnc": pkg}) -# --- file links (File.component / component_ref) --- +# --- file links (File.component / component_ftype) --- def _file_block(file: File, **siblings) -> dict: @@ -278,13 +278,13 @@ def test_file_link_fixed_target(): Dfns(components=_link_spec(file)) -def test_file_link_variant_family_without_component_ref(): +def test_file_link_variant_family_without_component_ftype(): file = File(name="f", direction="in", component=["gwf-rch", "gwf-rcha"]) Dfns(components=_link_spec(file, owner="gwf-nam")) -def test_file_link_component_ref(): - file = File(name="fname", direction="in", component="package", component_ref="ftype") +def test_file_link_component_ftype(): + file = File(name="fname", direction="in", component="package", component_ftype="ftype") Dfns(components=_link_spec(file, owner="gwf-nam", ftype=String(name="ftype"))) @@ -307,14 +307,14 @@ def test_file_link_not_a_child_rejected(): Dfns(components=_link_spec(file, owner="gwf-nam")) -def test_file_link_ambiguous_without_component_ref_rejected(): +def test_file_link_ambiguous_without_component_ftype_rejected(): file = File(name="f", direction="in", component="package") - with pytest.raises(ValueError, match="no component_ref"): + with pytest.raises(ValueError, match="no component_ftype"): Dfns(components=_link_spec(file, owner="gwf-nam")) -def test_file_link_component_ref_not_sibling_rejected(): - file = File(name="f", direction="in", component="package", component_ref="ftype") +def test_file_link_component_ftype_not_sibling_rejected(): + file = File(name="f", direction="in", component="package", component_ftype="ftype") with pytest.raises(ValueError, match="not a sibling String"): Dfns(components=_link_spec(file, owner="gwf-nam")) diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index 55f7f2a2..517c83ae 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -164,7 +164,7 @@ A component that other components' input files link (see [File](#file)), such as #### `ftype` -`string | null (default: null)`. The token naming the component's file type in name files and file records, e.g. `GWF6` for `gwf-nam`, `DIS6` for `gwf-dis`, `IMS6` for `sln-ims`, `GWF6-GWF6` for `exg-gwfgwf`. Array-based variants share their base's token: `gwf-rcha` is `RCH6`, `gwf-chdg` is `CHD6`, and MODFLOW 6 picks the variant from the file's own `READASARRAYS`/`READARRAYGRID` option. Within a component's children, one token names one component, or a base and its variants (an **ftype family**). `null` only for the simulation name file. See [`component_ref`](#component_ref). +`string | null (default: null)`. The token naming the component's file type in name files and file records, e.g. `GWF6` for `gwf-nam`, `DIS6` for `gwf-dis`, `IMS6` for `sln-ims`, `GWF6-GWF6` for `exg-gwfgwf`. Array-based variants share their base's token: `gwf-rcha` is `RCH6`, `gwf-chdg` is `CHD6`, and MODFLOW 6 picks the variant from the file's own `READASARRAYS`/`READARRAYGRID` option. Within a component's children, one token names one component, or a base and its variants (an **ftype family**). `null` only for the simulation name file. See [`component_ftype`](#component_ftype). #### `schema_version` @@ -453,9 +453,9 @@ If a file option is introduced by one or more leading keywords (e.g. `CROSS_SECT `string | [string] | null (default: null)`. The component the file is input for. Valid for components whose `parent` admits this one. Only valid when `direction` is `"in"`. -###### `component_ref` +###### `component_ftype` -`string | null (default: null)`. Names a sibling `string` field in the same record whose value is the target component's **ftype** (e.g. `GWF6`, `DIS6`, `IMS6`, `GWF6-GWF6`). Behaves like [`fk_ref`](#fk_ref) for keys. The token picks one ftype family among `component`'s matches; the target file's own options then pick the variant, as above. For example, a model name file's `packages` rows have `fname` with `component: "package"` and `component_ref: "ftype"`, and `sim-nam`'s `models` rows have `mfname` with `component: "model"` and `component_ref: "mtype"`. +`string | null (default: null)`. Names a sibling `string` field in the same record whose value is the target component's **ftype** (e.g. `GWF6`, `DIS6`, `IMS6`, `GWF6-GWF6`). Behaves like [`fk_ref`](#fk_ref) for keys. The token picks one ftype family among `component`'s matches; the target file's own options then pick the variant, as above. For example, a model name file's `packages` rows have `fname` with `component: "package"` and `component_ftype: "ftype"`, and `sim-nam`'s `models` rows have `mfname` with `component: "model"` and `component_ftype: "mtype"`. Each component declares its token in [`ftype`](#ftype). diff --git a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py index c5091ba8..bf1a1b10 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -89,7 +89,7 @@ def try_parse_bool(v: Any, default: bool = False) -> bool: ("gwe-ssm", "spc6"): ["utl-spc", "utl-spca"], } -# Name-file filename columns: (component, field) -> (selector, component_ref). +# Name-file filename columns: (component, field) -> (selector, component_ftype). # `*-nam` means every model name file. _NAMEFILE_LINKS: dict[tuple[str, str], tuple[str, str | None]] = { ("sim-nam", "tdis6"): ("sim-tdis", None), @@ -630,7 +630,7 @@ def _link_namefile_fields(name: str, blocks: dict[str, v2.Block]) -> dict[str, v def _link(field: Any) -> Any: if isinstance(field, v2.String) and field.name in links: - selector, component_ref = links[field.name] + selector, component_ftype = links[field.name] optional = field.optional and (name, field.name) not in _V1_REQUIRED data = {k: getattr(field, k) for k in v2.InputFieldBase.model_fields} return v2.File( @@ -638,7 +638,7 @@ def _link(field: Any) -> Any: direction="in", mode_keyword=False, component=selector, - component_ref=component_ref, + component_ftype=component_ftype, ) if isinstance(field, v2.Record): return field.model_copy( diff --git a/modflow_devtools/dfns/schema.json b/modflow_devtools/dfns/schema.json index 03944acd..ceb716ad 100644 --- a/modflow_devtools/dfns/schema.json +++ b/modflow_devtools/dfns/schema.json @@ -523,7 +523,7 @@ "default": null, "title": "Component" }, - "component_ref": { + "component_ftype": { "anyOf": [ { "type": "string" @@ -533,7 +533,7 @@ } ], "default": null, - "title": "Component Ref" + "title": "Component Ftype" } }, "required": [ diff --git a/modflow_devtools/dfns/schema.py b/modflow_devtools/dfns/schema.py index a45dadd3..50bed4ba 100644 --- a/modflow_devtools/dfns/schema.py +++ b/modflow_devtools/dfns/schema.py @@ -123,7 +123,7 @@ class File(InputFieldBase): component: str | list[str] | None = None # A sibling String whose value is the target's ftype token (e.g. `DIS6`), # picking one family among the selector's matches. See `Dfns.ftype_family`. - component_ref: str | None = None + component_ftype: str | None = None Scalar = Annotated[ @@ -1341,25 +1341,25 @@ def _iter_files(fields: "Mapping[str, InputField]"): def _validate_file_links(component: "ComponentBase", spec: "Dfns") -> None: """ - For every File with ``component`` or ``component_ref`` set: + For every File with ``component`` or ``component_ftype`` set: - it must be an input file; - ``component`` must resolve to at least one of this component's children (see `Dfns.children`); - - without ``component_ref``, it must resolve to one ftype family (a base + - without ``component_ftype``, it must resolve to one ftype family (a base and its array-based variants, see `Dfns.ftype`); - - ``component_ref`` must name a sibling String in the same record. + - ``component_ftype`` must name a sibling String in the same record. """ blocks = list((component.blocks or {}).values()) for block in blocks: for file, siblings in _iter_files(block.fields): - if file.component is None and file.component_ref is None: + if file.component is None and file.component_ftype is None: continue where = f"{component.name}: File {file.name!r}" if file.direction != "in": raise ValueError(f"{where}: only an input file may link a component") if file.component is None: - raise ValueError(f"{where}: component_ref without component") + raise ValueError(f"{where}: component_ftype without component") targets = [ n for n, c in spec.children(component.name).items() if admits(file.component, c) ] @@ -1368,17 +1368,17 @@ def _validate_file_links(component: "ComponentBase", spec: "Dfns") -> None: f"{where}: component={file.component!r} matches none of this " f"component's children" ) - if file.component_ref is None: + if file.component_ftype is None: components = spec.components families = {components[n].ftype or n for n in targets} if len(families) > 1: raise ValueError( f"{where}: component={file.component!r} matches several " - f"components {sorted(targets)} and has no component_ref" + f"components {sorted(targets)} and has no component_ftype" ) - elif not isinstance(siblings.get(file.component_ref), String): + elif not isinstance(siblings.get(file.component_ftype), String): raise ValueError( - f"{where}: component_ref={file.component_ref!r} is not a sibling " + f"{where}: component_ftype={file.component_ftype!r} is not a sibling " f"String field in the same record" ) From 3b64abb934f0d1420fb270db9d0dd30b7c236fd3 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Sat, 3 Oct 2026 14:20:11 -0700 Subject: [PATCH 5/5] feat(dfns): pin parents of narrowly linked utilities utl-spc, utl-spca, utl-tas and utl-ncf derived 'package' as their parent, though only a few packages link them. Name those packages instead, checked to admit every linker. Note in the spec that links are exact and a derived parent may admit more. Co-Authored-By: Claude Opus 5.5 --- .../__snapshots__/v2.0.0.dev2/utl-ncf.json | 11 ++++++++++- .../__snapshots__/v2.0.0.dev2/utl-ncf.toml | 11 ++++++++++- .../__snapshots__/v2.0.0.dev2/utl-ncf.yaml | 10 +++++++++- .../__snapshots__/v2.0.0.dev2/utl-spc.json | 5 ++++- .../__snapshots__/v2.0.0.dev2/utl-spc.toml | 5 ++++- .../__snapshots__/v2.0.0.dev2/utl-spc.yaml | 4 +++- .../__snapshots__/v2.0.0.dev2/utl-spca.json | 5 ++++- .../__snapshots__/v2.0.0.dev2/utl-spca.toml | 5 ++++- .../__snapshots__/v2.0.0.dev2/utl-spca.yaml | 4 +++- .../__snapshots__/v2.0.0.dev2/utl-tas.json | 6 +++++- .../__snapshots__/v2.0.0.dev2/utl-tas.toml | 6 +++++- .../__snapshots__/v2.0.0.dev2/utl-tas.yaml | 5 ++++- .../__snapshots__/v2.0.0.dev3/utl-ncf.json | 11 ++++++++++- .../__snapshots__/v2.0.0.dev3/utl-ncf.toml | 11 ++++++++++- .../__snapshots__/v2.0.0.dev3/utl-ncf.yaml | 10 +++++++++- .../__snapshots__/v2.0.0.dev3/utl-spc.json | 5 ++++- .../__snapshots__/v2.0.0.dev3/utl-spc.toml | 5 ++++- .../__snapshots__/v2.0.0.dev3/utl-spc.yaml | 4 +++- .../__snapshots__/v2.0.0.dev3/utl-spca.json | 5 ++++- .../__snapshots__/v2.0.0.dev3/utl-spca.toml | 5 ++++- .../__snapshots__/v2.0.0.dev3/utl-spca.yaml | 4 +++- .../__snapshots__/v2.0.0.dev3/utl-tas.json | 6 +++++- .../__snapshots__/v2.0.0.dev3/utl-tas.toml | 6 +++++- .../__snapshots__/v2.0.0.dev3/utl-tas.yaml | 5 ++++- autotest/dfns/test_migrate.py | 11 +++++++---- autotest/dfns/test_schema.py | 2 +- docs/md/dfnspec.md | 2 +- .../dfns/migrate_to_v2_0_0_dev2.py | 18 +++++++++++++++++- 28 files changed, 156 insertions(+), 31 deletions(-) diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json index ec515779..e8f71452 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json @@ -2,9 +2,18 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-ncf", - "parent": "package", "ftype": "NCF6", "subtype": "utility", + "parent": [ + "gwe-dis", + "gwe-disv", + "gwf-dis", + "gwf-disv", + "gwt-dis", + "gwt-disv", + "prt-dis", + "prt-disv" + ], "dims": { "ncpl": { "value": "ncpl" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml index bc88b809..57730932 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml @@ -1,9 +1,18 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-ncf" -parent = "package" ftype = "NCF6" subtype = "utility" +parent = [ + "gwe-dis", + "gwe-disv", + "gwf-dis", + "gwf-disv", + "gwt-dis", + "gwt-disv", + "prt-dis", + "prt-disv", +] [dims.ncpl] value = "ncpl" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml index 3f3dc5c2..883b1108 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml @@ -1,9 +1,17 @@ type: package schema_version: 2.0.0.dev2 name: utl-ncf -parent: package ftype: NCF6 subtype: utility +parent: + - gwe-dis + - gwe-disv + - gwf-dis + - gwf-disv + - gwt-dis + - gwt-disv + - prt-dis + - prt-disv dims: ncpl: value: ncpl diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json index 135de0f0..59e7fd15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json @@ -2,10 +2,13 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-spc", - "parent": "package", "ftype": "SPC6", "multi": true, "subtype": "utility", + "parent": [ + "gwe-ssm", + "gwt-ssm" + ], "dims": { "maxbound": { "value": "maxbound" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml index b2935112..39a2ab61 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml @@ -1,10 +1,13 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-spc" -parent = "package" ftype = "SPC6" multi = true subtype = "utility" +parent = [ + "gwe-ssm", + "gwt-ssm", +] [dims.maxbound] value = "maxbound" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml index 72f9b185..811e8ade 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml @@ -1,10 +1,12 @@ type: package schema_version: 2.0.0.dev2 name: utl-spc -parent: package ftype: SPC6 multi: true subtype: utility +parent: + - gwe-ssm + - gwt-ssm dims: maxbound: value: maxbound diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json index 16dbbd7c..c6550d33 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.json @@ -2,10 +2,13 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-spca", - "parent": "package", "ftype": "SPC6", "multi": true, "subtype": "utility", + "parent": [ + "gwe-ssm", + "gwt-ssm" + ], "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml index 90095a40..9c078cec 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.toml @@ -1,10 +1,13 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-spca" -parent = "package" ftype = "SPC6" multi = true subtype = "utility" +parent = [ + "gwe-ssm", + "gwt-ssm", +] [blocks.options.fields.readasarrays] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml index 60fb6a48..849963c3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spca.yaml @@ -1,10 +1,12 @@ type: package schema_version: 2.0.0.dev2 name: utl-spca -parent: package ftype: SPC6 multi: true subtype: utility +parent: + - gwe-ssm + - gwt-ssm blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.json b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.json index 62d2faf1..0efc0d88 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.json @@ -2,10 +2,14 @@ "type": "package", "schema_version": "2.0.0.dev2", "name": "utl-tas", - "parent": "package", "ftype": "TAS6", "multi": true, "subtype": "utility", + "parent": [ + "gwf-evta", + "gwf-rcha", + "utl-spca" + ], "dims": { "time_series_name": { "value": "len(time_series_name)" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.toml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.toml index 8a7b598f..85a8a917 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.toml @@ -1,10 +1,14 @@ type = "package" schema_version = "2.0.0.dev2" name = "utl-tas" -parent = "package" ftype = "TAS6" multi = true subtype = "utility" +parent = [ + "gwf-evta", + "gwf-rcha", + "utl-spca", +] [dims.time_series_name] value = "len(time_series_name)" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.yaml index 90cc520b..4816d02c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-tas.yaml @@ -1,10 +1,13 @@ type: package schema_version: 2.0.0.dev2 name: utl-tas -parent: package ftype: TAS6 multi: true subtype: utility +parent: + - gwf-evta + - gwf-rcha + - utl-spca dims: time_series_name: value: len(time_series_name) diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json index 3ea06204..9ec40eb4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json @@ -2,9 +2,18 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-ncf", - "parent": "package", "ftype": "NCF6", "subtype": "utility", + "parent": [ + "gwe-dis", + "gwe-disv", + "gwf-dis", + "gwf-disv", + "gwt-dis", + "gwt-disv", + "prt-dis", + "prt-disv" + ], "dims": { "ncpl": { "value": "ncpl" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml index 0b82dd49..fbb3803a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml @@ -1,9 +1,18 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-ncf" -parent = "package" ftype = "NCF6" subtype = "utility" +parent = [ + "gwe-dis", + "gwe-disv", + "gwf-dis", + "gwf-disv", + "gwt-dis", + "gwt-disv", + "prt-dis", + "prt-disv", +] [dims.ncpl] value = "ncpl" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml index 8c6b9b63..1524f691 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml @@ -1,9 +1,17 @@ type: package schema_version: 2.0.0.dev3 name: utl-ncf -parent: package ftype: NCF6 subtype: utility +parent: + - gwe-dis + - gwe-disv + - gwf-dis + - gwf-disv + - gwt-dis + - gwt-disv + - prt-dis + - prt-disv dims: ncpl: value: ncpl diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json index 4be49441..391ea5a8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json @@ -2,10 +2,13 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-spc", - "parent": "package", "ftype": "SPC6", "multi": true, "subtype": "utility", + "parent": [ + "gwe-ssm", + "gwt-ssm" + ], "dims": { "maxbound": { "value": "maxbound" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml index 168e90e1..0c5a9d66 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml @@ -1,10 +1,13 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-spc" -parent = "package" ftype = "SPC6" multi = true subtype = "utility" +parent = [ + "gwe-ssm", + "gwt-ssm", +] [dims.maxbound] value = "maxbound" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml index 61fd62cf..7cbd4380 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml @@ -1,10 +1,12 @@ type: package schema_version: 2.0.0.dev3 name: utl-spc -parent: package ftype: SPC6 multi: true subtype: utility +parent: + - gwe-ssm + - gwt-ssm dims: maxbound: value: maxbound diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json index 6eac3ae0..1eca4a27 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.json @@ -2,10 +2,13 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-spca", - "parent": "package", "ftype": "SPC6", "multi": true, "subtype": "utility", + "parent": [ + "gwe-ssm", + "gwt-ssm" + ], "blocks": { "options": { "fields": { diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml index 96650be6..df8adbfa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.toml @@ -1,10 +1,13 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-spca" -parent = "package" ftype = "SPC6" multi = true subtype = "utility" +parent = [ + "gwe-ssm", + "gwt-ssm", +] [blocks.options.fields.readasarrays] type = "keyword" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml index 94dd2e9d..c81b213b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spca.yaml @@ -1,10 +1,12 @@ type: package schema_version: 2.0.0.dev3 name: utl-spca -parent: package ftype: SPC6 multi: true subtype: utility +parent: + - gwe-ssm + - gwt-ssm blocks: options: fields: diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.json b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.json index 3cbeb447..f00fb75f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.json @@ -2,10 +2,14 @@ "type": "package", "schema_version": "2.0.0.dev3", "name": "utl-tas", - "parent": "package", "ftype": "TAS6", "multi": true, "subtype": "utility", + "parent": [ + "gwf-evta", + "gwf-rcha", + "utl-spca" + ], "dims": { "time_series_name": { "value": "len(time_series_name)" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.toml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.toml index 49c80d06..100821cb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.toml @@ -1,10 +1,14 @@ type = "package" schema_version = "2.0.0.dev3" name = "utl-tas" -parent = "package" ftype = "TAS6" multi = true subtype = "utility" +parent = [ + "gwf-evta", + "gwf-rcha", + "utl-spca", +] [dims.time_series_name] value = "len(time_series_name)" diff --git a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.yaml b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.yaml index 418da9c1..066a6c49 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-tas.yaml @@ -1,10 +1,13 @@ type: package schema_version: 2.0.0.dev3 name: utl-tas -parent: package ftype: TAS6 multi: true subtype: utility +parent: + - gwf-evta + - gwf-rcha + - utl-spca dims: time_series_name: value: len(time_series_name) diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index afefba0c..238b7443 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -539,10 +539,13 @@ def test_migrate_unlinked_files(linked_spec): [ ("utl-ts", "package"), ("utl-obs", "package"), - ("utl-ncf", "package"), - ("utl-spc", "package"), - ("utl-spca", "package"), - ("utl-tas", "package"), + ( + "utl-ncf", + [f"{m}-{d}" for m in ("gwe", "gwf", "gwt", "prt") for d in ("dis", "disv")], + ), + ("utl-spc", ["gwe-ssm", "gwt-ssm"]), + ("utl-spca", ["gwe-ssm", "gwt-ssm"]), + ("utl-tas", ["gwf-evta", "gwf-rcha", "utl-spca"]), ("utl-tvk", "gwf-npf"), ("utl-tvs", "gwf-sto"), ("utl-sfrtab", "gwf-sfr"), diff --git a/autotest/dfns/test_schema.py b/autotest/dfns/test_schema.py index bef1f2f6..ab62e52d 100644 --- a/autotest/dfns/test_schema.py +++ b/autotest/dfns/test_schema.py @@ -380,7 +380,7 @@ def test_tas_array_is_per_layer_model_attached(dev3_spec): """tas_array is a U2DREL control record of one layer's worth of cells (ncpl), so utl-tas must be model-attached for the model-scoped ncpl dim to be visible.""" tas = dev3_spec.components["utl-tas"] - assert tas.parent == "package" + assert "ncpl" in dev3_spec.inherited_dims("utl-tas") assert tas.blocks["time"].fields["tas_array"].shape == ["ncpl"] diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index 517c83ae..778fb266 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -160,7 +160,7 @@ A term **admits** a component if it equals the component's name, type, or subtyp **Note:** Terms may be mixed. A type or subtype subsumes any named component of the same type or subtype: e.g., `["gwf-sfr", "package"]` reduces to `["package"]` since `gwf-sfr` is a package. -A component that other components' input files link (see [File](#file)), such as a utility, has its `parent` derived from the components that link to it: the simplest selector that admits all of them. +A component that other components' input files link (see [File](#file)), such as a utility, has its `parent` derived from the components that link to it: the simplest selector that admits all of them. The links are the exact relation; such a `parent` covers them but may admit more (e.g. `utl-ts`'s `package` admits `gwf-npf`, which never links a time series file). #### `ftype` diff --git a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py index bf1a1b10..95102e04 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -99,6 +99,17 @@ def try_parse_bool(v: Any, default: bool = False) -> bool: ("*-nam", "fname"): ("package", "ftype"), } +# Parents for linked utilities whose derived parent (see `v2.covering_selector`) +# would be `package`, though only these few packages link them. Each must +# still admit every component that links the utility; `link_components` +# checks. +_LINKED_PARENTS: dict[str, list[str]] = { + "utl-spc": ["gwe-ssm", "gwt-ssm"], + "utl-spca": ["gwe-ssm", "gwt-ssm"], + "utl-tas": ["gwf-evta", "gwf-rcha", "utl-spca"], + "utl-ncf": [f"{m}-{d}" for m in ("gwe", "gwf", "gwt", "prt") for d in ("dis", "disv")], +} + # Array-based variants, which share their base's ftype token: mf6 maps these # to the base type when matching name-file ftypes (InputLoadType.f90). _FTYPE_VARIANTS = frozenset({"evta", "rcha", "spca", "rivg", "chdg", "welg", "drng", "ghbg"}) @@ -2198,7 +2209,12 @@ def link_components( ] elif not found: raise ValueError(f"{name}: no component links this utility, so it has no parent") - parent = v2.covering_selector(found, components) + if name in _LINKED_PARENTS: + parent: str | list[str] = _LINKED_PARENTS[name] + if missing := [c.name for c in found if not v2.admits(parent, c)]: + raise ValueError(f"{name}: parent {parent!r} doesn't admit linkers {missing}") + else: + parent = v2.covering_selector(found, components) result[name] = component.model_copy(update={"parent": parent}) return result