Skip to content

Commit 75075f7

Browse files
wpbonelliwpbonelli
committed
fix
1 parent 5bd967d commit 75075f7

File tree

148 files changed

+1177
-1531
lines changed

Some content is hidden

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

148 files changed

+1177
-1531
lines changed

‎flopy4/mf6/codec/reader/grammar/generated/chf-cdb.lark‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

2-
3-
4-
52
// Auto-generated grammar for MF6 CHF-CDB
63
%import common.WS
74
%import common.SH_COMMENT
8-
%import common.NEWLINE
95

106
%ignore WS
117
%ignore SH_COMMENT
@@ -16,13 +12,19 @@ start: block*
1612
block: options_block | dimensions_block | period_block
1713
// Block definitions
1814
options_block: "begin"i "options"i options_fields "end"i "options"i
15+
1916
dimensions_block: "begin"i "dimensions"i dimensions_fields "end"i "dimensions"i
17+
2018
period_block: "begin"i "period"i block_index period_fields "end"i "period"i block_index
19+
2120
block_index: integer
2221
// Block field lists
2322
options_fields: (auxiliary | boundnames | print_input | print_flows | save_flows | obs_filerecord)*
23+
2424
dimensions_fields: (maxbound)*
25+
2526
period_fields: (stress_period_data)*
27+
2628
// Individual field rules
2729
auxiliary: "auxiliary"i array
2830
boundnames: "boundnames"i
@@ -34,14 +36,10 @@ maxbound: "maxbound"i integer
3436
// Recarray rules for period data (stress_period_data, etc.)
3537
stress_period_data: record+
3638

