refactor(dfns): better representation for component relations

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.json

@@ -76,14 +76,14 @@
                 "longname": "cellid of cell in surface water model",
                 "description": "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.",
                 "tagged": false,
-                "model": "1"
+                "model": "model1"
               },
               "cellidm2": {
                 "type": "cellid",
                 "longname": "cellid of cell in groundwater model",
                 "description": "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.",
                 "tagged": false,
-                "model": "2"
+                "model": "model2"
               },
               "bedleak": {
                 "type": "double",
@@ -105,5 +105,13 @@
         }
       }
     }
+  },
+  "params": {
+    "model1": {
+      "type": "model"
+    },
+    "model2": {
+      "type": "model"
+    }
   }
 }

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.toml

@@ -65,14 +65,14 @@ type = "cellid"
 longname = "cellid of cell in surface water model"
 description = "is the cellid of the cell in model 1, which must be the surface water model. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell."
 tagged = false
-model = "1"
+model = "model1"
 
 [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2]
 type = "cellid"
 longname = "cellid of cell in groundwater model"
 description = "is the cellid of the cell in model 2, which must be the groundwater model. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell."
 tagged = false
-model = "2"
+model = "model2"
 
 [blocks.exchangedata.fields.exchangedata.item.fields.bedleak]
 type = "double"
@@ -85,3 +85,9 @@ type = "double"
 longname = "factor used for conductance calculation"
 description = "is the factor used for the conductance calculation.  The definition for this parameter depends the type of surface water model and whether or not the fixed_conductance option is specified.  If the fixed_conductance option is specified, then the hydraulic conductance is calculated as the product of bedleak and cfact.  In this case, the conductance is fixed and does not change as a function of the calculated surface water and groundwater head.  If the fixed_conductance option is not specified, then the definition of cfact depends on whether the surface water model represents one-dimensional channel flow or two-dimensional overland flow.  If the surface water model represents one-dimensional channel flow, then cfact is the length of the channel cell in the groundwater model cell.  If the surface water model represents two-dimensional overland flow, then cfact is the intersection area of the overland flow cell and the underlying groundwater model cell."
 tagged = false
+
+[params.model1]
+type = "model"
+
+[params.model2]
+type = "model"

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-chfgwf.yaml

@@ -71,7 +71,7 @@ blocks:
                 number and CELL2D number for the two cells.  If the model uses the unstructured discretization
                 (DISU) input file, then CELLIDM1 is the node number for the cell.
               tagged: false
-              model: '1'
+              model: model1
             cellidm2:
               type: cellid
               longname: cellid of cell in groundwater model
@@ -81,7 +81,7 @@ blocks:
                 number and CELL2D number for the two cells.  If the model uses the unstructured discretization
                 (DISU) input file, then CELLIDM2 is the node number for the cell.
               tagged: false
-              model: '2'
+              model: model2
             bedleak:
               type: double
               longname: bed leakance
@@ -106,3 +106,8 @@ blocks:
               tagged: false
         shape:
           - nexg
+params:
+  model1:
+    type: model
+  model2:
+    type: model

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.json

@@ -150,14 +150,14 @@
                 "longname": "cellid of first cell",
                 "description": "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.",
                 "tagged": false,
-                "model": "1"
+                "model": "model1"
               },
               "cellidm2": {
                 "type": "cellid",
                 "longname": "cellid of second cell",
                 "description": "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.",
                 "tagged": false,
-                "model": "2"
+                "model": "model2"
               },
               "ihc": {
                 "type": "integer",
@@ -210,5 +210,13 @@
         }
       }
     }
+  },
+  "params": {
+    "model1": {
+      "type": "model"
+    },
+    "model2": {
+      "type": "model"
+    }
   }
 }

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.toml

@@ -137,14 +137,14 @@ type = "cellid"
 longname = "cellid of first cell"
 description = "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell."
 tagged = false
-model = "1"
+model = "model1"
 
 [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2]
 type = "cellid"
 longname = "cellid of second cell"
 description = "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell."
 tagged = false
-model = "2"
+model = "model2"
 
 [blocks.exchangedata.fields.exchangedata.item.fields.ihc]
 type = "integer"
