fix drop_none and attach_children

modflowpy · Dec 10, 2024 · 173ccec · 173ccec
1 parent 4047f46
commit 173ccec
Show file tree

Hide file tree

Showing 114 changed files with 1,122 additions and 2 deletions.
diff --git a/spec/dfn2toml.py b/spec/dfn2toml.py
@@ -18,7 +18,7 @@ def _attach_children(d: Any):
         if isinstance(d, Mapping):
             if "children" in d:
                 for n, c in d["children"].items():
-                    d[n] = Shim._attach_children(c)
+                    d[n] = c
                 del d["children"]
             d = {k: Shim._attach_children(v) for k, v in d.items()}
         return d
@@ -29,7 +29,7 @@ def _drop_none(d: Any):
             return {
                 k: Shim._drop_none(v)
                 for k, v in d.items()
-                if (v or isinstance(v, bool))
+                if v is not None
             }
         else:
             return d

diff --git a/spec/toml/chf-cdb.toml b/spec/toml/chf-cdb.toml
@@ -56,11 +56,13 @@ name = "stress_period_data"
 type = "list"
 shape = "(maxbound)"
 block = "period"
+description = ""
 
 [period.stress_period_data.stress_period_data]
 name = "stress_period_data"
 type = "record"
 block = "period"
+description = ""
 
 [period.stress_period_data.stress_period_data.cellid]
 block = "period"
@@ -77,6 +79,7 @@ description = "is the cell identifier, and depends on the type of grid that is u
 block = "period"
 name = "idcxs"
 type = "integer"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"
@@ -89,6 +92,7 @@ numeric_index = "true"
 block = "period"
 name = "width"
 type = "double precision"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"
@@ -114,6 +118,7 @@ mf6internal = "auxvar"
 block = "period"
 name = "boundname"
 type = "string"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"

diff --git a/spec/toml/chf-chd.toml b/spec/toml/chf-chd.toml
@@ -76,11 +76,13 @@ name = "stress_period_data"
 type = "list"
 shape = "(maxbound)"
 block = "period"
+description = ""
 
 [period.stress_period_data.stress_period_data]
 name = "stress_period_data"
 type = "record"
 block = "period"
+description = ""
 
 [period.stress_period_data.stress_period_data.cellid]
 block = "period"
@@ -97,6 +99,7 @@ description = "is the cell identifier, and depends on the type of grid that is u
 block = "period"
 name = "head"
 type = "double precision"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"
@@ -121,6 +124,7 @@ description = "represents the values of the auxiliary variables for each constan
 block = "period"
 name = "boundname"
 type = "string"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"

diff --git a/spec/toml/chf-cxs.toml b/spec/toml/chf-cxs.toml
@@ -24,16 +24,19 @@ name = "packagedata"
 type = "list"
 shape = "(nsections)"
 block = "packagedata"
+description = ""
 
 [packagedata.packagedata.packagedata]
 name = "packagedata"
 type = "record"
 block = "packagedata"
+description = ""
 
 [packagedata.packagedata.packagedata.idcxs]
 block = "packagedata"
 name = "idcxs"
 type = "integer"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"
@@ -45,6 +48,7 @@ numeric_index = "true"
 block = "packagedata"
 name = "nxspoints"
 type = "integer"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"
@@ -56,16 +60,19 @@ name = "crosssectiondata"
 type = "list"
 shape = "(npoints)"
 block = "crosssectiondata"
+description = ""
 
 [crosssectiondata.crosssectiondata.crosssectiondata]
 name = "crosssectiondata"
 type = "record"
 block = "crosssectiondata"
+description = ""
 
 [crosssectiondata.crosssectiondata.crosssectiondata.xfraction]
 block = "crosssectiondata"
 name = "xfraction"
 type = "double precision"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"
@@ -76,6 +83,7 @@ description = "real value that defines the station (x) data for the cross-sectio
 block = "crosssectiondata"
 name = "height"
 type = "double precision"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"