37-
// Stress period record: tokens followed by newline, but stop at structural keywords
38-
record: token+ NEWLINE
39-
token: number | _word
40-
_word: /(?!(?i:begin|end))[a-zA-Z0-9._'~,-\\(\\)]+/
41-
42-
// Import typed grammar rules
4339
%import typed.integer -> integer
4440
%import typed.double -> double
4541
%import typed.number -> number
4642
%import typed.string -> string
4743
%import typed.array -> array
44+
%import typed.record -> record
45+
%import typed.NEWLINE -> NEWLINE

‎flopy4/mf6/codec/reader/grammar/generated/chf-chd.lark‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

2-
3-
4-
52
// Auto-generated grammar for MF6 CHF-CHD
63
%import common.WS
74
%import common.SH_COMMENT
8-
%import common.NEWLINE
95

106
%ignore WS
117
%ignore SH_COMMENT
@@ -16,13 +12,19 @@ start: block*
1612
block: options_block | dimensions_block | period_block
1713
// Block definitions
1814
options_block: "begin"i "options"i options_fields "end"i "options"i
15+
1916
dimensions_block: "begin"i "dimensions"i dimensions_fields "end"i "dimensions"i
17+
2018
period_block: "begin"i "period"i block_index period_fields "end"i "period"i block_index
19+
2120
block_index: integer
2221
// Block field lists
2322
options_fields: (auxiliary | auxmultname | boundnames | print_input | print_flows | save_flows | ts_filerecord | obs_filerecord)*
23+
2424
dimensions_fields: (maxbound)*
25+
2526
period_fields: (stress_period_data)*
27+
2628
// Individual field rules
2729
auxiliary: "auxiliary"i array
2830
auxmultname: "auxmultname"i string
@@ -36,14 +38,10 @@ maxbound: "maxbound"i integer
3638
// Recarray rules for period data (stress_period_data, etc.)
3739
stress_period_data: record+
3840

39-
// Stress period record: tokens followed by newline, but stop at structural keywords
40-
record: token+ NEWLINE
41-
token: number | _word
42-
_word: /(?!(?i:begin|end))[a-zA-Z0-9._'~,-\\(\\)]+/
43-
44-
// Import typed grammar rules
4541
%import typed.integer -> integer
4642
%import typed.double -> double
4743
%import typed.number -> number
4844
%import typed.string -> string
4945
%import typed.array -> array
46+
%import typed.record -> record
47+
%import typed.NEWLINE -> NEWLINE

‎flopy4/mf6/codec/reader/grammar/generated/chf-cxs.lark‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

2-
3-
4-
52
// Auto-generated grammar for MF6 CHF-CXS
63
%import common.WS
74
%import common.SH_COMMENT
8-
%import common.NEWLINE
95

106
%ignore WS
117
%ignore SH_COMMENT
@@ -16,14 +12,22 @@ start: block*
1612
block: options_block | dimensions_block | packagedata_block | crosssectiondata_block
1713
// Block definitions
1814
options_block: "begin"i "options"i options_fields "end"i "options"i
15+
1916
dimensions_block: "begin"i "dimensions"i dimensions_fields "end"i "dimensions"i
17+
2018
packagedata_block: "begin"i "packagedata"i packagedata_fields "end"i "packagedata"i
19+
2120
crosssectiondata_block: "begin"i "crosssectiondata"i crosssectiondata_fields "end"i "crosssectiondata"i
21+
2222
// Block field lists
2323
options_fields: (print_input)*
24+
2425
dimensions_fields: (nsections | npoints)*
26+
2527
packagedata_fields: (packagedata)*
28+
2629
crosssectiondata_fields: (crosssectiondata)*
30+
2731
// Individual field rules
2832
print_input: "print_input"i
2933
nsections: "nsections"i integer
@@ -32,14 +36,10 @@ packagedata: "packagedata"i recarray
3236
crosssectiondata: "crosssectiondata"i recarray
3337
// Recarray rules for period data (stress_period_data, etc.)
3438

35-
// Stress period record: tokens followed by newline, but stop at structural keywords
36-
record: token+ NEWLINE
37-
token: number | _word
38-
_word: /(?!(?i:begin|end))[a-zA-Z0-9._'~,-\\(\\)]+/
39-
40-
// Import typed grammar rules
4139
%import typed.integer -> integer
4240
%import typed.double -> double
4341
%import typed.number -> number
4442
%import typed.string -> string
4543
%import typed.array -> array
44+
%import typed.record -> record
45+
%import typed.NEWLINE -> NEWLINE

‎flopy4/mf6/codec/reader/grammar/generated/chf-dfw.lark‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

2-
3-
4-
52
// Auto-generated grammar for MF6 CHF-DFW
63
%import common.WS
74
%import common.SH_COMMENT
8-
%import common.NEWLINE
95

106
%ignore WS
117
%ignore SH_COMMENT
@@ -16,10 +12,14 @@ start: block*
1612
block: options_block | griddata_block
1713
// Block definitions
1814
options_block: "begin"i "options"i options_fields "end"i "options"i
15+
1916
griddata_block: "begin"i "griddata"i griddata_fields "end"i "griddata"i
17+
2018
// Block field lists
2119
options_fields: (central_in_space | length_conversion | time_conversion | save_flows | print_flows | save_velocity | obs_filerecord | export_array_ascii | dev_swr_conductance)*
20+
2221
griddata_fields: (manningsn | idcxs)*
22+
2323
// Individual field rules
2424
central_in_space: "central_in_space"i
2525
length_conversion: "length_conversion"i double
@@ -34,14 +34,10 @@ manningsn: "manningsn"i array
3434
idcxs: "idcxs"i array
3535
// Recarray rules for period data (stress_period_data, etc.)
3636

37-
// Stress period record: tokens followed by newline, but stop at structural keywords
38-
record: token+ NEWLINE
39-
token: number | _word
40-
_word: /(?!(?i:begin|end))[a-zA-Z0-9._'~,-\\(\\)]+/
41-
42-
// Import typed grammar rules
4337
%import typed.integer -> integer
4438
%import typed.double -> double
4539
%import typed.number -> number
4640
%import typed.string -> string
4741
%import typed.array -> array
42+
%import typed.record -> record
43+
%import typed.NEWLINE -> NEWLINE

‎flopy4/mf6/codec/reader/grammar/generated/chf-disv1d.lark‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

2-
3-
4-
52
// Auto-generated grammar for MF6 CHF-DISV1D
63
%import common.WS
74
%import common.SH_COMMENT
8-
%import common.NEWLINE
95

106
%ignore WS
117
%ignore SH_COMMENT
@@ -16,16 +12,26 @@ start: block*
1612
block: options_block | dimensions_block | griddata_block | vertices_block | cell1d_block
1713
// Block definitions
1814
options_block: "begin"i "options"i options_fields "end"i "options"i
15+
1916
dimensions_block: "begin"i "dimensions"i dimensions_fields "end"i "dimensions"i
17+
2018
griddata_block: "begin"i "griddata"i griddata_fields "end"i "griddata"i
19+
2120
vertices_block: "begin"i "vertices"i vertices_fields "end"i "vertices"i
21+
2222
cell1d_block: "begin"i "cell1d"i cell1d_fields "end"i "cell1d"i
23+
2324
// Block field lists
2425
options_fields: (length_units | nogrb | grb_filerecord | xorigin | yorigin | angrot | export_array_ascii | crs)*
26+
2527
dimensions_fields: (nodes | nvert)*
28+
2629
griddata_fields: (width | bottom | idomain)*
30+
2731
vertices_fields: (vertices)*
32+
2833
cell1d_fields: (cell1d)*
34+
2935
// Individual field rules
3036
length_units: "length_units"i string
3137
nogrb: "nogrb"i
@@ -44,14 +50,10 @@ vertices: "vertices"i recarray
4450
cell1d: "cell1d"i recarray
4551
// Recarray rules for period data (stress_period_data, etc.)
4652

47-
// Stress period record: tokens followed by newline, but stop at structural keywords
48-
record: token+ NEWLINE
49-
token: number | _word
50-
_word: /(?!(?i:begin|end))[a-zA-Z0-9._'~,-\\(\\)]+/
51-
52-
// Import typed grammar rules
5353
%import typed.integer -> integer
5454
%import typed.double -> double
5555
%import typed.number -> number
5656
%import typed.string -> string
5757
%import typed.array -> array
58+
%import typed.record -> record
59+
%import typed.NEWLINE -> NEWLINE

‎flopy4/mf6/codec/reader/grammar/generated/chf-evp.lark‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

2-
3-
4-
52
// Auto-generated grammar for MF6 CHF-EVP
63
%import common.WS
74
%import common.SH_COMMENT
8-
%import common.NEWLINE
95

106
%ignore WS
117
%ignore SH_COMMENT
@@ -16,13 +12,19 @@ start: block*
1612
block: options_block | dimensions_block | period_block
1713
// Block definitions
1814
options_block: "begin"i "options"i options_fields "end"i "options"i
15+
1916
dimensions_block: "begin"i "dimensions"i dimensions_fields "end"i "dimensions"i
17+
2018
period_block: "begin"i "period"i block_index period_fields "end"i "period"i block_index
19+
2120
block_index: integer
2221
// Block field lists
2322
options_fields: (auxiliary | auxmultname | boundnames | print_input | print_flows | save_flows | ts_filerecord | obs_filerecord)*
23+
2424
dimensions_fields: (maxbound)*
25+
2526
period_fields: (stress_period_data)*
27+
2628
// Individual field rules
2729
auxiliary: "auxiliary"i array
2830
auxmultname: "auxmultname"i string
@@ -36,14 +38,10 @@ maxbound: "maxbound"i integer
3638
// Recarray rules for period data (stress_period_data, etc.)
3739
stress_period_data: record+
3840

39-
// Stress period record: tokens followed by newline, but stop at structural keywords
40-
record: token+ NEWLINE
41-
token: number | _word
42-
_word: /(?!(?i:begin|end))[a-zA-Z0-9._'~,-\\(\\)]+/
43-
44-
// Import typed grammar rules
4541
%import typed.integer -> integer
4642
%import typed.double -> double
4743
%import typed.number -> number
4844
%import typed.string -> string
4945
%import typed.array -> array
46+
%import typed.record -> record
47+
%import typed.NEWLINE -> NEWLINE

‎flopy4/mf6/codec/reader/grammar/generated/chf-flw.lark‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

2-
3-
4-
52
// Auto-generated grammar for MF6 CHF-FLW
63
%import common.WS
74
%import common.SH_COMMENT
8-
%import common.NEWLINE
95

106
%ignore WS
117
%ignore SH_COMMENT
@@ -16,13 +12,19 @@ start: block*
1612
block: options_block | dimensions_block | period_block
1713
// Block definitions
1814
options_block: "begin"i "options"i options_fields "end"i "options"i
15+
1916
dimensions_block: "begin"i "dimensions"i dimensions_fields "end"i "dimensions"i
17+
2018
period_block: "begin"i "period"i block_index period_fields "end"i "period"i block_index
19+
2120
block_index: integer
2221
// Block field lists
2322
options_fields: (auxiliary | auxmultname | boundnames | print_input | print_flows | save_flows | ts_filerecord | obs_filerecord)*
23+
2424
dimensions_fields: (maxbound)*
25+
2526
period_fields: (stress_period_data)*
27+
2628
// Individual field rules
2729
auxiliary: "auxiliary"i array
2830
auxmultname: "auxmultname"i string
@@ -36,14 +38,10 @@ maxbound: "maxbound"i integer
3638
// Recarray rules for period data (stress_period_data, etc.)
3739
stress_period_data: record+
3840

39-
// Stress period record: tokens followed by newline, but stop at structural keywords
40-
record: token+ NEWLINE
41-
token: number | _word
42-
_word: /(?!(?i:begin|end))[a-zA-Z0-9._'~,-\\(\\)]+/
43-
44-
// Import typed grammar rules
4541
%import typed.integer -> integer
4642
%import typed.double -> double
4743
%import typed.number -> number
4844
%import typed.string -> string
4945
%import typed.array -> array
46+
%import typed.record -> record
47+
%import typed.NEWLINE -> NEWLINE

‎flopy4/mf6/codec/reader/grammar/generated/chf-ic.lark‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

2-
3-
4-
52
// Auto-generated grammar for MF6 CHF-IC
63
%import common.WS
74
%import common.SH_COMMENT
8-
%import common.NEWLINE
95

106
%ignore WS
117
%ignore SH_COMMENT
@@ -16,23 +12,23 @@ start: block*
1612
block: options_block | griddata_block
1713
// Block definitions
1814
options_block: "begin"i "options"i options_fields "end"i "options"i
15+
1916
griddata_block: "begin"i "griddata"i griddata_fields "end"i "griddata"i
17+
2018
// Block field lists
2119
options_fields: (export_array_ascii)*
20+
2221
griddata_fields: (strt)*
22+
2323
// Individual field rules
2424
export_array_ascii: "export_array_ascii"i
2525
strt: "strt"i array
2626
// Recarray rules for period data (stress_period_data, etc.)
2727

28-
// Stress period record: tokens followed by newline, but stop at structural keywords
29-
record: token+ NEWLINE
30-
token: number | _word
31-
_word: /(?!(?i:begin|end))[a-zA-Z0-9._'~,-\\(\\)]+/
32-
33-
// Import typed grammar rules
3428
%import typed.integer -> integer
3529
%import typed.double -> double
3630
%import typed.number -> number
3731
%import typed.string -> string
3832
%import typed.array -> array
33+
%import typed.record -> record
34+
%import typed.NEWLINE -> NEWLINE

0 commit comments

Comments
 (0)