@@ -188,3 +188,9 @@ description = "name of the GWE Exchange cell.  BOUNDNAME is an ASCII character v
 optional = true
 when = "boundnames"
 tagged = false
+
+[params.model1]
+type = "model"
+
+[params.model2]
+type = "model"

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwegwe.yaml

@@ -151,7 +151,7 @@ blocks:
                 number and CELL2D number for the two cells.  If the model uses the unstructured discretization
                 (DISU) input file, then CELLIDM1 is the node number for the cell.
               tagged: false
-              model: '1'
+              model: model1
             cellidm2:
               type: cellid
               longname: cellid of second cell
@@ -161,7 +161,7 @@ blocks:
                 number and CELL2D number for the two cells.  If the model uses the unstructured discretization
                 (DISU) input file, then CELLIDM2 is the node number for the cell.
               tagged: false
-              model: '2'
+              model: model2
             ihc:
               type: integer
               longname: integer flag for connection type
@@ -211,3 +211,8 @@ blocks:
               tagged: false
         shape:
           - nexg
+params:
+  model1:
+    type: model
+  model2:
+    type: model

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.json

@@ -4,5 +4,13 @@
   "name": "exg-gwfgwe",
   "parent": "sim-nam",
   "ftype": "GWF6-GWE6",
-  "subtype": "exchange"
+  "subtype": "exchange",
+  "params": {
+    "model1": {
+      "type": "model"
+    },
+    "model2": {
+      "type": "model"
+    }
+  }
 }

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.toml

@@ -4,3 +4,9 @@ name = "exg-gwfgwe"
 parent = "sim-nam"
 ftype = "GWF6-GWE6"
 subtype = "exchange"
+
+[params.model1]
+type = "model"
+
+[params.model2]
+type = "model"

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwe.yaml

@@ -4,3 +4,8 @@ name: exg-gwfgwe
 parent: sim-nam
 ftype: GWF6-GWE6
 subtype: exchange
+params:
+  model1:
+    type: model
+  model2:
+    type: model

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.json

@@ -104,7 +104,11 @@
               "description": "is the file name for ghost node correction input file.  Information for the ghost nodes are provided in the file provided with these keywords.  The format for specifying the ghost nodes is the same as described for the GNC Package of the GWF Model.  This includes specifying OPTIONS, DIMENSIONS, and GNCDATA blocks.  The order of the ghost nodes must follow the same order as the order of the cells in the EXCHANGEDATA block.  For the GNCDATA, noden and all of the nodej values are assumed to be located in model 1, and nodem is assumed to be in model 2.",
               "tagged": false,
               "direction": "in",
-              "component": "gwf-gnc"
+              "component": "gwf-gnc",
+              "args": {
+                "model1": "model1",
+                "model2": "model2"
+              }
             }
           }
         },
@@ -123,7 +127,11 @@
               "description": "is the file name of the water mover input file to apply to this exchange.  Information for the water mover are provided in the file provided with these keywords.  The format for specifying the water mover information is the same as described for the Water Mover (MVR) Package of the GWF Model, with two exceptions.  First, in the PACKAGES block, the model name must be included as a separate string before each package.  Second, the appropriate model name must be included before package name 1 and package name 2 in the BEGIN PERIOD block.  This allows providers and receivers to be located in both models listed as part of this exchange.",
               "tagged": false,
               "direction": "in",
-              "component": "gwf-mvr"
+              "component": "gwf-mvr",
+              "args": {
+                "model1": "model1",
+                "model2": "model2"
+              }
             }
           }
         },
@@ -178,14 +186,14 @@
                 "longname": "cellid of first cell",
                 "description": "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell.",
                 "tagged": false,
-                "model": "1"
+                "model": "model1"
               },
               "cellidm2": {
                 "type": "cellid",
                 "longname": "cellid of second cell",
                 "description": "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell.",
                 "tagged": false,
-                "model": "2"
+                "model": "model2"
               },
               "ihc": {
                 "type": "integer",
@@ -238,5 +246,13 @@
         }
       }
     }
+  },
+  "params": {
+    "model1": {
+      "type": "model"
+    },
+    "model2": {
+      "type": "model"
+    }
   }
 }

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.toml

