Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flopy4/mf6/_contract.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# autogenerated file, do not modify
MF6_VERSION = "6.9.0.dev0"
DFN_COMMIT = "203d72f0e89bc049154f4e391e6e4fd18dab99b6"
DFN_COMMIT = "65278c938a0c6e742b52fa7398b35a9aea6c0752"
DFN_SCHEMA_VERSION = "2.0.0.dev3"
GENERATED_FILES = (
"chf/__init__.py",
Expand Down
8 changes: 4 additions & 4 deletions flopy4/mf6/chf/oc.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ class Oc(Package):
@attrs.define
class Format(Record):
_keyword: ClassVar[str] = ""
format_: str = string()
columns: Optional[int] = integer(default=None, tagged=True, optional=True)
width: Optional[int] = integer(default=None, tagged=True, optional=True)
digits: Optional[int] = integer(default=None, tagged=True, optional=True)
columns: int = integer(tagged=True)
width: int = integer(tagged=True)
digits: int = integer(tagged=True)
format_: Optional[str] = string(default=None, optional=True)

@attrs.define
class Qoutflowprint(Record):
Expand Down
2 changes: 1 addition & 1 deletion flopy4/mf6/codec/reader/grammar/generated/chf-oc.lark
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ saverecord__rec__elem: "save"i saverecord__rtype__val ocsetting__union [_remark]
saverecord__rtype__val: word
printrecord__rec__elem: "print"i printrecord__rtype__val ocsetting__union [_remark] _NL
printrecord__rtype__val: word
formatrecord__rec: [formatrecord__columns__val] [formatrecord__width__val] [formatrecord__digits__val] formatrecord__format__val
formatrecord__rec: formatrecord__columns__val formatrecord__width__val formatrecord__digits__val [formatrecord__format__val]
formatrecord__columns__val: "columns"i integer
formatrecord__width__val: "width"i integer
formatrecord__digits__val: "digits"i integer
Expand Down
2 changes: 1 addition & 1 deletion flopy4/mf6/codec/reader/grammar/generated/gwe-oc.lark
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ saverecord__rec__elem: "save"i saverecord__rtype__val ocsetting__union [_remark]
saverecord__rtype__val: word
printrecord__rec__elem: "print"i printrecord__rtype__val ocsetting__union [_remark] _NL
printrecord__rtype__val: word
formatrecord__rec: [formatrecord__columns__val] [formatrecord__width__val] [formatrecord__digits__val] formatrecord__format__val
formatrecord__rec: formatrecord__columns__val formatrecord__width__val formatrecord__digits__val [formatrecord__format__val]
formatrecord__columns__val: "columns"i integer
formatrecord__width__val: "width"i integer
formatrecord__digits__val: "digits"i integer
Expand Down
2 changes: 1 addition & 1 deletion flopy4/mf6/codec/reader/grammar/generated/gwf-oc.lark
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ saverecord__rec__elem: "save"i saverecord__rtype__val ocsetting__union [_remark]
saverecord__rtype__val: word
printrecord__rec__elem: "print"i printrecord__rtype__val ocsetting__union [_remark] _NL
printrecord__rtype__val: word
formatrecord__rec: [formatrecord__columns__val] [formatrecord__width__val] [formatrecord__digits__val] formatrecord__format__val
formatrecord__rec: formatrecord__columns__val formatrecord__width__val formatrecord__digits__val [formatrecord__format__val]
formatrecord__columns__val: "columns"i integer
formatrecord__width__val: "width"i integer
formatrecord__digits__val: "digits"i integer
Expand Down
2 changes: 1 addition & 1 deletion flopy4/mf6/codec/reader/grammar/generated/gwt-ist.lark
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ decay_sorbed__val: "decay_sorbed"i [_remark] [_NL] array
bulk_density__val: "bulk_density"i [_remark] [_NL] array
distcoef__val: "distcoef"i [_remark] [_NL] array
sp2__val: "sp2"i [_remark] [_NL] array
formatrecord__rec: [formatrecord__columns__val] [formatrecord__width__val] [formatrecord__digits__val] formatrecord__format__val
formatrecord__rec: formatrecord__columns__val formatrecord__width__val formatrecord__digits__val [formatrecord__format__val]
formatrecord__columns__val: "columns"i integer
formatrecord__width__val: "width"i integer
formatrecord__digits__val: "digits"i integer
Expand Down
2 changes: 1 addition & 1 deletion flopy4/mf6/codec/reader/grammar/generated/gwt-oc.lark
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ saverecord__rec__elem: "save"i saverecord__rtype__val ocsetting__union [_remark]
saverecord__rtype__val: word
printrecord__rec__elem: "print"i printrecord__rtype__val ocsetting__union [_remark] _NL
printrecord__rtype__val: word
formatrecord__rec: [formatrecord__columns__val] [formatrecord__width__val] [formatrecord__digits__val] formatrecord__format__val
formatrecord__rec: formatrecord__columns__val formatrecord__width__val formatrecord__digits__val [formatrecord__format__val]
formatrecord__columns__val: "columns"i integer
formatrecord__width__val: "width"i integer
formatrecord__digits__val: "digits"i integer
Expand Down
2 changes: 1 addition & 1 deletion flopy4/mf6/codec/reader/grammar/generated/olf-oc.lark
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ saverecord__rec__elem: "save"i saverecord__rtype__val ocsetting__union [_remark]
saverecord__rtype__val: word
printrecord__rec__elem: "print"i printrecord__rtype__val ocsetting__union [_remark] _NL
printrecord__rtype__val: word
formatrecord__rec: [formatrecord__columns__val] [formatrecord__width__val] [formatrecord__digits__val] formatrecord__format__val
formatrecord__rec: formatrecord__columns__val formatrecord__width__val formatrecord__digits__val [formatrecord__format__val]
formatrecord__columns__val: "columns"i integer
formatrecord__width__val: "width"i integer
formatrecord__digits__val: "digits"i integer
Expand Down
8 changes: 4 additions & 4 deletions flopy4/mf6/gwe/oc.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ class Oc(Package):
@attrs.define
class Format(Record):
_keyword: ClassVar[str] = ""
format_: str = string()
columns: Optional[int] = integer(default=None, tagged=True, optional=True)
width: Optional[int] = integer(default=None, tagged=True, optional=True)
digits: Optional[int] = integer(default=None, tagged=True, optional=True)
columns: int = integer(tagged=True)
width: int = integer(tagged=True)
digits: int = integer(tagged=True)
format_: Optional[str] = string(default=None, optional=True)

@attrs.define
class Temperatureprint(Record):
Expand Down
15 changes: 1 addition & 14 deletions flopy4/mf6/gwf/maw.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,6 @@ class Status(Item):
_keyword: ClassVar[str] = "status"
status: str = string()

@attrs.define
class ConnectionStatus(Item):
_keyword: ClassVar[str] = "connection_status"
icon: int = integer(index=True)
connstatus: str = string()

@attrs.define
class Bottom(Item):
_keyword: ClassVar[str] = "bottom"
bottom: float = double()

@attrs.define
class FlowingWell(Item):
_keyword: ClassVar[str] = "flowing_well"
Expand Down Expand Up @@ -158,7 +147,7 @@ class Auxiliary(Item):
@attrs.define
class StressPeriodData(Item):
ifno: int = integer(index=True, fk="packagedata.ifno")
mawsetting: "Maw.Status | Maw.ConnectionStatus | Maw.Bottom | Maw.FlowingWell | Maw.Rate | Maw.WellHead | Maw.HeadLimit | Maw.Shutoff | Maw.RateScaling | Maw.Auxiliary" = union() # noqa: E501
mawsetting: "Maw.Status | Maw.FlowingWell | Maw.Rate | Maw.WellHead | Maw.HeadLimit | Maw.Shutoff | Maw.RateScaling | Maw.Auxiliary" = union() # noqa: E501

auxiliary: Optional[NDArray[np.str_]] = array(
default=None,
Expand Down Expand Up @@ -311,8 +300,6 @@ class StressPeriodData(Item):
MawConnectiondata = Maw.Connectiondata
MawAngledata = Maw.Angledata
MawStatus = Maw.Status
MawConnectionStatus = Maw.ConnectionStatus
MawBottom = Maw.Bottom
MawFlowingWell = Maw.FlowingWell
MawRate = Maw.Rate
MawWellHead = Maw.WellHead
Expand Down
8 changes: 4 additions & 4 deletions flopy4/mf6/gwf/oc.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ class Oc(Package):
@attrs.define
class Format(Record):
_keyword: ClassVar[str] = ""
format_: str = string()
columns: Optional[int] = integer(default=None, tagged=True, optional=True)
width: Optional[int] = integer(default=None, tagged=True, optional=True)
digits: Optional[int] = integer(default=None, tagged=True, optional=True)
columns: int = integer(tagged=True)
width: int = integer(tagged=True)
digits: int = integer(tagged=True)
format_: Optional[str] = string(default=None, optional=True)

@attrs.define
class Headprint(Record):
Expand Down
8 changes: 4 additions & 4 deletions flopy4/mf6/gwt/ist.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ class Ist(Package):
@attrs.define
class Format(Record):
_keyword: ClassVar[str] = ""
format_: str = string()
columns: Optional[int] = integer(default=None, tagged=True, optional=True)
width: Optional[int] = integer(default=None, tagged=True, optional=True)
digits: Optional[int] = integer(default=None, tagged=True, optional=True)
columns: int = integer(tagged=True)
width: int = integer(tagged=True)
digits: int = integer(tagged=True)
format_: Optional[str] = string(default=None, optional=True)

@attrs.define
class Cimprint(Record):
Expand Down
8 changes: 4 additions & 4 deletions flopy4/mf6/gwt/oc.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ class Oc(Package):
@attrs.define
class Format(Record):
_keyword: ClassVar[str] = ""
format_: str = string()
columns: Optional[int] = integer(default=None, tagged=True, optional=True)
width: Optional[int] = integer(default=None, tagged=True, optional=True)
digits: Optional[int] = integer(default=None, tagged=True, optional=True)
columns: int = integer(tagged=True)
width: int = integer(tagged=True)
digits: int = integer(tagged=True)
format_: Optional[str] = string(default=None, optional=True)

@attrs.define
class Concentrationprint(Record):
Expand Down
8 changes: 4 additions & 4 deletions flopy4/mf6/olf/oc.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ class Oc(Package):
@attrs.define
class Format(Record):
_keyword: ClassVar[str] = ""
format_: str = string()
columns: Optional[int] = integer(default=None, tagged=True, optional=True)
width: Optional[int] = integer(default=None, tagged=True, optional=True)
digits: Optional[int] = integer(default=None, tagged=True, optional=True)
columns: int = integer(tagged=True)
width: int = integer(tagged=True)
digits: int = integer(tagged=True)
format_: Optional[str] = string(default=None, optional=True)

@attrs.define
class Qoutflowprint(Record):
Expand Down
2 changes: 1 addition & 1 deletion flopy4/mf6/record.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def from_tokens(cls, tokens: str | list[str]) -> "Record":
fields, in declaration order. E.g. for ``Oc.Headprint``, these are
all equivalent: ``"HEAD PRINT_FORMAT COLUMNS 10 WIDTH 12 DIGITS 6
exponential"``, ``"COLUMNS 10 WIDTH 12 DIGITS 6 exponential"``,
``"exponential"``.
``"10 12 6 exponential"``.
"""
if isinstance(tokens, str):
tokens = tokens.split()
Expand Down
9 changes: 8 additions & 1 deletion flopy4/mf6/utils/codegen/make.py
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,9 @@ class can reference an earlier one).
is a required tagged scalar (IMS ``INNER_RCLOSE <value> ...``), its tag
is the trigger token: it becomes ``_keyword`` and the child an untagged
data field, so the record is found by its leading token like any other.
Not if a later child is tagged too (OC's ``COLUMNS <columns> WIDTH
<width> DIGITS <digits> [<format>]``): the trigger's value is written
after the tagged fields, so it would land after ``DIGITS <digits>``.
Otherwise there is no trigger token (``_keyword = ""``) and all children
become data fields.

Expand Down Expand Up @@ -791,7 +794,11 @@ class bodies can't see sibling names at class-body-execution time.
kw = first.name
aliases = first.aliases
data_children = children[1:]
elif getattr(first, "tagged", False) and not first.optional:
elif (
getattr(first, "tagged", False)
and not first.optional
and not any(getattr(c, "tagged", False) for c in children[1:])
):
kw = first.name
aliases = getattr(first, "aliases", None) or []
data_children = children
Expand Down
Loading
Loading