fix(dfn): fix schema migrations

autotest/dfns/__snapshots__/v2.0.0.dev0/chf-disv1d.json

@@ -22,10 +22,43 @@
     },
     "grb_filerecord": {
       "block": "options",
-      "type": "record grb6 fileout grb6_filename",
+      "type": "record",
       "reader": "urword",
       "optional": true,
-      "tagged": true
+      "tagged": true,
+      "fields": {
+        "grb6": {
+          "block": "options",
+          "type": "keyword",
+          "reader": "urword",
+          "optional": false,
+          "longname": "grb keyword",
+          "description": "keyword to specify that record corresponds to a binary grid file.",
+          "in_record": true,
+          "tagged": true
+        },
+        "fileout": {
+          "block": "options",
+          "type": "keyword",
+          "reader": "urword",
+          "optional": false,
+          "longname": "file keyword",
+          "description": "keyword to specify that an output filename is expected next.",
+          "in_record": true,
+          "tagged": true
+        },
+        "grb6_filename": {
+          "block": "options",
+          "type": "string",
+          "reader": "urword",
+          "optional": false,
+          "longname": "file name of GRB information",
+          "description": "defines a binary grid output file. If this option is not provided, the output file will have the same name as the discretization input file, plus extension '.grb'.",
+          "preserve_case": true,
+          "in_record": true,
+          "tagged": false
+        }
+      }
     },
     "xorigin": {
       "block": "options",

autotest/dfns/__snapshots__/v2.0.0.dev0/chf-disv1d.toml

@@ -21,11 +21,42 @@ description = "keyword to deactivate writing of the binary grid file."
 
 [options.grb_filerecord]
 block = "options"
-type = "record grb6 fileout grb6_filename"
+type = "record"
 reader = "urword"
 optional = true
 tagged = true
 
+[options.grb_filerecord.fields.grb6]
+block = "options"
+type = "keyword"
+reader = "urword"
+optional = false
+longname = "grb keyword"
+description = "keyword to specify that record corresponds to a binary grid file."
+in_record = true
+tagged = true
+
+[options.grb_filerecord.fields.fileout]
+block = "options"
+type = "keyword"
+reader = "urword"
+optional = false
+longname = "file keyword"
+description = "keyword to specify that an output filename is expected next."
+in_record = true
+tagged = true
+
+[options.grb_filerecord.fields.grb6_filename]
+block = "options"
+type = "string"
+reader = "urword"
+optional = false
+longname = "file name of GRB information"
+description = "defines a binary grid output file. If this option is not provided, the output file will have the same name as the discretization input file, plus extension '.grb'."
+preserve_case = true
+in_record = true
+tagged = false
+
 [options.xorigin]
 block = "options"
 type = "double precision"

autotest/dfns/__snapshots__/v2.0.0.dev0/chf-disv1d.yaml

@@ -20,10 +20,40 @@ options:
     description: keyword to deactivate writing of the binary grid file.
   grb_filerecord:
     block: options
-    type: record grb6 fileout grb6_filename
+    type: record
     reader: urword
     optional: true
     tagged: true
+    fields:
+      grb6:
+        block: options
+        type: keyword
+        reader: urword
+        optional: false
+        longname: grb keyword
+        description: keyword to specify that record corresponds to a binary grid file.
+        in_record: true
+        tagged: true
+      fileout:
+        block: options
+        type: keyword
+        reader: urword
+        optional: false
+        longname: file keyword
+        description: keyword to specify that an output filename is expected next.
+        in_record: true
+        tagged: true
+      grb6_filename:
+        block: options
+        type: string
+        reader: urword
+        optional: false
+        longname: file name of GRB information
+        description: defines a binary grid output file. If this option is not provided, the output file
+          will have the same name as the discretization input file, plus extension '.grb'.
+        preserve_case: true
+        in_record: true
+        tagged: false
   xorigin:
     block: options
     type: double precision

autotest/dfns/__snapshots__/v2.0.0.dev0/chf-nam.json

@@ -39,11 +39,30 @@
     },
     "newtonoptions": {
       "block": "options",
-      "type": "record newton under_relaxation",
+      "type": "record",
       "reader": "urword",
       "optional": true,
       "longname": "newton keyword and options",
-      "description": "none"
+      "description": "none",
+      "fields": {
+        "newton": {
+          "block": "options",
+          "type": "keyword",
+          "reader": "urword",
+          "longname": "keyword to activate Newton-Raphson formulation",
+          "description": "keyword that activates the Newton-Raphson formulation for surface water flow between connected reaches and stress packages that support calculation of Newton-Raphson terms.",
+          "in_record": true
+        },
+        "under_relaxation": {
+          "block": "options",
+          "type": "keyword",
+          "reader": "urword",
+          "optional": true,
+          "longname": "keyword to activate Newton-Raphson UNDER_RELAXATION option",
+          "description": "keyword that indicates whether the surface water stage in a reach will be under-relaxed when water levels fall below the bottom of the model below any given cell. By default, Newton-Raphson UNDER_RELAXATION is not applied.",
+          "in_record": true
+        }
+      }
     }
   },
   "packages": {

autotest/dfns/__snapshots__/v2.0.0.dev0/chf-nam.toml

@@ -38,12 +38,29 @@ description = "keyword to indicate that all model package flow terms will be wri
 
 [options.newtonoptions]
 block = "options"
-type = "record newton under_relaxation"
+type = "record"
 reader = "urword"
 optional = true
 longname = "newton keyword and options"
 description = "none"
 
+[options.newtonoptions.fields.newton]
+block = "options"
+type = "keyword"
+reader = "urword"
+longname = "keyword to activate Newton-Raphson formulation"
+description = "keyword that activates the Newton-Raphson formulation for surface water flow between connected reaches and stress packages that support calculation of Newton-Raphson terms."
+in_record = true
+
+[options.newtonoptions.fields.under_relaxation]
+block = "options"
+type = "keyword"
+reader = "urword"
+optional = true
+longname = "keyword to activate Newton-Raphson UNDER_RELAXATION option"
+description = "keyword that indicates whether the surface water stage in a reach will be under-relaxed when water levels fall below the bottom of the model below any given cell. By default, Newton-Raphson UNDER_RELAXATION is not applied."
+in_record = true
+
 [packages.packages]
 block = "packages"
 type = "recarray"

autotest/dfns/__snapshots__/v2.0.0.dev0/chf-nam.yaml

@@ -41,11 +41,30 @@ options:
       with 'BUDGET FILEOUT' in Output Control.
   newtonoptions:
     block: options
-    type: record newton under_relaxation
+    type: record
     reader: urword
     optional: true
     longname: newton keyword and options
     description: none
+    fields:
+      newton:
+        block: options
+        type: keyword
+        reader: urword
+        longname: keyword to activate Newton-Raphson formulation
+        description: keyword that activates the Newton-Raphson formulation for surface water flow between
+          connected reaches and stress packages that support calculation of Newton-Raphson terms.
+        in_record: true
+      under_relaxation:
+        block: options
+        type: keyword
+        reader: urword
+        optional: true
+        longname: keyword to activate Newton-Raphson UNDER_RELAXATION option
+        description: keyword that indicates whether the surface water stage in a reach will be under-relaxed
+          when water levels fall below the bottom of the model below any given cell. By default, Newton-Raphson
+          UNDER_RELAXATION is not applied.
+        in_record: true
 packages:
   packages:
     block: packages