From 82fb6c29b201c314948550d79da6e0568ed2df0f Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Fri, 2 Oct 2026 18:12:18 -0700 Subject: [PATCH] fix(dfns): scope package dims to their component The dev2 migration gave every dimensions-block integer the scope implied by the component's parent, so any package under a model declared its dims at model scope (and any under the simulation at simulation scope). Package dims like nseg, numgnc and maxbound then leaked into every other package's inherited dims, and names like maxbound were declared model-wide by dozens of components. utl-laktab/utl-sfrtab's nrow/ncol even collided with the discretization's at simulation scope. Only the discretization's grid dims and TDIS's nper are shared; everything else is now component-scoped. 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 | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev2/chf-cxs.toml | 2 -- .../__snapshots__/v2.0.0.dev2/chf-cxs.yaml | 2 -- .../__snapshots__/v2.0.0.dev2/chf-evp.json | 3 +- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev2/chf-flw.toml | 1 - .../__snapshots__/v2.0.0.dev2/chf-flw.yaml | 1 - .../__snapshots__/v2.0.0.dev2/chf-pcp.json | 3 +- .../__snapshots__/v2.0.0.dev2/chf-pcp.toml | 1 - .../__snapshots__/v2.0.0.dev2/chf-pcp.yaml | 1 - .../__snapshots__/v2.0.0.dev2/chf-zdg.json | 3 +- .../__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 | 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 | 3 +- .../__snapshots__/v2.0.0.dev2/exg-gwegwe.toml | 1 - .../__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml | 1 - .../__snapshots__/v2.0.0.dev2/exg-gwfgwf.json | 3 +- .../__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml | 1 - .../__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml | 1 - .../__snapshots__/v2.0.0.dev2/exg-gwtgwt.json | 3 +- .../__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 | 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 | 3 +- .../__snapshots__/v2.0.0.dev2/gwe-ctp.toml | 1 - .../__snapshots__/v2.0.0.dev2/gwe-ctp.yaml | 1 - .../__snapshots__/v2.0.0.dev2/gwe-esl.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwe-esl.toml | 1 - .../__snapshots__/v2.0.0.dev2/gwe-esl.yaml | 1 - .../__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-buy.json | 3 +- .../__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 | 3 +- .../__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 | 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-drn.json | 3 +- .../__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 | 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-ghb.json | 3 +- .../__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 | 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 | 6 ++-- .../__snapshots__/v2.0.0.dev2/gwf-gnc.toml | 2 -- .../__snapshots__/v2.0.0.dev2/gwf-gnc.yaml | 2 -- .../__snapshots__/v2.0.0.dev2/gwf-hfb.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-hfb.toml | 1 - .../__snapshots__/v2.0.0.dev2/gwf-hfb.yaml | 1 - .../__snapshots__/v2.0.0.dev2/gwf-lak.json | 12 +++----- .../__snapshots__/v2.0.0.dev2/gwf-lak.toml | 4 --- .../__snapshots__/v2.0.0.dev2/gwf-lak.yaml | 4 --- .../__snapshots__/v2.0.0.dev2/gwf-maw.json | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev2/gwf-mvr.toml | 2 -- .../__snapshots__/v2.0.0.dev2/gwf-mvr.yaml | 2 -- .../__snapshots__/v2.0.0.dev2/gwf-rch.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-rch.toml | 1 - .../__snapshots__/v2.0.0.dev2/gwf-rch.yaml | 1 - .../__snapshots__/v2.0.0.dev2/gwf-riv.json | 3 +- .../__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 | 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 | 3 +- .../__snapshots__/v2.0.0.dev2/gwf-sfr.toml | 1 - .../__snapshots__/v2.0.0.dev2/gwf-sfr.yaml | 1 - .../__snapshots__/v2.0.0.dev2/gwf-uzf.json | 9 ++---- .../__snapshots__/v2.0.0.dev2/gwf-uzf.toml | 3 -- .../__snapshots__/v2.0.0.dev2/gwf-uzf.yaml | 3 -- .../__snapshots__/v2.0.0.dev2/gwf-vsc.json | 3 +- .../__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 | 3 +- .../__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 | 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 | 3 +- .../__snapshots__/v2.0.0.dev2/gwt-cnc.toml | 1 - .../__snapshots__/v2.0.0.dev2/gwt-cnc.yaml | 1 - .../__snapshots__/v2.0.0.dev2/gwt-src.json | 3 +- .../__snapshots__/v2.0.0.dev2/gwt-src.toml | 1 - .../__snapshots__/v2.0.0.dev2/gwt-src.yaml | 1 - .../__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 | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev2/olf-cxs.toml | 2 -- .../__snapshots__/v2.0.0.dev2/olf-cxs.yaml | 2 -- .../__snapshots__/v2.0.0.dev2/olf-evp.json | 3 +- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev2/olf-flw.toml | 1 - .../__snapshots__/v2.0.0.dev2/olf-flw.yaml | 1 - .../__snapshots__/v2.0.0.dev2/olf-pcp.json | 3 +- .../__snapshots__/v2.0.0.dev2/olf-pcp.toml | 1 - .../__snapshots__/v2.0.0.dev2/olf-pcp.yaml | 1 - .../__snapshots__/v2.0.0.dev2/olf-zdg.json | 3 +- .../__snapshots__/v2.0.0.dev2/olf-zdg.toml | 1 - .../__snapshots__/v2.0.0.dev2/olf-zdg.yaml | 1 - .../__snapshots__/v2.0.0.dev2/prt-oc.json | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev2/prt-prp.toml | 2 -- .../__snapshots__/v2.0.0.dev2/prt-prp.yaml | 2 -- .../__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 | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev2/swf-cxs.toml | 2 -- .../__snapshots__/v2.0.0.dev2/swf-cxs.yaml | 2 -- .../__snapshots__/v2.0.0.dev2/swf-evp.json | 3 +- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev2/swf-flw.toml | 1 - .../__snapshots__/v2.0.0.dev2/swf-flw.yaml | 1 - .../__snapshots__/v2.0.0.dev2/swf-pcp.json | 3 +- .../__snapshots__/v2.0.0.dev2/swf-pcp.toml | 1 - .../__snapshots__/v2.0.0.dev2/swf-pcp.yaml | 1 - .../__snapshots__/v2.0.0.dev2/swf-zdg.json | 3 +- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev2/utl-ats.toml | 1 - .../__snapshots__/v2.0.0.dev2/utl-ats.yaml | 1 - .../__snapshots__/v2.0.0.dev2/utl-laktab.json | 6 ++-- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev2/utl-ncf.toml | 1 - .../__snapshots__/v2.0.0.dev2/utl-ncf.yaml | 1 - .../__snapshots__/v2.0.0.dev2/utl-sfrtab.json | 6 ++-- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev2/utl-spc.toml | 1 - .../__snapshots__/v2.0.0.dev2/utl-spc.yaml | 1 - .../__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 | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev3/chf-cxs.toml | 2 -- .../__snapshots__/v2.0.0.dev3/chf-cxs.yaml | 2 -- .../__snapshots__/v2.0.0.dev3/chf-evp.json | 3 +- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev3/chf-flw.toml | 1 - .../__snapshots__/v2.0.0.dev3/chf-flw.yaml | 1 - .../__snapshots__/v2.0.0.dev3/chf-pcp.json | 3 +- .../__snapshots__/v2.0.0.dev3/chf-pcp.toml | 1 - .../__snapshots__/v2.0.0.dev3/chf-pcp.yaml | 1 - .../__snapshots__/v2.0.0.dev3/chf-zdg.json | 3 +- .../__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 | 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 | 3 +- .../__snapshots__/v2.0.0.dev3/exg-gwegwe.toml | 1 - .../__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml | 1 - .../__snapshots__/v2.0.0.dev3/exg-gwfgwf.json | 3 +- .../__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml | 1 - .../__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml | 1 - .../__snapshots__/v2.0.0.dev3/exg-gwtgwt.json | 3 +- .../__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 | 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 | 3 +- .../__snapshots__/v2.0.0.dev3/gwe-ctp.toml | 1 - .../__snapshots__/v2.0.0.dev3/gwe-ctp.yaml | 1 - .../__snapshots__/v2.0.0.dev3/gwe-esl.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwe-esl.toml | 1 - .../__snapshots__/v2.0.0.dev3/gwe-esl.yaml | 1 - .../__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-buy.json | 3 +- .../__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 | 3 +- .../__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 | 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-drn.json | 3 +- .../__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 | 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-ghb.json | 3 +- .../__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 | 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 | 6 ++-- .../__snapshots__/v2.0.0.dev3/gwf-gnc.toml | 2 -- .../__snapshots__/v2.0.0.dev3/gwf-gnc.yaml | 2 -- .../__snapshots__/v2.0.0.dev3/gwf-hfb.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-hfb.toml | 1 - .../__snapshots__/v2.0.0.dev3/gwf-hfb.yaml | 1 - .../__snapshots__/v2.0.0.dev3/gwf-lak.json | 12 +++----- .../__snapshots__/v2.0.0.dev3/gwf-lak.toml | 4 --- .../__snapshots__/v2.0.0.dev3/gwf-lak.yaml | 4 --- .../__snapshots__/v2.0.0.dev3/gwf-maw.json | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev3/gwf-mvr.toml | 2 -- .../__snapshots__/v2.0.0.dev3/gwf-mvr.yaml | 2 -- .../__snapshots__/v2.0.0.dev3/gwf-rch.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-rch.toml | 1 - .../__snapshots__/v2.0.0.dev3/gwf-rch.yaml | 1 - .../__snapshots__/v2.0.0.dev3/gwf-riv.json | 3 +- .../__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 | 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 | 3 +- .../__snapshots__/v2.0.0.dev3/gwf-sfr.toml | 1 - .../__snapshots__/v2.0.0.dev3/gwf-sfr.yaml | 1 - .../__snapshots__/v2.0.0.dev3/gwf-uzf.json | 9 ++---- .../__snapshots__/v2.0.0.dev3/gwf-uzf.toml | 3 -- .../__snapshots__/v2.0.0.dev3/gwf-uzf.yaml | 3 -- .../__snapshots__/v2.0.0.dev3/gwf-vsc.json | 3 +- .../__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 | 3 +- .../__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 | 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 | 3 +- .../__snapshots__/v2.0.0.dev3/gwt-cnc.toml | 1 - .../__snapshots__/v2.0.0.dev3/gwt-cnc.yaml | 1 - .../__snapshots__/v2.0.0.dev3/gwt-src.json | 3 +- .../__snapshots__/v2.0.0.dev3/gwt-src.toml | 1 - .../__snapshots__/v2.0.0.dev3/gwt-src.yaml | 1 - .../__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 | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev3/olf-cxs.toml | 2 -- .../__snapshots__/v2.0.0.dev3/olf-cxs.yaml | 2 -- .../__snapshots__/v2.0.0.dev3/olf-evp.json | 3 +- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev3/olf-flw.toml | 1 - .../__snapshots__/v2.0.0.dev3/olf-flw.yaml | 1 - .../__snapshots__/v2.0.0.dev3/olf-pcp.json | 3 +- .../__snapshots__/v2.0.0.dev3/olf-pcp.toml | 1 - .../__snapshots__/v2.0.0.dev3/olf-pcp.yaml | 1 - .../__snapshots__/v2.0.0.dev3/olf-zdg.json | 3 +- .../__snapshots__/v2.0.0.dev3/olf-zdg.toml | 1 - .../__snapshots__/v2.0.0.dev3/olf-zdg.yaml | 1 - .../__snapshots__/v2.0.0.dev3/prt-oc.json | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev3/prt-prp.toml | 2 -- .../__snapshots__/v2.0.0.dev3/prt-prp.yaml | 2 -- .../__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 | 3 +- .../__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 | 6 ++-- .../__snapshots__/v2.0.0.dev3/swf-cxs.toml | 2 -- .../__snapshots__/v2.0.0.dev3/swf-cxs.yaml | 2 -- .../__snapshots__/v2.0.0.dev3/swf-evp.json | 3 +- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev3/swf-flw.toml | 1 - .../__snapshots__/v2.0.0.dev3/swf-flw.yaml | 1 - .../__snapshots__/v2.0.0.dev3/swf-pcp.json | 3 +- .../__snapshots__/v2.0.0.dev3/swf-pcp.toml | 1 - .../__snapshots__/v2.0.0.dev3/swf-pcp.yaml | 1 - .../__snapshots__/v2.0.0.dev3/swf-zdg.json | 3 +- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev3/utl-ats.toml | 1 - .../__snapshots__/v2.0.0.dev3/utl-ats.yaml | 1 - .../__snapshots__/v2.0.0.dev3/utl-laktab.json | 6 ++-- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev3/utl-ncf.toml | 1 - .../__snapshots__/v2.0.0.dev3/utl-ncf.yaml | 1 - .../__snapshots__/v2.0.0.dev3/utl-sfrtab.json | 6 ++-- .../__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 | 3 +- .../__snapshots__/v2.0.0.dev3/utl-spc.toml | 1 - .../__snapshots__/v2.0.0.dev3/utl-spc.yaml | 1 - autotest/dfns/test_migrate.py | 18 ++++++++++++ docs/md/dfnspec.md | 2 ++ .../dfns/migrate_to_v2_0_0_dev2.py | 28 +++++++++++++++++-- 369 files changed, 197 insertions(+), 611 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 3f8a2839..87261a6b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 490ba341..6818e745 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 4606c0d6..978c9fd8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cdb.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 0f5a2f5b..e5a32c57 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 d797ff24..8080fce8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 f78bae9e..5ab5be0e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-chd.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 7eb21535..8a7f74c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.json @@ -5,12 +5,10 @@ "parent": "chf-nam", "dims": { "nsections": { - "value": "nsections", - "scope": "model" + "value": "nsections" }, "npoints": { - "value": "npoints", - "scope": "model" + "value": "npoints" } }, "blocks": { 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 224dddd0..e679345f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.toml @@ -5,11 +5,9 @@ parent = "chf-nam" [dims.nsections] value = "nsections" -scope = "model" [dims.npoints] value = "npoints" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 f7ed53ca..256dad9f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-cxs.yaml @@ -5,10 +5,8 @@ parent: chf-nam dims: nsections: value: nsections - scope: model npoints: value: npoints - scope: model blocks: options: fields: 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 df0d8a44..3b731c13 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 4ed6e5f8..9d2cf8bb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 ea4abe4f..47c382d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-evp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 ecef5e26..b1b62195 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 987ef628..d90e1d29 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 1ef6f3ef..255bb640 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-flw.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 55602402..f6f2d371 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 c65efc6e..5c91f631 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 af7eddc1..611af7d2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-pcp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 1784ae13..05b09699 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 ec7accd4..4a06db7f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 88e43dc8..7ee6e55a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/chf-zdg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 a7688a5d..632f415b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" } }, "blocks": { 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 d9a11df9..fd15d0af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [blocks.options.fields.print_input] type = "keyword" 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 35f43f2c..494a3704 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation blocks: options: fields: 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 2fbc757b..41fbe5d6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" }, "auxiliary": { "value": "len(auxiliary)" 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 8d6bfbb4..bec31370 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [dims.auxiliary] value = "len(auxiliary)" 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 8ec41a0a..3e08bb11 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation auxiliary: value: len(auxiliary) blocks: 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 419293c5..da1d9f9a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" }, "auxiliary": { "value": "len(auxiliary)" 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 09450483..906fb289 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [dims.auxiliary] value = "len(auxiliary)" 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 b047efce..7eb39426 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation auxiliary: value: len(auxiliary) blocks: 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 f52563e7..21add2f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" }, "auxiliary": { "value": "len(auxiliary)" 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 af2a78dc..54c3e25c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [dims.auxiliary] value = "len(auxiliary)" 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 5a6f3ea4..327c08c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwtgwt.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation auxiliary: value: len(auxiliary) blocks: 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 9bc92fa5..fcf6be5a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" } }, "blocks": { 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 e58cfcb2..07a7c0d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [blocks.options.fields.print_input] type = "keyword" 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 bdc89bb9..dcc7650d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/exg-olfgwf.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation 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 48c2b834..76e6df3b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 11e568fe..4c7d44f9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 7a2afa88..3f5482b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-ctp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 6ab87c28..642c5d52 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 9def5e2b..6529288c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 106237b5..d5747c6b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwe-esl.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 6bfb40c3..f1078d05 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.json @@ -6,8 +6,7 @@ "multi": true, "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" } }, "blocks": { 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 64ff44ce..eb6244c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.toml @@ -6,7 +6,6 @@ multi = true [dims.maxbound] value = "maxbound" -scope = "model" [blocks.options.fields.boundnames] 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 0670ca74..e55c28be 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-api.yaml @@ -6,7 +6,6 @@ multi: true dims: maxbound: value: maxbound - scope: model blocks: options: fields: 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 ca5d4c94..e26a6ed9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.json @@ -5,8 +5,7 @@ "parent": "gwf-nam", "dims": { "nrhospecies": { - "value": "nrhospecies", - "scope": "model" + "value": "nrhospecies" } }, "blocks": { 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 0b7a4f1c..cef76240 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.toml @@ -5,7 +5,6 @@ parent = "gwf-nam" [dims.nrhospecies] value = "nrhospecies" -scope = "model" [blocks.options.fields.hhformulation_rhs] type = "keyword" 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 35a13662..d8120876 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-buy.yaml @@ -5,7 +5,6 @@ parent: gwf-nam dims: nrhospecies: value: nrhospecies - scope: model blocks: options: fields: 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 56d43518..b3b4b62c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 5932960c..8a912c09 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 2b9f4b80..85c60363 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chd.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 00b0877f..db70a864 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 48159cbb..6b8e1816 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 b56f1bdf..a0a65fe6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-chdg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 7766da70..ab02c206 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.json @@ -5,12 +5,10 @@ "parent": "gwf-nam", "dims": { "ninterbeds": { - "value": "ninterbeds", - "scope": "model" + "value": "ninterbeds" }, "maxsig0": { - "value": "maxsig0", - "scope": "model" + "value": "maxsig0" } }, "blocks": { 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 4543207c..d8ecc68f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.toml @@ -5,11 +5,9 @@ parent = "gwf-nam" [dims.ninterbeds] value = "ninterbeds" -scope = "model" [dims.maxsig0] value = "maxsig0" -scope = "model" [blocks.options.fields.boundnames] type = "keyword" 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 24898039..1428fdff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-csub.yaml @@ -5,10 +5,8 @@ parent: gwf-nam dims: ninterbeds: value: ninterbeds - scope: model maxsig0: value: maxsig0 - scope: model blocks: options: fields: 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 0b7d86e1..7d95ff49 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 f74a787c..50214ea3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 1659261a..a7dcb25e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drn.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 e05217a2..7b1e36eb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 8a7ef6cf..8c6d30e6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 9e5517c1..e866a146 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-drng.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 22aa7231..7b0e15d4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.json @@ -7,12 +7,10 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "nseg": { - "value": "nseg", - "scope": "model" + "value": "nseg" }, "auxiliary": { "value": "len(auxiliary)" 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 b3da6b7f..8def5b6c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.toml @@ -7,11 +7,9 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.nseg] value = "nseg" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 2a1697c0..d48b7195 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-evt.yaml @@ -7,10 +7,8 @@ subtype: stress dims: maxbound: value: maxbound - scope: model nseg: value: nseg - scope: model auxiliary: value: len(auxiliary) blocks: 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 1779c943..daa3c34b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 1fba9058..5466457f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 46a85c9a..eaebee50 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghb.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 9d3cb752..0cc218df 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 3ea9f82a..f11e364d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 74a7e882..8bebddc3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-ghbg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 04c5a9eb..7f285423 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.json @@ -5,12 +5,10 @@ "parent": "gwf-nam", "dims": { "numgnc": { - "value": "numgnc", - "scope": "model" + "value": "numgnc" }, "numalphaj": { - "value": "numalphaj", - "scope": "model" + "value": "numalphaj" } }, "blocks": { 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 17cd24be..0b0feb37 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.toml @@ -5,11 +5,9 @@ parent = "gwf-nam" [dims.numgnc] value = "numgnc" -scope = "model" [dims.numalphaj] value = "numalphaj" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 34eb58a3..b28818e7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-gnc.yaml @@ -5,10 +5,8 @@ parent: gwf-nam dims: numgnc: value: numgnc - scope: model numalphaj: value: numalphaj - scope: model blocks: options: fields: 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 eb07438d..55989a7a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.json @@ -5,8 +5,7 @@ "parent": "gwf-nam", "dims": { "maxhfb": { - "value": "maxhfb", - "scope": "model" + "value": "maxhfb" } }, "blocks": { 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 fde04d20..02aee4d4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.toml @@ -5,7 +5,6 @@ parent = "gwf-nam" [dims.maxhfb] value = "maxhfb" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 33288251..3aefbe61 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-hfb.yaml @@ -5,7 +5,6 @@ parent: gwf-nam dims: maxhfb: value: maxhfb - scope: model 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 4884c38a..16fe4d25 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json @@ -7,23 +7,19 @@ "subtype": "advanced", "dims": { "nlakes": { - "value": "nlakes", - "scope": "model" + "value": "nlakes" }, "noutlets": { - "value": "noutlets", - "scope": "model" + "value": "noutlets" }, "ntables": { - "value": "ntables", - "scope": "model" + "value": "ntables" }, "auxiliary": { "value": "len(auxiliary)" }, "nlakeconn": { - "value": "sum(packagedata.nlakeconn)", - "scope": "model" + "value": "sum(packagedata.nlakeconn)" } }, "blocks": { 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 4bb67d22..bec10b75 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml @@ -7,22 +7,18 @@ subtype = "advanced" [dims.nlakes] value = "nlakes" -scope = "model" [dims.noutlets] value = "noutlets" -scope = "model" [dims.ntables] value = "ntables" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" [dims.nlakeconn] value = "sum(packagedata.nlakeconn)" -scope = "model" [blocks.options.fields.auxiliary] type = "array" 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 00a8a21d..188eec5c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml @@ -7,18 +7,14 @@ subtype: advanced dims: nlakes: value: nlakes - scope: model noutlets: value: noutlets - scope: model ntables: value: ntables - scope: model auxiliary: value: len(auxiliary) nlakeconn: value: sum(packagedata.nlakeconn) - scope: model blocks: options: fields: 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 71256c90..75e352f1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.json @@ -7,8 +7,7 @@ "subtype": "advanced", "dims": { "nmawwells": { - "value": "nmawwells", - "scope": "model" + "value": "nmawwells" }, "auxiliary": { "value": "len(auxiliary)" 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 068b8493..ce350cf7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.toml @@ -7,7 +7,6 @@ subtype = "advanced" [dims.nmawwells] value = "nmawwells" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 96b1092f..c350a0c6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-maw.yaml @@ -7,7 +7,6 @@ subtype: advanced dims: nmawwells: value: nmawwells - scope: model auxiliary: value: len(auxiliary) blocks: 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 0ade641f..6a541a6a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.json @@ -5,12 +5,10 @@ "parent": "gwf-nam", "dims": { "maxmvr": { - "value": "maxmvr", - "scope": "model" + "value": "maxmvr" }, "maxpackages": { - "value": "maxpackages", - "scope": "model" + "value": "maxpackages" } }, "blocks": { 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 c017f3aa..bf035935 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.toml @@ -5,11 +5,9 @@ parent = "gwf-nam" [dims.maxmvr] value = "maxmvr" -scope = "model" [dims.maxpackages] value = "maxpackages" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 9a13118f..85e448f3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-mvr.yaml @@ -5,10 +5,8 @@ parent: gwf-nam dims: maxmvr: value: maxmvr - scope: model maxpackages: value: maxpackages - scope: model 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 502bfbf4..0b257b46 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 785b5e7a..6be4cd81 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 a89e190e..1c5c87d0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rch.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 1fa3fefb..db424c72 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 42a16501..b16e9d78 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 6f26f6d2..c309838d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-riv.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 da88eaf7..3e14deb9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 bcfdca96..1db555f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 3df3257a..fc8d090c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-rivg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 628d2a14..29e6ad82 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json @@ -7,8 +7,7 @@ "subtype": "advanced", "dims": { "nreaches": { - "value": "nreaches", - "scope": "model" + "value": "nreaches" }, "auxiliary": { "value": "len(auxiliary)" 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 0ffba102..503598d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml @@ -7,7 +7,6 @@ subtype = "advanced" [dims.nreaches] value = "nreaches" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 870e655d..e29e915c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml @@ -7,7 +7,6 @@ subtype: advanced dims: nreaches: value: nreaches - scope: model auxiliary: value: len(auxiliary) blocks: 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 3fbb7bd8..4cd1d7a2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.json @@ -7,16 +7,13 @@ "subtype": "advanced", "dims": { "nuzfcells": { - "value": "nuzfcells", - "scope": "model" + "value": "nuzfcells" }, "ntrailwaves": { - "value": "ntrailwaves", - "scope": "model" + "value": "ntrailwaves" }, "nwavesets": { - "value": "nwavesets", - "scope": "model" + "value": "nwavesets" }, "auxiliary": { "value": "len(auxiliary)" 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 f1a496f8..6e90e2b0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.toml @@ -7,15 +7,12 @@ subtype = "advanced" [dims.nuzfcells] value = "nuzfcells" -scope = "model" [dims.ntrailwaves] value = "ntrailwaves" -scope = "model" [dims.nwavesets] value = "nwavesets" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 c77c5c74..a803119b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-uzf.yaml @@ -7,13 +7,10 @@ subtype: advanced dims: nuzfcells: value: nuzfcells - scope: model ntrailwaves: value: ntrailwaves - scope: model nwavesets: value: nwavesets - scope: model auxiliary: value: len(auxiliary) blocks: 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 65aa6237..0682005a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.json @@ -5,8 +5,7 @@ "parent": "gwf-nam", "dims": { "nviscspecies": { - "value": "nviscspecies", - "scope": "model" + "value": "nviscspecies" } }, "blocks": { 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 0f8bcfb9..874c805c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.toml @@ -5,7 +5,6 @@ parent = "gwf-nam" [dims.nviscspecies] value = "nviscspecies" -scope = "model" [blocks.options.fields.viscref] type = "double" 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 5cf12daf..50878df5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-vsc.yaml @@ -5,7 +5,6 @@ parent: gwf-nam dims: nviscspecies: value: nviscspecies - scope: model blocks: options: fields: 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 2968a617..212818e8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 210e5dc4..933ea1c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 c0f57cd2..bbdf384f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-wel.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 5b6e44f4..134246ae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 0f4cd03d..37386510 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 fbb381a6..f098a0b0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-welg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 1e75a616..502fa543 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.json @@ -6,8 +6,7 @@ "multi": true, "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" } }, "blocks": { 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 5ad0a5d2..79d4744f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.toml @@ -6,7 +6,6 @@ multi = true [dims.maxbound] value = "maxbound" -scope = "model" [blocks.options.fields.boundnames] 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 2275440c..bc4350cf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-api.yaml @@ -6,7 +6,6 @@ multi: true dims: maxbound: value: maxbound - scope: model blocks: options: fields: 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 16af127c..97a30954 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 b5b7a387..843eae19 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 2f1ec3d8..afdef1b3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-cnc.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 57f6d7bd..592dd324 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 f8c5a8a4..6e0a54b4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 c4ed2f08..c1efb7b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/gwt-src.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 a69ead36..4b1f666b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 26acd8b7..dc5c8e15 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 2f4f9048..3b86a99b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cdb.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 fcc6c070..7856d500 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 ee96112b..e71fef28 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 1d88edf6..8ba894d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-chd.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 2b4d9260..b53e1725 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.json @@ -5,12 +5,10 @@ "parent": "olf-nam", "dims": { "nsections": { - "value": "nsections", - "scope": "model" + "value": "nsections" }, "npoints": { - "value": "npoints", - "scope": "model" + "value": "npoints" } }, "blocks": { 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 56a82c5c..0eb54f36 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.toml @@ -5,11 +5,9 @@ parent = "olf-nam" [dims.nsections] value = "nsections" -scope = "model" [dims.npoints] value = "npoints" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 8a536525..9a809a88 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-cxs.yaml @@ -5,10 +5,8 @@ parent: olf-nam dims: nsections: value: nsections - scope: model npoints: value: npoints - scope: model blocks: options: fields: 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 01dd7fcd..70775b93 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 2c127a6a..5a7aef7f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 f2202d2c..d0b6402d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-evp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 8fec16b9..276a98eb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 291cf7f1..8a748893 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 f0b2864c..3a2c6bad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-flw.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 3bc56df3..e8293531 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 acb527f3..424a79c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 09676936..faff352e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-pcp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 a4b65da6..794e490d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 ff5809fa..febfd62a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 b403f737..d98899bf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/olf-zdg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 85160800..ad52aeb0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.json @@ -5,8 +5,7 @@ "parent": "prt-nam", "dims": { "ntracktimes": { - "value": "ntracktimes", - "scope": "model" + "value": "ntracktimes" } }, "blocks": { 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 804b5045..ceab5f52 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.toml @@ -5,7 +5,6 @@ parent = "prt-nam" [dims.ntracktimes] value = "ntracktimes" -scope = "model" [blocks.options.fields.budget_filerecord] type = "record" 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 682953e0..52fb11ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-oc.yaml @@ -5,7 +5,6 @@ parent: prt-nam dims: ntracktimes: value: ntracktimes - scope: model blocks: options: fields: 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 fc4ff67c..b4402267 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.json @@ -7,12 +7,10 @@ "subtype": "stress", "dims": { "nreleasepts": { - "value": "nreleasepts", - "scope": "model" + "value": "nreleasepts" }, "nreleasetimes": { - "value": "nreleasetimes", - "scope": "model" + "value": "nreleasetimes" } }, "blocks": { 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 a7943094..1ba9eddb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.toml @@ -7,11 +7,9 @@ subtype = "stress" [dims.nreleasepts] value = "nreleasepts" -scope = "model" [dims.nreleasetimes] value = "nreleasetimes" -scope = "model" [blocks.options.fields.boundnames] type = "keyword" 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 40324066..7c9ca913 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/prt-prp.yaml @@ -7,10 +7,8 @@ subtype: stress dims: nreleasepts: value: nreleasepts - scope: model nreleasetimes: value: nreleasetimes - scope: model blocks: options: fields: 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 43f31ff9..ec036011 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 7bc8b742..c6acc428 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 95780d3b..a980229d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cdb.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 c1a8a96b..6169cc10 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 b1bf41e8..2dd4937b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 1f0c2199..4cbaf5c2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-chd.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 f14bcaad..0d3230d3 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.json @@ -5,12 +5,10 @@ "parent": "swf-nam", "dims": { "nsections": { - "value": "nsections", - "scope": "model" + "value": "nsections" }, "npoints": { - "value": "npoints", - "scope": "model" + "value": "npoints" } }, "blocks": { 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 d7de3976..904367c9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.toml @@ -5,11 +5,9 @@ parent = "swf-nam" [dims.nsections] value = "nsections" -scope = "model" [dims.npoints] value = "npoints" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 66bca50f..bb154ae9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-cxs.yaml @@ -5,10 +5,8 @@ parent: swf-nam dims: nsections: value: nsections - scope: model npoints: value: npoints - scope: model blocks: options: fields: 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 3988d82c..1e63898d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 5531f2cd..fa98c4ba 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 b2ffe040..b7e91191 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-evp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 13e820f4..ad0177d2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 15a89176..bbee9e0a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 abc8cfc9..58e4b606 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-flw.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 0f54ed41..3f70cdac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 cda8e1b4..5d9ba6c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 4303936f..d31d9e81 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-pcp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 0f7fd8ed..cd7b4f44 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 0046fe7e..f11fb40c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 4d83df50..5f974137 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/swf-zdg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) blocks: 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 ae9ad8ad..5abcc2b5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.json @@ -6,8 +6,7 @@ "subtype": "utility", "dims": { "maxats": { - "value": "maxats", - "scope": "simulation" + "value": "maxats" } }, "blocks": { 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 5a81573a..bad45a5f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.toml @@ -6,7 +6,6 @@ subtype = "utility" [dims.maxats] value = "maxats" -scope = "simulation" [blocks.dimensions.fields.maxats] type = "integer" 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 425a4268..08d68d45 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ats.yaml @@ -6,7 +6,6 @@ subtype: utility dims: maxats: value: maxats - scope: simulation blocks: dimensions: fields: 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 77378002..a835426c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.json @@ -7,12 +7,10 @@ "subtype": "utility", "dims": { "nrow": { - "value": "nrow", - "scope": "simulation" + "value": "nrow" }, "ncol": { - "value": "ncol", - "scope": "simulation" + "value": "ncol" } }, "blocks": { 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 87ca3215..8d052865 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.toml @@ -7,11 +7,9 @@ subtype = "utility" [dims.nrow] value = "nrow" -scope = "simulation" [dims.ncol] value = "ncol" -scope = "simulation" [blocks.dimensions.fields.nrow] type = "integer" 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 d4d113cd..ea48b110 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-laktab.yaml @@ -7,10 +7,8 @@ subtype: utility dims: nrow: value: nrow - scope: simulation ncol: value: ncol - scope: simulation blocks: dimensions: fields: 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 aac731d2..1f99d539 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.json @@ -6,8 +6,7 @@ "subtype": "utility", "dims": { "ncpl": { - "value": "ncpl", - "scope": "simulation" + "value": "ncpl" } }, "blocks": { 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 c5c74253..15fb3d2e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.toml @@ -6,7 +6,6 @@ subtype = "utility" [dims.ncpl] value = "ncpl" -scope = "simulation" [blocks.options.fields.wkt] type = "string" 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 825dd5ad..bcf16bce 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-ncf.yaml @@ -6,7 +6,6 @@ subtype: utility dims: ncpl: value: ncpl - scope: simulation blocks: options: fields: 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 c939bfa0..ed655dc6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.json @@ -7,12 +7,10 @@ "subtype": "utility", "dims": { "nrow": { - "value": "nrow", - "scope": "simulation" + "value": "nrow" }, "ncol": { - "value": "ncol", - "scope": "simulation" + "value": "ncol" } }, "blocks": { 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 579c27ba..5517edcc 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.toml @@ -7,11 +7,9 @@ subtype = "utility" [dims.nrow] value = "nrow" -scope = "simulation" [dims.ncol] value = "ncol" -scope = "simulation" [blocks.dimensions.fields.nrow] type = "integer" 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 9bf20ac6..fd6eaaf2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-sfrtab.yaml @@ -7,10 +7,8 @@ subtype: utility dims: nrow: value: nrow - scope: simulation ncol: value: ncol - scope: simulation blocks: dimensions: fields: 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 975d42d1..1ba9c4da 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.json @@ -7,8 +7,7 @@ "subtype": "utility", "dims": { "maxbound": { - "value": "maxbound", - "scope": "simulation" + "value": "maxbound" } }, "blocks": { 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 926bb098..1cb1ef0f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.toml @@ -7,7 +7,6 @@ subtype = "utility" [dims.maxbound] value = "maxbound" -scope = "simulation" [blocks.options.fields.print_input] type = "keyword" 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 c40cca28..92e38bf8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev2/utl-spc.yaml @@ -7,7 +7,6 @@ subtype: utility dims: maxbound: value: maxbound - scope: simulation blocks: options: fields: 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 11d31106..c1de37da 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 33ab4afa..6f13985b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 7814949c..01702566 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cdb.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 cee5da3e..2193d0cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 67ae7651..52e4ec1a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 2e2194f6..e1dc0e55 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-chd.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 b66841e7..d31dcac5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.json @@ -5,12 +5,10 @@ "parent": "chf-nam", "dims": { "nsections": { - "value": "nsections", - "scope": "model" + "value": "nsections" }, "npoints": { - "value": "npoints", - "scope": "model" + "value": "npoints" } }, "blocks": { 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 d4158728..8937e6c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.toml @@ -5,11 +5,9 @@ parent = "chf-nam" [dims.nsections] value = "nsections" -scope = "model" [dims.npoints] value = "npoints" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 7fc39dab..c58287ed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-cxs.yaml @@ -5,10 +5,8 @@ parent: chf-nam dims: nsections: value: nsections - scope: model npoints: value: npoints - scope: model blocks: options: fields: 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 9f31681b..6b6407d8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 cecc7680..55d2fd53 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 9b57ae1f..1deba133 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-evp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 ba722f6d..965aa17b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 876a1838..0623cbda 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 6e5c2429..efa9738e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-flw.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 73bf1084..39b9a157 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 c9bd14b4..480bef0e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 9d83a6d5..4a5686c6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-pcp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 d4ab6b85..7a3ef867 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 2c33493e..79681d07 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 63c8fd39..befc8d12 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/chf-zdg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 1f559fa5..a179df71 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" } }, "blocks": { 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 b45cb9e5..ff095fc7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [blocks.options.fields.print_input] type = "keyword" 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 a2750683..f901e093 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-chfgwf.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation blocks: options: fields: 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 b5626ebc..77d73d36 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" }, "auxiliary": { "value": "len(auxiliary)" 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 387005d4..96420a5c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [dims.auxiliary] value = "len(auxiliary)" 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 73374a80..6421de1a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwegwe.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation auxiliary: value: len(auxiliary) naux: 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 450dc13d..cabb9356 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" }, "auxiliary": { "value": "len(auxiliary)" 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 402d30f0..07bb58aa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [dims.auxiliary] value = "len(auxiliary)" 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 a217f82c..df8977c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwfgwf.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation auxiliary: value: len(auxiliary) naux: 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 12426915..f6cbbe31 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" }, "auxiliary": { "value": "len(auxiliary)" 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 010b1edb..7aa6e859 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [dims.auxiliary] value = "len(auxiliary)" 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 e40d125a..cd4fdfb7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-gwtgwt.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation auxiliary: value: len(auxiliary) naux: 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 a686f85c..7f620210 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.json @@ -7,8 +7,7 @@ "subtype": "exchange", "dims": { "nexg": { - "value": "nexg", - "scope": "simulation" + "value": "nexg" } }, "blocks": { 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 08e39927..b4bfef0f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.toml @@ -7,7 +7,6 @@ subtype = "exchange" [dims.nexg] value = "nexg" -scope = "simulation" [blocks.options.fields.print_input] type = "keyword" 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 548c9def..1057333f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/exg-olfgwf.yaml @@ -7,7 +7,6 @@ subtype: exchange dims: nexg: value: nexg - scope: simulation blocks: options: fields: 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 1a42f38e..60be2f29 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 4697eaac..0f2e9e3c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 5efa9783..e65120e7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-ctp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 7558d0ce..ec3d2adb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 5640176d..f881e11e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 3f5018f5..0ae65003 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwe-esl.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 ec9733bc..3fd58c16 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.json @@ -6,8 +6,7 @@ "multi": true, "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" } }, "blocks": { 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 1ed1d9b8..6769ef21 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.toml @@ -6,7 +6,6 @@ multi = true [dims.maxbound] value = "maxbound" -scope = "model" [blocks.options.fields.boundnames] 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 82a2333f..9d7d5e12 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-api.yaml @@ -6,7 +6,6 @@ multi: true dims: maxbound: value: maxbound - scope: model blocks: options: fields: 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 f3cd04a4..6762cd61 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.json @@ -5,8 +5,7 @@ "parent": "gwf-nam", "dims": { "nrhospecies": { - "value": "nrhospecies", - "scope": "model" + "value": "nrhospecies" } }, "blocks": { 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 4b6b0870..a65cb5ff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.toml @@ -5,7 +5,6 @@ parent = "gwf-nam" [dims.nrhospecies] value = "nrhospecies" -scope = "model" [blocks.options.fields.hhformulation_rhs] type = "keyword" 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 a70db235..a5f547f5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-buy.yaml @@ -5,7 +5,6 @@ parent: gwf-nam dims: nrhospecies: value: nrhospecies - scope: model blocks: options: fields: 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 aff3a5ad..312a8527 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 61e306a2..6e4217ed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 b605f2bd..ed467094 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chd.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 6f84211f..6203882a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 bd09c51e..fa31901c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 f60f46e8..8db39c85 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-chdg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 4fa3db0f..d95d1ebd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.json @@ -5,12 +5,10 @@ "parent": "gwf-nam", "dims": { "ninterbeds": { - "value": "ninterbeds", - "scope": "model" + "value": "ninterbeds" }, "maxsig0": { - "value": "maxsig0", - "scope": "model" + "value": "maxsig0" } }, "runtime_dims": { 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 70653413..f903d5e2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.toml @@ -5,11 +5,9 @@ parent = "gwf-nam" [dims.ninterbeds] value = "ninterbeds" -scope = "model" [dims.maxsig0] value = "maxsig0" -scope = "model" [runtime_dims.ncelldim] set_in = "ar" 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 b1417356..c79eec2b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-csub.yaml @@ -5,10 +5,8 @@ parent: gwf-nam dims: ninterbeds: value: ninterbeds - scope: model maxsig0: value: maxsig0 - scope: model runtime_dims: ncelldim: set_in: ar 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 bb557061..1b26d5ef 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 e11cdab4..e90b79ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 9a9b86ab..d84b4feb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drn.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 b4b38050..68237405 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 beca46d0..f408b95c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 c07ccc0c..158f90c2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-drng.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 8edaa73f..f69bc3b6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.json @@ -7,12 +7,10 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "nseg": { - "value": "nseg", - "scope": "model" + "value": "nseg" }, "auxiliary": { "value": "len(auxiliary)" 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 75dd5a9d..ebdee74b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.toml @@ -7,11 +7,9 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.nseg] value = "nseg" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 6420bc75..18fa77c6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-evt.yaml @@ -7,10 +7,8 @@ subtype: stress dims: maxbound: value: maxbound - scope: model nseg: value: nseg - scope: model auxiliary: value: len(auxiliary) naux: 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 f1711bb5..53f63a6e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 88ae6043..627eadae 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 7e4f6a0e..7a4baf73 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghb.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 d42848ab..eb6f8959 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 950d1b69..4219d0c4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 23f4d028..d54f781b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-ghbg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 0ae5c2b7..3977ad33 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.json @@ -5,12 +5,10 @@ "parent": "gwf-nam", "dims": { "numgnc": { - "value": "numgnc", - "scope": "model" + "value": "numgnc" }, "numalphaj": { - "value": "numalphaj", - "scope": "model" + "value": "numalphaj" } }, "blocks": { 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 9766f45f..6fbaa854 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.toml @@ -5,11 +5,9 @@ parent = "gwf-nam" [dims.numgnc] value = "numgnc" -scope = "model" [dims.numalphaj] value = "numalphaj" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 1d681e11..7a25dbe5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-gnc.yaml @@ -5,10 +5,8 @@ parent: gwf-nam dims: numgnc: value: numgnc - scope: model numalphaj: value: numalphaj - scope: model blocks: options: fields: 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 1711b1c2..2bf8791f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.json @@ -5,8 +5,7 @@ "parent": "gwf-nam", "dims": { "maxhfb": { - "value": "maxhfb", - "scope": "model" + "value": "maxhfb" } }, "blocks": { 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 9f6a297c..fa987b80 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.toml @@ -5,7 +5,6 @@ parent = "gwf-nam" [dims.maxhfb] value = "maxhfb" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 8c8762e1..1f081d6d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-hfb.yaml @@ -5,7 +5,6 @@ parent: gwf-nam dims: maxhfb: value: maxhfb - scope: model blocks: options: fields: 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 0a168d75..ebb2af25 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json @@ -7,23 +7,19 @@ "subtype": "advanced", "dims": { "nlakes": { - "value": "nlakes", - "scope": "model" + "value": "nlakes" }, "noutlets": { - "value": "noutlets", - "scope": "model" + "value": "noutlets" }, "ntables": { - "value": "ntables", - "scope": "model" + "value": "ntables" }, "auxiliary": { "value": "len(auxiliary)" }, "nlakeconn": { - "value": "sum(packagedata.nlakeconn)", - "scope": "model" + "value": "sum(packagedata.nlakeconn)" } }, "blocks": { 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 3c806754..9d27edab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml @@ -7,22 +7,18 @@ subtype = "advanced" [dims.nlakes] value = "nlakes" -scope = "model" [dims.noutlets] value = "noutlets" -scope = "model" [dims.ntables] value = "ntables" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" [dims.nlakeconn] value = "sum(packagedata.nlakeconn)" -scope = "model" [blocks.options.fields.auxiliary] type = "array" 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 e9655ccf..14b2e389 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml @@ -7,18 +7,14 @@ subtype: advanced dims: nlakes: value: nlakes - scope: model noutlets: value: noutlets - scope: model ntables: value: ntables - scope: model auxiliary: value: len(auxiliary) nlakeconn: value: sum(packagedata.nlakeconn) - scope: model blocks: options: fields: 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 1e5464a8..acda86d9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.json @@ -7,8 +7,7 @@ "subtype": "advanced", "dims": { "nmawwells": { - "value": "nmawwells", - "scope": "model" + "value": "nmawwells" }, "auxiliary": { "value": "len(auxiliary)" 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 413dc984..e390a945 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.toml @@ -7,7 +7,6 @@ subtype = "advanced" [dims.nmawwells] value = "nmawwells" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 61e36bbf..a41d2dff 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-maw.yaml @@ -7,7 +7,6 @@ subtype: advanced dims: nmawwells: value: nmawwells - scope: model auxiliary: value: len(auxiliary) blocks: 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 34678cfd..e08ea3ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.json @@ -5,12 +5,10 @@ "parent": "gwf-nam", "dims": { "maxmvr": { - "value": "maxmvr", - "scope": "model" + "value": "maxmvr" }, "maxpackages": { - "value": "maxpackages", - "scope": "model" + "value": "maxpackages" } }, "blocks": { 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 2b3a0933..6c126bf5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.toml @@ -5,11 +5,9 @@ parent = "gwf-nam" [dims.maxmvr] value = "maxmvr" -scope = "model" [dims.maxpackages] value = "maxpackages" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 c3850bd0..eceffc43 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-mvr.yaml @@ -5,10 +5,8 @@ parent: gwf-nam dims: maxmvr: value: maxmvr - scope: model maxpackages: value: maxpackages - scope: model 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 2220190f..101cab77 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 05e91fc7..dc9dee19 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 196d4e7e..16de7b8c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rch.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 7e89357f..8310df80 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 5a83cb39..d712e200 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 766de494..3356fafb 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-riv.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 366ed1f8..209bb39e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 502ebd7f..a38444d8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 76abc1f1..a278a713 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-rivg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 32d69479..5bb1fe9d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json @@ -7,8 +7,7 @@ "subtype": "advanced", "dims": { "nreaches": { - "value": "nreaches", - "scope": "model" + "value": "nreaches" }, "auxiliary": { "value": "len(auxiliary)" 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 ac786e67..949c8284 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml @@ -7,7 +7,6 @@ subtype = "advanced" [dims.nreaches] value = "nreaches" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 5038171d..3ea132ab 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml @@ -7,7 +7,6 @@ subtype: advanced dims: nreaches: value: nreaches - scope: model auxiliary: value: len(auxiliary) runtime_dims: 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 57cbcc0d..22014606 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.json @@ -7,16 +7,13 @@ "subtype": "advanced", "dims": { "nuzfcells": { - "value": "nuzfcells", - "scope": "model" + "value": "nuzfcells" }, "ntrailwaves": { - "value": "ntrailwaves", - "scope": "model" + "value": "ntrailwaves" }, "nwavesets": { - "value": "nwavesets", - "scope": "model" + "value": "nwavesets" }, "auxiliary": { "value": "len(auxiliary)" 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 df927e61..5e924117 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.toml @@ -7,15 +7,12 @@ subtype = "advanced" [dims.nuzfcells] value = "nuzfcells" -scope = "model" [dims.ntrailwaves] value = "ntrailwaves" -scope = "model" [dims.nwavesets] value = "nwavesets" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 81fbcd8d..0ee126af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-uzf.yaml @@ -7,13 +7,10 @@ subtype: advanced dims: nuzfcells: value: nuzfcells - scope: model ntrailwaves: value: ntrailwaves - scope: model nwavesets: value: nwavesets - scope: model auxiliary: value: len(auxiliary) blocks: 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 60e92f13..eb4706c0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.json @@ -5,8 +5,7 @@ "parent": "gwf-nam", "dims": { "nviscspecies": { - "value": "nviscspecies", - "scope": "model" + "value": "nviscspecies" } }, "blocks": { 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 dd04b930..c688c6ec 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.toml @@ -5,7 +5,6 @@ parent = "gwf-nam" [dims.nviscspecies] value = "nviscspecies" -scope = "model" [blocks.options.fields.viscref] type = "double" 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 7be0f8f2..19c300b7 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-vsc.yaml @@ -5,7 +5,6 @@ parent: gwf-nam dims: nviscspecies: value: nviscspecies - scope: model blocks: options: fields: 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 f7b2d511..f8c8d26b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 8a5dd6e8..19852248 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 936feedf..0c5f9d47 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-wel.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 5e5e4a9b..21af99f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 964de94a..97dd66ed 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 10fcd2db..d7d0f584 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-welg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 183bf497..6b731855 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.json @@ -6,8 +6,7 @@ "multi": true, "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" } }, "blocks": { 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 9f50eeaf..007e880b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.toml @@ -6,7 +6,6 @@ multi = true [dims.maxbound] value = "maxbound" -scope = "model" [blocks.options.fields.boundnames] 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 67810a8c..7f4655cf 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-api.yaml @@ -6,7 +6,6 @@ multi: true dims: maxbound: value: maxbound - scope: model blocks: options: fields: 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 69898186..79a6449c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 e5b631f3..cc6e18af 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 97ed484d..eacbf255 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-cnc.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 37b824d1..94df617a 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 d06bc038..a4300542 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 e32ee53c..fbcaab01 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/gwt-src.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 7f68ca15..1bdf1362 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 de57df64..e39c1c8c 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 697059dd..8f384690 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cdb.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 7d07f79a..fa6eed38 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 d742047b..f995bf98 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 fa23a5f9..b0f194fa 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-chd.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 26db24c4..a571c5a0 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.json @@ -5,12 +5,10 @@ "parent": "olf-nam", "dims": { "nsections": { - "value": "nsections", - "scope": "model" + "value": "nsections" }, "npoints": { - "value": "npoints", - "scope": "model" + "value": "npoints" } }, "blocks": { 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 942703bd..7097e221 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.toml @@ -5,11 +5,9 @@ parent = "olf-nam" [dims.nsections] value = "nsections" -scope = "model" [dims.npoints] value = "npoints" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 d91cf8aa..9d65f451 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-cxs.yaml @@ -5,10 +5,8 @@ parent: olf-nam dims: nsections: value: nsections - scope: model npoints: value: npoints - scope: model blocks: options: fields: 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 3ad08d98..f1fe9701 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 e6d04604..dcc40d62 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 94f90111..d29bd955 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-evp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 bb8f65ca..6e556666 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 561523d1..c1560fba 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 ecea19e5..5d1a3167 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-flw.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 7ffc2804..76faf24b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 786a1a09..48acee82 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 737ad950..0b6f7776 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-pcp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 97c12f13..33be1832 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 e479ab24..c8324431 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 48654e63..5debb135 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/olf-zdg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 8145b4b3..3bd61e7d 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.json @@ -5,8 +5,7 @@ "parent": "prt-nam", "dims": { "ntracktimes": { - "value": "ntracktimes", - "scope": "model" + "value": "ntracktimes" } }, "blocks": { 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 6cd3f4c7..fe92900f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.toml @@ -5,7 +5,6 @@ parent = "prt-nam" [dims.ntracktimes] value = "ntracktimes" -scope = "model" [blocks.options.fields.budget_filerecord] type = "record" 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 749aab11..ffd3146f 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-oc.yaml @@ -5,7 +5,6 @@ parent: prt-nam dims: ntracktimes: value: ntracktimes - scope: model blocks: options: fields: 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 77cbfddc..9aad9cca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.json @@ -7,12 +7,10 @@ "subtype": "stress", "dims": { "nreleasepts": { - "value": "nreleasepts", - "scope": "model" + "value": "nreleasepts" }, "nreleasetimes": { - "value": "nreleasetimes", - "scope": "model" + "value": "nreleasetimes" } }, "runtime_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 4b247b20..ac749639 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.toml @@ -7,11 +7,9 @@ subtype = "stress" [dims.nreleasepts] value = "nreleasepts" -scope = "model" [dims.nreleasetimes] value = "nreleasetimes" -scope = "model" [runtime_dims.naux] set_in = "ar" 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 197a1eda..a9baf3a1 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/prt-prp.yaml @@ -7,10 +7,8 @@ subtype: stress dims: nreleasepts: value: nreleasepts - scope: model nreleasetimes: value: nreleasetimes - scope: model runtime_dims: naux: set_in: ar 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 6f3226fa..7c13bf74 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 e9c810cb..c241f76e 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 e2d2eb58..8d30f969 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cdb.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 0908edc3..fb49dd36 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 8cbf2bd3..a6ad1a74 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 14d3fe1e..1f30d415 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-chd.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 ed989271..73d00aad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.json @@ -5,12 +5,10 @@ "parent": "swf-nam", "dims": { "nsections": { - "value": "nsections", - "scope": "model" + "value": "nsections" }, "npoints": { - "value": "npoints", - "scope": "model" + "value": "npoints" } }, "blocks": { 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 26a43ab4..58a70457 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.toml @@ -5,11 +5,9 @@ parent = "swf-nam" [dims.nsections] value = "nsections" -scope = "model" [dims.npoints] value = "npoints" -scope = "model" [blocks.options.fields.print_input] type = "keyword" 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 a9856936..5ebbf120 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-cxs.yaml @@ -5,10 +5,8 @@ parent: swf-nam dims: nsections: value: nsections - scope: model npoints: value: npoints - scope: model blocks: options: fields: 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 d6983c5e..67bfc9b5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 c5c6c10e..f24eced6 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 1d589319..a2eae394 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-evp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 ccc5559a..06361262 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 0bd116cf..4f239cda 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 eeb7b370..be7e6088 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-flw.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 c3bf6cc8..2176abca 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 8b5ab0a6..686eea92 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 a7cf47db..f012c4c2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-pcp.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 d9a66b98..2c49602b 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.json @@ -7,8 +7,7 @@ "subtype": "stress", "dims": { "maxbound": { - "value": "maxbound", - "scope": "model" + "value": "maxbound" }, "auxiliary": { "value": "len(auxiliary)" 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 11fc4adc..7a433e92 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.toml @@ -7,7 +7,6 @@ subtype = "stress" [dims.maxbound] value = "maxbound" -scope = "model" [dims.auxiliary] value = "len(auxiliary)" 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 d6372aa7..715bf4c5 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/swf-zdg.yaml @@ -7,7 +7,6 @@ subtype: stress dims: maxbound: value: maxbound - scope: model auxiliary: value: len(auxiliary) naux: 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 e9c0dca0..e2aadb88 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.json @@ -6,8 +6,7 @@ "subtype": "utility", "dims": { "maxats": { - "value": "maxats", - "scope": "simulation" + "value": "maxats" } }, "blocks": { 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 e21fb586..7ee28fac 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.toml @@ -6,7 +6,6 @@ subtype = "utility" [dims.maxats] value = "maxats" -scope = "simulation" [blocks.dimensions.fields.maxats] type = "integer" 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 6530fc2a..4a201293 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ats.yaml @@ -6,7 +6,6 @@ subtype: utility dims: maxats: value: maxats - scope: simulation blocks: dimensions: fields: 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 2a7d793b..1569c037 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.json @@ -7,12 +7,10 @@ "subtype": "utility", "dims": { "nrow": { - "value": "nrow", - "scope": "simulation" + "value": "nrow" }, "ncol": { - "value": "ncol", - "scope": "simulation" + "value": "ncol" } }, "blocks": { 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 52ac6aa9..2e4a7447 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.toml @@ -7,11 +7,9 @@ subtype = "utility" [dims.nrow] value = "nrow" -scope = "simulation" [dims.ncol] value = "ncol" -scope = "simulation" [blocks.dimensions.fields.nrow] type = "integer" 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 98115b17..06ea96c8 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-laktab.yaml @@ -7,10 +7,8 @@ subtype: utility dims: nrow: value: nrow - scope: simulation ncol: value: ncol - scope: simulation blocks: dimensions: fields: 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 972098f3..5eb62390 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.json @@ -6,8 +6,7 @@ "subtype": "utility", "dims": { "ncpl": { - "value": "ncpl", - "scope": "simulation" + "value": "ncpl" } }, "blocks": { 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 b183c360..9c3a0eb2 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.toml @@ -6,7 +6,6 @@ subtype = "utility" [dims.ncpl] value = "ncpl" -scope = "simulation" [blocks.options.fields.wkt] type = "string" 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 ce2f92dc..8c73fcee 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-ncf.yaml @@ -6,7 +6,6 @@ subtype: utility dims: ncpl: value: ncpl - scope: simulation blocks: options: fields: 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 55765955..e30c3e55 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.json @@ -7,12 +7,10 @@ "subtype": "utility", "dims": { "nrow": { - "value": "nrow", - "scope": "simulation" + "value": "nrow" }, "ncol": { - "value": "ncol", - "scope": "simulation" + "value": "ncol" } }, "blocks": { 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 642d9be6..311179c9 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.toml @@ -7,11 +7,9 @@ subtype = "utility" [dims.nrow] value = "nrow" -scope = "simulation" [dims.ncol] value = "ncol" -scope = "simulation" [blocks.dimensions.fields.nrow] type = "integer" 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 0dd17736..fe14a7cd 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-sfrtab.yaml @@ -7,10 +7,8 @@ subtype: utility dims: nrow: value: nrow - scope: simulation ncol: value: ncol - scope: simulation blocks: dimensions: fields: 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 c866ca18..6827f3ad 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.json @@ -7,8 +7,7 @@ "subtype": "utility", "dims": { "maxbound": { - "value": "maxbound", - "scope": "simulation" + "value": "maxbound" } }, "blocks": { 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 a44314b7..c55a50f4 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.toml @@ -7,7 +7,6 @@ subtype = "utility" [dims.maxbound] value = "maxbound" -scope = "simulation" [blocks.options.fields.print_input] type = "keyword" 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 334ce61c..55084ead 100644 --- a/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml +++ b/autotest/dfns/__snapshots__/v2.0.0.dev3/utl-spc.yaml @@ -7,7 +7,6 @@ subtype: utility dims: maxbound: value: maxbound - scope: simulation blocks: options: fields: diff --git a/autotest/dfns/test_migrate.py b/autotest/dfns/test_migrate.py index ec04eaf5..6c7a5c45 100644 --- a/autotest/dfns/test_migrate.py +++ b/autotest/dfns/test_migrate.py @@ -341,3 +341,21 @@ def test_migrate_sfr_ic_is_signed_index(dfn_dir): if getattr(f, "index", False) == "signed" ] assert signed == ["ic"] + + +def test_migrate_package_dims_are_component_scoped(dev3): + out, _ = dev3 + spec = v2.Dfns.load(out) + inherited = spec.inherited_dims("gwf-wel") + assert {"nlay", "nrow", "ncol", "ncpl", "nodes", "ncelldim", "nper"} <= inherited + assert not inherited & {"nseg", "numgnc", "numalphaj", "maxbound", "nexg", "maxats"} + shared = { + (name, dim) + for name, c in spec.components.items() + for dim, d in (c.dims or {}).items() + if d.scope != "component" + } + assert {name for name, _ in shared} - {"sim-tdis"} == { + name for name in spec.components if name.split("-")[1].startswith("dis") + } + assert ("sim-tdis", "nper") in shared diff --git a/docs/md/dfnspec.md b/docs/md/dfnspec.md index 4fc64d62..386d148d 100644 --- a/docs/md/dfnspec.md +++ b/docs/md/dfnspec.md @@ -733,6 +733,8 @@ Examples: - `gwf-dis.dims.nrow`, `ncol`, `nlay` have `scope: "model"`: accessible to `gwf-chd`, `gwf-wel`, and any other component whose parent is `gwf-nam`, but also to e.g. `utl-spca` (which has `parent: "package"`). - `sim-tdis.dims.nper` has `scope: "simulation"`: accessible from all components. +Only a dimension that every component in the model (or simulation) shares should be widened beyond `"component"`: in practice, the discretization's grid dims and TDIS's `nper`. Other package dimensions (`maxbound`, `nseg`, `numgnc`, `nexg`, ...) describe a single instance of their component, since two EVT packages in a model can have different `nseg`, so they keep the default `"component"` scope even when the component's parent is a model or the simulation. + ### Primary and foreign keys Sometimes a column in one list identifies a row in another list. This can be conceptualized as a primary key (PK) / foreign key (FK) relation. Integers and strings may encode PK/FK semantics with attributes `pk`, `fk`, and `fk_ref`. A column referencing a grid cell instead of another list's row is a distinct concern, handled by the array [`cellid`](#cellid) attribute rather than `pk`/`fk` — grid cells are resolved against the grid (DIS/DISV/DISU) the column refers to at runtime, not looked up via a `pk` column. 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 330a352c..9e1a6c9f 100644 --- a/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py +++ b/modflow_devtools/dfns/migrate_to_v2_0_0_dev2.py @@ -12,6 +12,7 @@ _IDENT_RE = re.compile(r"^[A-Za-z_]\w*$") _LOOKUP_RE = re.compile(r"^(\w+)\.(\w+)\((\w+)\)$") _COL_FK_RE = re.compile(r"^([A-Za-z_]\w*)\(([A-Za-z_]\w*)\)$") +_DIS_RE = re.compile(r"^[a-z0-9]+-dis(?:v|u|2d|v1d|v2d)?$") # v1 shapes that are wrong at the source. `utl-ts` `sfacval` is `( "Literal['component', 'model', 'simulation']": + """ + Scope of the dims a component's dimensions block declares. + + Only a model's discretization and the simulation's TDIS declare dims that + other components share (grid shape, ``nper``). Every other component's dims + describe one instance of it -- two EVT packages in a model can have + different ``nseg``, and every list package has its own ``maxbound`` -- so + they're ``"component"``-scoped regardless of where the component sits. + """ + if name == "sim-tdis" or _DIS_RE.match(name): + return _scope_for(parent) + return "component" + + def _raw_dim_names(blocks: dict[str, v2.Block]) -> set[str]: """Names of all Integer fields in the dimensions block.""" dim_block = blocks.get("dimensions") @@ -174,6 +193,7 @@ def _fn(bname, fname, field): def _build_explicit_dims( + name: str, parent: "str | list[str] | None", blocks: dict[str, v2.Block], ) -> dict[str, v2.InputDim]: @@ -189,7 +209,7 @@ def _build_explicit_dims( if not dim_block: return dims - scope = _scope_for(parent) + scope = _dims_scope(name, parent) for fname, field in dim_block.fields.items(): if isinstance(field, v2.Integer): dims[fname] = v2.InputDim(value=fname, scope=scope) @@ -1884,12 +1904,14 @@ def _lookup(rname: str) -> dict | None: blocks = _resolve_relations(blocks) raw_dim_names = _raw_dim_names(blocks) blocks = _normalize_n_prefix_shapes(blocks, raw_dim_names) - explicit_dims = _build_explicit_dims(parent, blocks) + explicit_dims = _build_explicit_dims(name, parent, blocks) known_dims = set(explicit_dims) | set(array_dims) blocks = _sanitize_list_shapes(blocks, known_dims) blocks = _fill_period_list_shapes(blocks, explicit_dims) blocks = _fill_named_list_shapes(blocks, explicit_dims) - blocks, derived_dims = _infer_list_shape_dims(blocks, fields, _scope_for(parent), known_dims) + blocks, derived_dims = _infer_list_shape_dims( + blocks, fields, _dims_scope(name, parent), known_dims + ) blocks = _fix_list_shapes(name, blocks) blocks = _fix_ts_sfac(name, blocks) blocks = _wrap_oc_period_records(blocks)