@@ -86,6 +94,7 @@ description = "real value that is the height relative to the top of the lowest e
 block = "crosssectiondata"
 name = "manfraction"
 type = "double precision"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"

diff --git a/spec/toml/chf-dis2d.toml b/spec/toml/chf-dis2d.toml
@@ -73,6 +73,7 @@ type = "double precision"
 shape = "(ncol, nrow)"
 block = "griddata"
 description = "is the bottom elevation for each cell."
+default = 0.0
 
 [griddata.idomain]
 name = "idomain"

diff --git a/spec/toml/chf-disv1d.toml b/spec/toml/chf-disv1d.toml
@@ -75,11 +75,13 @@ name = "vertices"
 type = "list"
 shape = "(nvert)"
 block = "vertices"
+description = ""
 
 [vertices.vertices.vertices]
 name = "vertices"
 type = "record"
 block = "vertices"
+description = ""
 
 [vertices.vertices.vertices.iv]
 block = "vertices"
@@ -120,11 +122,13 @@ name = "cell1d"
 type = "list"
 shape = "(nodes)"
 block = "cell1d"
+description = ""
 
 [cell1d.cell1d.cell1d]
 name = "cell1d"
 type = "record"
 block = "cell1d"
+description = ""
 
 [cell1d.cell1d.cell1d.icell1d]
 block = "cell1d"

diff --git a/spec/toml/chf-disv2d.toml b/spec/toml/chf-disv2d.toml
@@ -68,11 +68,13 @@ name = "vertices"
 type = "list"
 shape = "(nvert)"
 block = "vertices"
+description = ""
 
 [vertices.vertices.vertices]
 name = "vertices"
 type = "record"
 block = "vertices"
+description = ""
 
 [vertices.vertices.vertices.iv]
 block = "vertices"
@@ -113,11 +115,13 @@ name = "cell2d"
 type = "list"
 shape = "(nodes)"
 block = "cell2d"
+description = ""
 
 [cell2d.cell2d.cell2d]
 name = "cell2d"
 type = "record"
 block = "cell2d"
+description = ""
 
 [cell2d.cell2d.cell2d.icell2d]
 block = "cell2d"

diff --git a/spec/toml/chf-flw.toml b/spec/toml/chf-flw.toml
@@ -76,11 +76,13 @@ name = "stress_period_data"
 type = "list"
 shape = "(maxbound)"
 block = "period"
+description = ""
 
 [period.stress_period_data.stress_period_data]
 name = "stress_period_data"
 type = "record"
 block = "period"
+description = ""
 
 [period.stress_period_data.stress_period_data.cellid]
 block = "period"
@@ -97,6 +99,7 @@ description = "is the cell identifier, and depends on the type of grid that is u
 block = "period"
 name = "q"
 type = "double precision"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"
@@ -121,6 +124,7 @@ description = "represents the values of the auxiliary variables for each inflow.
 block = "period"
 name = "boundname"
 type = "string"
+shape = ""
 tagged = "false"
 in_record = "true"
 reader = "urword"

diff --git a/spec/toml/chf-ic.toml b/spec/toml/chf-ic.toml
@@ -13,3 +13,4 @@ type = "double precision"
 shape = "(nodes)"
 block = "griddata"
 description = "is the initial (starting) stage---that is, stage at the beginning of the swf model simulation.  strt must be specified for all swf model simulations. one value is read for every model reach."
+default = 0.0
diff --git a/spec/toml/chf-nam.toml b/spec/toml/chf-nam.toml
@@ -54,11 +54,13 @@ description = "keyword that indicates whether the surface water stage in a reach
 name = "packages"
 type = "list"
 block = "packages"
+description = ""
 
 [packages.packages.packages]
 name = "packages"
 type = "record"
 block = "packages"
+description = ""
 
 [packages.packages.packages.ftype]
 block = "packages"