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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.json
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@
"fields": {
"outlets": {
"type": "list",
"optional": true,
"item": {
"type": "record",
"fields": {
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.toml
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ direction = "in"

[blocks.outlets.fields.outlets]
type = "list"
optional = true
shape = [
"noutlets",
]
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-lak.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ blocks:
fields:
outlets:
type: list
optional: true
item:
type: record
fields:
Expand Down
3 changes: 3 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.json
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@
"fields": {
"crosssections": {
"type": "list",
"optional": true,
"item": {
"type": "record",
"fields": {
Expand Down Expand Up @@ -413,6 +414,7 @@
"fields": {
"diversions": {
"type": "list",
"optional": true,
"item": {
"type": "record",
"fields": {
Expand Down Expand Up @@ -454,6 +456,7 @@
"fields": {
"initialstages": {
"type": "list",
"optional": true,
"item": {
"type": "record",
"fields": {
Expand Down
3 changes: 3 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.toml
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ tagged = false

[blocks.crosssections.fields.crosssections]
type = "list"
optional = true

[blocks.crosssections.fields.crosssections.item]
type = "record"
Expand Down Expand Up @@ -370,6 +371,7 @@ shape = [

[blocks.diversions.fields.diversions]
type = "list"
optional = true

[blocks.diversions.fields.diversions.item]
type = "record"
Expand Down Expand Up @@ -405,6 +407,7 @@ tagged = false

[blocks.initialstages.fields.initialstages]
type = "list"
optional = true

[blocks.initialstages.fields.initialstages.item]
type = "record"
Expand Down
3 changes: 3 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/gwf-sfr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ blocks:
fields:
crosssections:
type: list
optional: true
item:
type: record
fields:
Expand Down Expand Up @@ -429,6 +430,7 @@ blocks:
fields:
diversions:
type: list
optional: true
item:
type: record
fields:
Expand Down Expand Up @@ -488,6 +490,7 @@ blocks:
fields:
initialstages:
type: list
optional: true
item:
type: record
fields:
Expand Down
16 changes: 11 additions & 5 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@
"outer_dvclose": {
"type": "double",
"longname": "dependent-variable change criterion",
"description": "real value defining the dependent-variable (for example, head) change criterion for convergence of the outer (nonlinear) iterations, in units of the dependent-variable (for example, length for head). When the maximum absolute value of the dependent-variable change at all nodes during an iteration is less than or equal to OUTER_DVCLOSE, iteration stops. Commonly, OUTER_DVCLOSE equals 0.01. The keyword, OUTER_HCLOSE can be still be specified instead of OUTER_DVCLOSE for backward compatibility with previous versions of MODFLOW 6 but eventually OUTER_HCLOSE will be deprecated and specification of OUTER_HCLOSE will cause MODFLOW 6 to terminate with an error."
"description": "real value defining the dependent-variable (for example, head) change criterion for convergence of the outer (nonlinear) iterations, in units of the dependent-variable (for example, length for head). When the maximum absolute value of the dependent-variable change at all nodes during an iteration is less than or equal to OUTER_DVCLOSE, iteration stops. Commonly, OUTER_DVCLOSE equals 0.01. The keyword, OUTER_HCLOSE can be still be specified instead of OUTER_DVCLOSE for backward compatibility with previous versions of MODFLOW 6 but eventually OUTER_HCLOSE will be deprecated and specification of OUTER_HCLOSE will cause MODFLOW 6 to terminate with an error.",
"optional": true
},
"outer_rclosebnd": {
"type": "double",
Expand All @@ -127,7 +128,8 @@
"outer_maximum": {
"type": "integer",
"longname": "outer maximum iterations",
"description": "integer value defining the maximum number of outer (nonlinear) iterations -- that is, calls to the solution routine. For a linear problem OUTER_MAXIMUM should be 1."
"description": "integer value defining the maximum number of outer (nonlinear) iterations -- that is, calls to the solution routine. For a linear problem OUTER_MAXIMUM should be 1.",
"optional": true
},
"under_relaxation": {
"type": "string",
Expand Down Expand Up @@ -190,7 +192,8 @@
"inner_maximum": {
"type": "integer",
"longname": "maximum number of inner iterations",
"description": "integer value defining the maximum number of inner (linear) iterations. The number typically depends on the characteristics of the matrix solution scheme being used. For nonlinear problems, INNER_MAXIMUM usually ranges from 60 to 600; a value of 100 will be sufficient for most linear problems."
"description": "integer value defining the maximum number of inner (linear) iterations. The number typically depends on the characteristics of the matrix solution scheme being used. For nonlinear problems, INNER_MAXIMUM usually ranges from 60 to 600; a value of 100 will be sufficient for most linear problems.",
"optional": true
},
"inner_hclose": {
"type": "double",
Expand All @@ -202,11 +205,13 @@
"inner_dvclose": {
"type": "double",
"longname": "dependent-variable change tolerance",
"description": "real value defining the dependent-variable (for example, head) change criterion for convergence of the inner (linear) iterations, in units of the dependent-variable (for example, length for head). When the maximum absolute value of the dependent-variable change at all nodes during an iteration is less than or equal to INNER_DVCLOSE, the matrix solver assumes convergence. Commonly, INNER_DVCLOSE is set equal to or an order of magnitude less than the OUTER_DVCLOSE value specified for the NONLINEAR block. The keyword, INNER_HCLOSE can be still be specified instead of INNER_DVCLOSE for backward compatibility with previous versions of MODFLOW 6 but eventually INNER_HCLOSE will be deprecated and specification of INNER_HCLOSE will cause MODFLOW 6 to terminate with an error."
"description": "real value defining the dependent-variable (for example, head) change criterion for convergence of the inner (linear) iterations, in units of the dependent-variable (for example, length for head). When the maximum absolute value of the dependent-variable change at all nodes during an iteration is less than or equal to INNER_DVCLOSE, the matrix solver assumes convergence. Commonly, INNER_DVCLOSE is set equal to or an order of magnitude less than the OUTER_DVCLOSE value specified for the NONLINEAR block. The keyword, INNER_HCLOSE can be still be specified instead of INNER_DVCLOSE for backward compatibility with previous versions of MODFLOW 6 but eventually INNER_HCLOSE will be deprecated and specification of INNER_HCLOSE will cause MODFLOW 6 to terminate with an error.",
"optional": true
},
"rcloserecord": {
"type": "record",
"longname": "rclose record",
"optional": true,
"fields": {
"inner_rclose": {
"type": "double",
Expand All @@ -225,7 +230,8 @@
"linear_acceleration": {
"type": "string",
"longname": "linear acceleration method",
"description": "a keyword that defines the linear acceleration method used by the default IMS linear solvers. CG - preconditioned conjugate gradient method. BICGSTAB - preconditioned bi-conjugate gradient stabilized method."
"description": "a keyword that defines the linear acceleration method used by the default IMS linear solvers. CG - preconditioned conjugate gradient method. BICGSTAB - preconditioned bi-conjugate gradient stabilized method.",
"optional": true
},
"relaxation_factor": {
"type": "double",
Expand Down
6 changes: 6 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ deprecated = "6.1.1"
type = "double"
longname = "dependent-variable change criterion"
description = "real value defining the dependent-variable (for example, head) change criterion for convergence of the outer (nonlinear) iterations, in units of the dependent-variable (for example, length for head). When the maximum absolute value of the dependent-variable change at all nodes during an iteration is less than or equal to OUTER_DVCLOSE, iteration stops. Commonly, OUTER_DVCLOSE equals 0.01. The keyword, OUTER_HCLOSE can be still be specified instead of OUTER_DVCLOSE for backward compatibility with previous versions of MODFLOW 6 but eventually OUTER_HCLOSE will be deprecated and specification of OUTER_HCLOSE will cause MODFLOW 6 to terminate with an error."
optional = true

[blocks.nonlinear.fields.outer_rclosebnd]
type = "double"
Expand All @@ -113,6 +114,7 @@ deprecated = "6.1.1"
type = "integer"
longname = "outer maximum iterations"
description = "integer value defining the maximum number of outer (nonlinear) iterations -- that is, calls to the solution routine. For a linear problem OUTER_MAXIMUM should be 1."
optional = true

[blocks.nonlinear.fields.under_relaxation]
type = "string"
Expand Down Expand Up @@ -172,6 +174,7 @@ optional = true
type = "integer"
longname = "maximum number of inner iterations"
description = "integer value defining the maximum number of inner (linear) iterations. The number typically depends on the characteristics of the matrix solution scheme being used. For nonlinear problems, INNER_MAXIMUM usually ranges from 60 to 600; a value of 100 will be sufficient for most linear problems."
optional = true

[blocks.linear.fields.inner_hclose]
type = "double"
Expand All @@ -184,10 +187,12 @@ deprecated = "6.1.1"
type = "double"
longname = "dependent-variable change tolerance"
description = "real value defining the dependent-variable (for example, head) change criterion for convergence of the inner (linear) iterations, in units of the dependent-variable (for example, length for head). When the maximum absolute value of the dependent-variable change at all nodes during an iteration is less than or equal to INNER_DVCLOSE, the matrix solver assumes convergence. Commonly, INNER_DVCLOSE is set equal to or an order of magnitude less than the OUTER_DVCLOSE value specified for the NONLINEAR block. The keyword, INNER_HCLOSE can be still be specified instead of INNER_DVCLOSE for backward compatibility with previous versions of MODFLOW 6 but eventually INNER_HCLOSE will be deprecated and specification of INNER_HCLOSE will cause MODFLOW 6 to terminate with an error."
optional = true

[blocks.linear.fields.rcloserecord]
type = "record"
longname = "rclose record"
optional = true

[blocks.linear.fields.rcloserecord.fields.inner_rclose]
type = "double"
Expand All @@ -205,6 +210,7 @@ tagged = false
type = "string"
longname = "linear acceleration method"
description = "a keyword that defines the linear acceleration method used by the default IMS linear solvers. CG - preconditioned conjugate gradient method. BICGSTAB - preconditioned bi-conjugate gradient stabilized method."
optional = true

[blocks.linear.fields.relaxation_factor]
type = "double"
Expand Down
6 changes: 6 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev2/sln-ims.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ blocks:
equals 0.01. The keyword, OUTER_HCLOSE can be still be specified instead of OUTER_DVCLOSE for
backward compatibility with previous versions of MODFLOW 6 but eventually OUTER_HCLOSE will
be deprecated and specification of OUTER_HCLOSE will cause MODFLOW 6 to terminate with an error.
optional: true
outer_rclosebnd:
type: double
longname: boundary package flow residual tolerance
Expand All @@ -179,6 +180,7 @@ blocks:
longname: outer maximum iterations
description: integer value defining the maximum number of outer (nonlinear) iterations -- that
is, calls to the solution routine. For a linear problem OUTER_MAXIMUM should be 1.
optional: true
under_relaxation:
type: string
longname: under relaxation scheme
Expand Down Expand Up @@ -288,6 +290,7 @@ blocks:
typically depends on the characteristics of the matrix solution scheme being used. For nonlinear
problems, INNER_MAXIMUM usually ranges from 60 to 600; a value of 100 will be sufficient for
most linear problems.
optional: true
inner_hclose:
type: double
longname: head change tolerance
Expand All @@ -312,9 +315,11 @@ blocks:
instead of INNER_DVCLOSE for backward compatibility with previous versions of MODFLOW 6 but
eventually INNER_HCLOSE will be deprecated and specification of INNER_HCLOSE will cause MODFLOW
6 to terminate with an error.
optional: true
rcloserecord:
type: record
longname: rclose record
optional: true
fields:
inner_rclose:
type: double
Expand Down Expand Up @@ -352,6 +357,7 @@ blocks:
description: a keyword that defines the linear acceleration method used by the default IMS linear
solvers. CG - preconditioned conjugate gradient method. BICGSTAB - preconditioned bi-conjugate
gradient stabilized method.
optional: true
relaxation_factor:
type: double
longname: relaxation factor used by ILU factorization
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.json
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@
"fields": {
"outlets": {
"type": "list",
"optional": true,
"item": {
"type": "record",
"fields": {
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.toml
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ direction = "in"

[blocks.outlets.fields.outlets]
type = "list"
optional = true
shape = [
"noutlets",
]
Expand Down
1 change: 1 addition & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-lak.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ blocks:
fields:
outlets:
type: list
optional: true
item:
type: record
fields:
Expand Down
3 changes: 3 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.json
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@
"fields": {
"crosssections": {
"type": "list",
"optional": true,
"item": {
"type": "record",
"fields": {
Expand Down Expand Up @@ -418,6 +419,7 @@
"fields": {
"diversions": {
"type": "list",
"optional": true,
"item": {
"type": "record",
"fields": {
Expand Down Expand Up @@ -459,6 +461,7 @@
"fields": {
"initialstages": {
"type": "list",
"optional": true,
"item": {
"type": "record",
"fields": {
Expand Down
3 changes: 3 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.toml
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ tagged = false

[blocks.crosssections.fields.crosssections]
type = "list"
optional = true

[blocks.crosssections.fields.crosssections.item]
type = "record"
Expand Down Expand Up @@ -373,6 +374,7 @@ shape = [

[blocks.diversions.fields.diversions]
type = "list"
optional = true

[blocks.diversions.fields.diversions.item]
type = "record"
Expand Down Expand Up @@ -408,6 +410,7 @@ tagged = false

[blocks.initialstages.fields.initialstages]
type = "list"
optional = true

[blocks.initialstages.fields.initialstages.item]
type = "record"
Expand Down
3 changes: 3 additions & 0 deletions autotest/dfns/__snapshots__/v2.0.0.dev3/gwf-sfr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ blocks:
fields:
crosssections:
type: list
optional: true
item:
type: record
fields:
Expand Down Expand Up @@ -432,6 +433,7 @@ blocks:
fields:
diversions:
type: list
optional: true
item:
type: record
fields:
Expand Down Expand Up @@ -491,6 +493,7 @@ blocks:
fields:
initialstages:
type: list
optional: true
item:
type: record
fields:
Expand Down
Loading
Loading