Skip to content

Commit 4952f81

Browse files
authored
mf6: update dfns and mf6 module (#2399)
Add dfns and generate mf6 module for compatibility with new mf6.
1 parent a349e9c commit 4952f81

File tree

154 files changed

+10867
-24864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+10867
-24864
lines changed

flopy/mf6/data/dfn/exg-gwegwe.dfn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ shape (naux)
2424
reader urword
2525
optional true
2626
longname keyword to specify aux variables
27-
description an array of auxiliary variable names. There is no limit on the number of auxiliary variables that can be provided. Most auxiliary variables will not be used by the GWF-GWF Exchange, but they will be available for use by other parts of the program. If an auxiliary variable with the name ``ANGLDEGX'' is found, then this information will be used as the angle (provided in degrees) between the connection face normal and the x axis, where a value of zero indicates that a normal vector points directly along the positive x axis. The connection face normal is a normal vector on the cell face shared between the cell in model 1 and the cell in model 2 pointing away from the model 1 cell. Additional information on ``ANGLDEGX'' is provided in the description of the DISU Package. If an auxiliary variable with the name ``CDIST'' is found, then this information will be used as the straight-line connection distance, including the vertical component, between the two cell centers. Both ANGLDEGX and CDIST are required if specific discharge is calculated for either of the groundwater models.
27+
description an array of auxiliary variable names. There is no limit on the number of auxiliary variables that can be provided. Most auxiliary variables will not be used by the GWE-GWE Exchange, but they will be available for use by other parts of the program. If an auxiliary variable with the name ``ANGLDEGX'' is found, then this information will be used as the angle (provided in degrees) between the connection face normal and the x axis, where a value of zero indicates that a normal vector points directly along the positive x axis. The connection face normal is a normal vector on the cell face shared between the cell in model 1 and the cell in model 2 pointing away from the model 1 cell. Additional information on ``ANGLDEGX'' is provided in the description of the DISU Package. If an auxiliary variable with the name ``CDIST'' is found, then this information will be used as the straight-line connection distance, including the vertical component, between the two cell centers. Both ANGLDEGX and CDIST are required if specific discharge is calculated for either of the groundwater models.
2828

2929
block options
3030
name boundnames
@@ -162,7 +162,7 @@ tagged false
162162
reader urword
163163
optional false
164164
longname obs6 input filename
165-
description is the file name of the observations input file for this exchange. See the ``Observation utility'' section for instructions for preparing observation input files. Table \ref{table:gwe-obstypetable} lists observation type(s) supported by the GWE-GWE package.
165+
description is the file name of the observations input file for this exchange. See the ``Observation utility'' section for instructions for preparing observation input files. Table \ref{table:gwe-obstypetable} lists observation type(s) supported by the GWE-GWE Exchange Package.
166166

167167
block options
168168
name dev_interfacemodel_on

flopy/mf6/data/dfn/gwe-cnd.dfn

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ mf6internal export_ascii
2727
longname export array variables to layered ascii files.
2828
description keyword that specifies input griddata arrays should be written to layered ascii output files.
2929

30+
block options
31+
name export_array_netcdf
32+
type keyword
33+
reader urword
34+
optional true
35+
mf6internal export_nc
36+
longname export array variables to netcdf output files.
37+
description keyword that specifies input griddata arrays should be written to the model output netcdf file.
38+
extended true
39+
3040
# --------------------- gwe cnd griddata ---------------------
3141

3242
block griddata
@@ -35,6 +45,7 @@ type double precision
3545
shape (nodes)
3646
reader readarray
3747
layered true
48+
netcdf true
3849
optional true
3950
longname longitudinal dispersivity in horizontal direction
4051
description longitudinal dispersivity in horizontal direction. If flow is strictly horizontal, then this is the longitudinal dispersivity that will be used. If flow is not strictly horizontal or strictly vertical, then the longitudinal dispersivity is a function of both ALH and ALV. If mechanical dispersion is represented (by specifying any dispersivity values) then this array is required.
@@ -45,6 +56,7 @@ type double precision
4556
shape (nodes)
4657
reader readarray
4758
layered true
59+
netcdf true
4860
optional true
4961
longname longitudinal dispersivity in vertical direction
5062
description longitudinal dispersivity in vertical direction. If flow is strictly vertical, then this is the longitudinal dispsersivity value that will be used. If flow is not strictly horizontal or strictly vertical, then the longitudinal dispersivity is a function of both ALH and ALV. If this value is not specified and mechanical dispersion is represented, then this array is set equal to ALH.
@@ -55,6 +67,7 @@ type double precision
5567
shape (nodes)
5668
reader readarray
5769
layered true
70+
netcdf true
5871
optional true
5972
longname transverse dispersivity in horizontal direction
6073
description transverse dispersivity in horizontal direction. This is the transverse dispersivity value for the second ellipsoid axis. If flow is strictly horizontal and directed in the x direction (along a row for a regular grid), then this value controls spreading in the y direction. If mechanical dispersion is represented (by specifying any dispersivity values) then this array is required.
@@ -65,6 +78,7 @@ type double precision
6578
shape (nodes)
6679
reader readarray
6780
layered true
81+
netcdf true
6882
optional true
6983
longname transverse dispersivity in horizontal direction
7084
description transverse dispersivity in horizontal direction. This is the transverse dispersivity value for the third ellipsoid axis. If flow is strictly horizontal and directed in the x direction (along a row for a regular grid), then this value controls spreading in the z direction. If this value is not specified and mechanical dispersion is represented, then this array is set equal to ATH1.
@@ -75,6 +89,7 @@ type double precision
7589
shape (nodes)
7690
reader readarray
7791
layered true
92+
netcdf true
7893
optional true
7994
longname transverse dispersivity when flow is in vertical direction
8095
description transverse dispersivity when flow is in vertical direction. If flow is strictly vertical and directed in the z direction, then this value controls spreading in the x and y directions. If this value is not specified and mechanical dispersion is represented, then this array is set equal to ATH2.
@@ -85,6 +100,7 @@ type double precision
85100
shape (nodes)
86101
reader readarray
87102
layered true
103+
netcdf true
88104
optional true
89105
longname thermal conductivity of the simulated fluid
90106
description thermal conductivity of the simulated fluid. Note that the CND Package does not account for the tortuosity of the flow paths when solving for the conductive spread of heat. If tortuosity plays an important role in the thermal conductivity calculation, its effect should be reflected in the value specified for KTW.
@@ -95,7 +111,8 @@ type double precision
95111
shape (nodes)
96112
reader readarray
97113
layered true
114+
netcdf true
98115
optional true
99116
longname thermal conductivity of the aquifer material
100-
description thermal conductivity of the aquifer material
117+
description thermal conductivity of the solid aquifer material
101118

flopy/mf6/data/dfn/gwe-ctp.dfn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ type integer
139139
reader urword
140140
optional false
141141
longname maximum number of constant temperatures
142-
description REPLACE maxbound {'{#1}': 'constant temperatures'}
142+
description REPLACE maxbound {'{#1}': 'constant temperature'}
143143

144144

145145
# --------------------- gwe ctp period ---------------------

flopy/mf6/data/dfn/gwe-dis.dfn

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# --------------------- gwe dis options ---------------------
2+
# mf6 subpackage utl-ncf
23

34
block options
45
name length_units
@@ -49,6 +50,58 @@ mf6internal export_ascii
4950
longname export array variables to layered ascii files.
5051
description keyword that specifies input griddata arrays should be written to layered ascii output files.
5152

53+
block options
54+
name export_array_netcdf
55+
type keyword
56+
reader urword
57+
optional true
58+
mf6internal export_nc
59+
longname export array variables to netcdf output files.
60+
description keyword that specifies input griddata arrays should be written to the model output netcdf file.
61+
extended true
62+
63+
block options
64+
name ncf_filerecord
65+
type record ncf6 filein ncf6_filename
66+
reader urword
67+
tagged true
68+
optional true
69+
longname
70+
description
71+
72+
block options
73+
name ncf6
74+
type keyword
75+
in_record true
76+
reader urword
77+
tagged true
78+
optional false
79+
longname ncf keyword
80+
description keyword to specify that record corresponds to a netcdf configuration (NCF) file.
81+
extended true
82+
83+
block options
84+
name filein
85+
type keyword
86+
in_record true
87+
reader urword
88+
tagged true
89+
optional false
90+
longname file keyword
91+
description keyword to specify that an input filename is expected next.
92+
93+
block options
94+
name ncf6_filename
95+
type string
96+
preserve_case true
97+
in_record true
98+
reader urword
99+
optional false
100+
tagged false
101+
longname file name of NCF information
102+
description defines a netcdf configuration (NCF) input file.
103+
extended true
104+
52105
# --------------------- gwe dis dimensions ---------------------
53106

54107
block dimensions
@@ -85,6 +138,7 @@ name delr
85138
type double precision
86139
shape (ncol)
87140
reader readarray
141+
netcdf true
88142
longname spacing along a row
89143
description is the column spacing in the row direction.
90144
default_value 1.0
@@ -94,6 +148,7 @@ name delc
94148
type double precision
95149
shape (nrow)
96150
reader readarray
151+
netcdf true
97152
longname spacing along a column
98153
description is the row spacing in the column direction.
99154
default_value 1.0
@@ -103,6 +158,7 @@ name top
103158
type double precision
104159
shape (ncol, nrow)
105160
reader readarray
161+
netcdf true
106162
longname cell top elevation
107163
description is the top elevation for each cell in the top model layer.
108164
default_value 1.0
@@ -113,6 +169,7 @@ type double precision
113169
shape (ncol, nrow, nlay)
114170
reader readarray
115171
layered true
172+
netcdf true
116173
longname cell bottom elevation
117174
description is the bottom elevation for each cell.
118175
default_value 0.
@@ -123,6 +180,7 @@ type integer
123180
shape (ncol, nrow, nlay)
124181
reader readarray
125182
layered true
183+
netcdf true
126184
optional true
127185
longname idomain existence array
128186
description is an optional array that characterizes the existence status of a cell. If the IDOMAIN array is not specified, then all model cells exist within the solution. If the IDOMAIN value for a cell is 0, the cell does not exist in the simulation. Input and output values will be read and written for the cell, but internal to the program, the cell is excluded from the solution. If the IDOMAIN value for a cell is 1, the cell exists in the simulation. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a ``vertical pass through'' cell.

flopy/mf6/data/dfn/gwe-disv.dfn

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# --------------------- gwe disv options ---------------------
2+
# mf6 subpackage utl-ncf
23

34
block options
45
name length_units
@@ -49,6 +50,58 @@ mf6internal export_ascii
4950
longname export array variables to layered ascii files.
5051
description keyword that specifies input griddata arrays should be written to layered ascii output files.
5152

53+
block options
54+
name export_array_netcdf
55+
type keyword
56+
reader urword
57+
optional true
58+
mf6internal export_nc
59+
longname export array variables to netcdf output files.
60+
description keyword that specifies input griddata arrays should be written to the model output netcdf file.
61+
extended true
62+
63+
block options
64+
name ncf_filerecord
65+
type record ncf6 filein ncf6_filename
66+
reader urword
67+
tagged true
68+
optional true
69+
longname
70+
description
71+
72+
block options
73+
name ncf6
74+
type keyword
75+
in_record true
76+
reader urword
77+
tagged true
78+
optional false
79+
longname ncf keyword
80+
description keyword to specify that record corresponds to a netcdf configuration (NCF) file.
81+
extended true
82+
83+
block options
84+
name filein
85+
type keyword
86+
in_record true
87+
reader urword
88+
tagged true
89+
optional false
90+
longname file keyword
91+
description keyword to specify that an input filename is expected next.
92+
93+
block options
94+
name ncf6_filename
95+
type string
96+
preserve_case true
97+
in_record true
98+
reader urword
99+
optional false
100+
tagged false
101+
longname file name of NCF information
102+
description defines a netcdf configuration (NCF) input file.
103+
extended true
104+
52105
# --------------------- gwe disv dimensions ---------------------
53106

54107
block dimensions
@@ -82,6 +135,7 @@ name top
82135
type double precision
83136
shape (ncpl)
84137
reader readarray
138+
netcdf true
85139
longname model top elevation
86140
description is the top elevation for each cell in the top model layer.
87141

@@ -91,6 +145,7 @@ type double precision
91145
shape (ncpl, nlay)
92146
reader readarray
93147
layered true
148+
netcdf true
94149
longname model bottom elevation
95150
description is the bottom elevation for each cell.
96151

@@ -100,6 +155,7 @@ type integer
100155
shape (ncpl, nlay)
101156
reader readarray
102157
layered true
158+
netcdf true
103159
optional true
104160
longname idomain existence array
105161
description is an optional array that characterizes the existence status of a cell. If the IDOMAIN array is not specified, then all model cells exist within the solution. If the IDOMAIN value for a cell is 0, the cell does not exist in the simulation. Input and output values will be read and written for the cell, but internal to the program, the cell is excluded from the solution. If the IDOMAIN value for a cell is 1, the cell exists in the simulation. If the IDOMAIN value for a cell is -1, the cell does not exist in the simulation. Furthermore, the first existing cell above will be connected to the first existing cell below. This type of cell is referred to as a ``vertical pass through'' cell.

flopy/mf6/data/dfn/gwe-esl.dfn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ type integer
134134
reader urword
135135
optional false
136136
longname maximum number of sources
137-
description REPLACE maxbound {'{#1}': 'sources'}
137+
description REPLACE maxbound {'{#1}': 'source'}
138138

139139

140140
# --------------------- gwe esl period ---------------------

0 commit comments

Comments
 (0)