@@ -99,6 +99,10 @@ tagged = false
 direction = "in"
 component = "gwf-gnc"
 
+[blocks.options.fields.gnc_filerecord.fields.gnc6_filename.args]
+model1 = "model1"
+model2 = "model2"
+
 [blocks.options.fields.mvr_filerecord]
 type = "record"
 optional = true
@@ -116,6 +120,10 @@ tagged = false
 direction = "in"
 component = "gwf-mvr"
 
+[blocks.options.fields.mvr_filerecord.fields.mvr6_filename.args]
+model1 = "model1"
+model2 = "model2"
+
 [blocks.options.fields.obs_filerecord]
 type = "record"
 optional = true
@@ -161,14 +169,14 @@ type = "cellid"
 longname = "cellid of first cell"
 description = "is the cellid of the cell in model 1 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM1 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM1 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM1 is the node number for the cell."
 tagged = false
-model = "1"
+model = "model1"
 
 [blocks.exchangedata.fields.exchangedata.item.fields.cellidm2]
 type = "cellid"
 longname = "cellid of second cell"
 description = "is the cellid of the cell in model 2 as specified in the simulation name file. For a structured grid that uses the DIS input file, CELLIDM2 is the layer, row, and column numbers of the cell.   For a grid that uses the DISV input file, CELLIDM2 is the layer number and CELL2D number for the two cells.  If the model uses the unstructured discretization (DISU) input file, then CELLIDM2 is the node number for the cell."
 tagged = false
-model = "2"
+model = "model2"
 
 [blocks.exchangedata.fields.exchangedata.item.fields.ihc]
 type = "integer"
@@ -212,3 +220,9 @@ description = "name of the GWF Exchange cell.  BOUNDNAME is an ASCII character v
 optional = true
 when = "boundnames"
 tagged = false
+
+[params.model1]
+type = "model"
+
+[params.model2]
+type = "model"

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwf.yaml

@@ -127,6 +127,9 @@ blocks:
             tagged: false
             direction: in
             component: gwf-gnc
+            args:
+              model1: model1
+              model2: model2
       mvr_filerecord:
         type: record
         optional: true
@@ -149,6 +152,9 @@ blocks:
             tagged: false
             direction: in
             component: gwf-mvr
+            args:
+              model1: model1
+              model2: model2
       obs_filerecord:
         type: record
         optional: true
@@ -197,7 +203,7 @@ blocks:
                 number and CELL2D number for the two cells.  If the model uses the unstructured discretization
                 (DISU) input file, then CELLIDM1 is the node number for the cell.
               tagged: false
-              model: '1'
+              model: model1
             cellidm2:
               type: cellid
               longname: cellid of second cell
@@ -207,7 +213,7 @@ blocks:
                 number and CELL2D number for the two cells.  If the model uses the unstructured discretization
                 (DISU) input file, then CELLIDM2 is the node number for the cell.
               tagged: false
-              model: '2'
+              model: model2
             ihc:
               type: integer
               longname: integer flag for connection type
@@ -257,3 +263,8 @@ blocks:
               tagged: false
         shape:
           - nexg
+params:
+  model1:
+    type: model
+  model2:
+    type: model

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.json

@@ -4,5 +4,13 @@
   "name": "exg-gwfgwt",
   "parent": "sim-nam",
   "ftype": "GWF6-GWT6",
-  "subtype": "exchange"
+  "subtype": "exchange",
+  "params": {
+    "model1": {
+      "type": "model"
+    },
+    "model2": {
+      "type": "model"
+    }
+  }
 }

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.toml

@@ -4,3 +4,9 @@ name = "exg-gwfgwt"
 parent = "sim-nam"
 ftype = "GWF6-GWT6"
 subtype = "exchange"
+
+[params.model1]
+type = "model"
+
+[params.model2]
+type = "model"

autotest/dfns/__snapshots__/v2.0.0.dev2/exg-gwfgwt.yaml

@@ -4,3 +4,8 @@ name: exg-gwfgwt
 parent: sim-nam
 ftype: GWF6-GWT6
 subtype: exchange
+params:
+  model1:
+    type: model
+  model2:
+    type: model