Skip to content

Commit e3710d0

Browse files
wpbonelliwpbonelli
committed
more
1 parent 7f2adad commit e3710d0

File tree

143 files changed

+1223
-895
lines changed

Some content is hidden

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

143 files changed

+1223
-895
lines changed

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,16 @@ print_flows: "print_flows"i
2121
save_flows: "save_flows"i
2222
obs_filerecord: "filein"i "obs6"i string
2323
maxbound: "maxbound"i integer
24-
stress_period_data: integer+ integer double double? string?
24+
stress_period_data: (number | simple_string)+
25+
2526
// Inline typed grammar rules
26-
integer: _integer
27-
double.2: _number
27+
// Named fields use specific types (integer/double) for validation
28+
// List/recarray data uses generic 'number' - structuring step handles type conversion
29+
integer: SIGNED_INT | INT
30+
double: SIGNED_NUMBER | NUMBER
31+
number: SIGNED_NUMBER | NUMBER
2832
string: ESCAPED_STRING | record
33+
simple_string: ESCAPED_STRING | _word
2934
record.1: _token+ _NL
3035
list: record*
3136
array: (single_array | layered_array)
@@ -45,15 +50,13 @@ filename: ESCAPED_STRING | _word
4550
data: double+
4651

4752
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
48-
_number: SIGNED_NUMBER | NUMBER
49-
_integer: SIGNED_INT | INT
50-
_token: _word | _number
53+
_token: _word | number
5154

5255
%import common.NEWLINE -> _NL
5356
%import common.CNAME
5457
%import common.WORD
58+
%import common.ESCAPED_STRING
5559
%import common.NUMBER
5660
%import common.INT
57-
%import common.ESCAPED_STRING
5861
%import common.SIGNED_NUMBER
5962
%import common.SIGNED_INT

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,16 @@ save_flows: "save_flows"i
2323
ts_filerecord: "ts6"i "filein"i string
2424
obs_filerecord: "filein"i "obs6"i string
2525
maxbound: "maxbound"i integer
26-
stress_period_data: integer+ double double? string?
26+
stress_period_data: (number | simple_string)+
27+
2728
// Inline typed grammar rules
28-
integer: _integer
29-
double.2: _number
29+
// Named fields use specific types (integer/double) for validation
30+
// List/recarray data uses generic 'number' - structuring step handles type conversion
31+
integer: SIGNED_INT | INT
32+
double: SIGNED_NUMBER | NUMBER
33+
number: SIGNED_NUMBER | NUMBER
3034
string: ESCAPED_STRING | record
35+
simple_string: ESCAPED_STRING | _word
3136
record.1: _token+ _NL
3237
list: record*
3338
array: (single_array | layered_array)
@@ -47,15 +52,13 @@ filename: ESCAPED_STRING | _word
4752
data: double+
4853

4954
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
50-
_number: SIGNED_NUMBER | NUMBER
51-
_integer: SIGNED_INT | INT
52-
_token: _word | _number
55+
_token: _word | number
5356

5457
%import common.NEWLINE -> _NL
5558
%import common.CNAME
5659
%import common.WORD
60+
%import common.ESCAPED_STRING
5761
%import common.NUMBER
5862
%import common.INT
59-
%import common.ESCAPED_STRING
6063
%import common.SIGNED_NUMBER
6164
%import common.SIGNED_INT

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ packagedata: "packagedata"i recarray
2222
crosssectiondata: "crosssectiondata"i recarray
2323

2424
// Inline typed grammar rules
25-
integer: _integer
26-
double.2: _number
25+
// Named fields use specific types (integer/double) for validation
26+
// List/recarray data uses generic 'number' - structuring step handles type conversion
27+
integer: SIGNED_INT | INT
28+
double: SIGNED_NUMBER | NUMBER
29+
number: SIGNED_NUMBER | NUMBER
2730
string: ESCAPED_STRING | record
31+
simple_string: ESCAPED_STRING | _word
2832
record.1: _token+ _NL
2933
list: record*
3034
array: (single_array | layered_array)
@@ -44,15 +48,13 @@ filename: ESCAPED_STRING | _word
4448
data: double+
4549

4650
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
47-
_number: SIGNED_NUMBER | NUMBER
48-
_integer: SIGNED_INT | INT
49-
_token: _word | _number
51+
_token: _word | number
5052

5153
%import common.NEWLINE -> _NL
5254
%import common.CNAME
5355
%import common.WORD
56+
%import common.ESCAPED_STRING
5457
%import common.NUMBER
5558
%import common.INT
56-
%import common.ESCAPED_STRING
5759
%import common.SIGNED_NUMBER
5860
%import common.SIGNED_INT

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ manningsn: "manningsn"i array
2424
idcxs: "idcxs"i array
2525

2626
// Inline typed grammar rules
27-
integer: _integer
28-
double.2: _number
27+
// Named fields use specific types (integer/double) for validation
28+
// List/recarray data uses generic 'number' - structuring step handles type conversion
29+
integer: SIGNED_INT | INT
30+
double: SIGNED_NUMBER | NUMBER
31+
number: SIGNED_NUMBER | NUMBER
2932
string: ESCAPED_STRING | record
33+
simple_string: ESCAPED_STRING | _word
3034
record.1: _token+ _NL
3135
list: record*
3236
array: (single_array | layered_array)
@@ -46,15 +50,13 @@ filename: ESCAPED_STRING | _word
4650
data: double+
4751

4852
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
49-
_number: SIGNED_NUMBER | NUMBER
50-
_integer: SIGNED_INT | INT
51-
_token: _word | _number
53+
_token: _word | number
5254

5355
%import common.NEWLINE -> _NL
5456
%import common.CNAME
5557
%import common.WORD
58+
%import common.ESCAPED_STRING
5659
%import common.NUMBER
5760
%import common.INT
58-
%import common.ESCAPED_STRING
5961
%import common.SIGNED_NUMBER
6062
%import common.SIGNED_INT

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,13 @@ vertices: "vertices"i recarray
3333
cell1d: "cell1d"i recarray
3434

3535
// Inline typed grammar rules
36-
integer: _integer
37-
double.2: _number
36+
// Named fields use specific types (integer/double) for validation
37+
// List/recarray data uses generic 'number' - structuring step handles type conversion
38+
integer: SIGNED_INT | INT
39+
double: SIGNED_NUMBER | NUMBER
40+
number: SIGNED_NUMBER | NUMBER
3841
string: ESCAPED_STRING | record
42+
simple_string: ESCAPED_STRING | _word
3943
record.1: _token+ _NL
4044
list: record*
4145
array: (single_array | layered_array)
@@ -55,15 +59,13 @@ filename: ESCAPED_STRING | _word
5559
data: double+
5660

5761
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
58-
_number: SIGNED_NUMBER | NUMBER
59-
_integer: SIGNED_INT | INT
60-
_token: _word | _number
62+
_token: _word | number
6163

6264
%import common.NEWLINE -> _NL
6365
%import common.CNAME
6466
%import common.WORD
67+
%import common.ESCAPED_STRING
6568
%import common.NUMBER
6669
%import common.INT
67-
%import common.ESCAPED_STRING
6870
%import common.SIGNED_NUMBER
6971
%import common.SIGNED_INT

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,16 @@ save_flows: "save_flows"i
2323
ts_filerecord: "ts6"i "filein"i string
2424
obs_filerecord: "filein"i "obs6"i string
2525
maxbound: "maxbound"i integer
26-
stress_period_data: integer+ double double? string?
26+
stress_period_data: (number | simple_string)+
27+
2728
// Inline typed grammar rules
28-
integer: _integer
29-
double.2: _number
29+
// Named fields use specific types (integer/double) for validation
30+
// List/recarray data uses generic 'number' - structuring step handles type conversion
31+
integer: SIGNED_INT | INT
32+
double: SIGNED_NUMBER | NUMBER
33+
number: SIGNED_NUMBER | NUMBER
3034
string: ESCAPED_STRING | record
35+
simple_string: ESCAPED_STRING | _word
3136
record.1: _token+ _NL
3237
list: record*
3338
array: (single_array | layered_array)
@@ -47,15 +52,13 @@ filename: ESCAPED_STRING | _word
4752
data: double+
4853

4954
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
50-
_number: SIGNED_NUMBER | NUMBER
51-
_integer: SIGNED_INT | INT
52-
_token: _word | _number
55+
_token: _word | number
5356

5457
%import common.NEWLINE -> _NL
5558
%import common.CNAME
5659
%import common.WORD
60+
%import common.ESCAPED_STRING
5761
%import common.NUMBER
5862
%import common.INT
59-
%import common.ESCAPED_STRING
6063
%import common.SIGNED_NUMBER
6164
%import common.SIGNED_INT

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,16 @@ save_flows: "save_flows"i
2323
ts_filerecord: "ts6"i "filein"i string
2424
obs_filerecord: "filein"i "obs6"i string
2525
maxbound: "maxbound"i integer
26-
stress_period_data: integer+ double double? string?
26+
stress_period_data: (number | simple_string)+
27+
2728
// Inline typed grammar rules
28-
integer: _integer
29-
double.2: _number
29+
// Named fields use specific types (integer/double) for validation
30+
// List/recarray data uses generic 'number' - structuring step handles type conversion
31+
integer: SIGNED_INT | INT
32+
double: SIGNED_NUMBER | NUMBER
33+
number: SIGNED_NUMBER | NUMBER
3034
string: ESCAPED_STRING | record
35+
simple_string: ESCAPED_STRING | _word
3136
record.1: _token+ _NL
3237
list: record*
3338
array: (single_array | layered_array)
@@ -47,15 +52,13 @@ filename: ESCAPED_STRING | _word
4752
data: double+
4853

4954
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
50-
_number: SIGNED_NUMBER | NUMBER
51-
_integer: SIGNED_INT | INT
52-
_token: _word | _number
55+
_token: _word | number
5356

5457
%import common.NEWLINE -> _NL
5558
%import common.CNAME
5659
%import common.WORD
60+
%import common.ESCAPED_STRING
5761
%import common.NUMBER
5862
%import common.INT
59-
%import common.ESCAPED_STRING
6063
%import common.SIGNED_NUMBER
6164
%import common.SIGNED_INT

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ export_array_ascii: "export_array_ascii"i
1515
strt: "strt"i array
1616

1717
// Inline typed grammar rules
18-
integer: _integer
19-
double.2: _number
18+
// Named fields use specific types (integer/double) for validation
19+
// List/recarray data uses generic 'number' - structuring step handles type conversion
20+
integer: SIGNED_INT | INT
21+
double: SIGNED_NUMBER | NUMBER
22+
number: SIGNED_NUMBER | NUMBER
2023
string: ESCAPED_STRING | record
24+
simple_string: ESCAPED_STRING | _word
2125
record.1: _token+ _NL
2226
list: record*
2327
array: (single_array | layered_array)
@@ -37,15 +41,13 @@ filename: ESCAPED_STRING | _word
3741
data: double+
3842

3943
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
40-
_number: SIGNED_NUMBER | NUMBER
41-
_integer: SIGNED_INT | INT
42-
_token: _word | _number
44+
_token: _word | number
4345

4446
%import common.NEWLINE -> _NL
4547
%import common.CNAME
4648
%import common.WORD
49+
%import common.ESCAPED_STRING
4750
%import common.NUMBER
4851
%import common.INT
49-
%import common.ESCAPED_STRING
5052
%import common.SIGNED_NUMBER
5153
%import common.SIGNED_INT

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ newtonoptions: "newton"i "under_relaxation"i
1919
packages: "packages"i recarray
2020

2121
// Inline typed grammar rules
22-
integer: _integer
23-
double.2: _number
22+
// Named fields use specific types (integer/double) for validation
23+
// List/recarray data uses generic 'number' - structuring step handles type conversion
24+
integer: SIGNED_INT | INT
25+
double: SIGNED_NUMBER | NUMBER
26+
number: SIGNED_NUMBER | NUMBER
2427
string: ESCAPED_STRING | record
28+
simple_string: ESCAPED_STRING | _word
2529
record.1: _token+ _NL
2630
list: record*
2731
array: (single_array | layered_array)
@@ -41,15 +45,13 @@ filename: ESCAPED_STRING | _word
4145
data: double+
4246

4347
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
44-
_number: SIGNED_NUMBER | NUMBER
45-
_integer: SIGNED_INT | INT
46-
_token: _word | _number
48+
_token: _word | number
4749

4850
%import common.NEWLINE -> _NL
4951
%import common.CNAME
5052
%import common.WORD
53+
%import common.ESCAPED_STRING
5154
%import common.NUMBER
5255
%import common.INT
53-
%import common.ESCAPED_STRING
5456
%import common.SIGNED_NUMBER
5557
%import common.SIGNED_INT

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@ saverecord: "save"i string keystring
2121
printrecord: "print"i string keystring
2222

2323
// Inline typed grammar rules
24-
integer: _integer
25-
double.2: _number
24+
// Named fields use specific types (integer/double) for validation
25+
// List/recarray data uses generic 'number' - structuring step handles type conversion
26+
integer: SIGNED_INT | INT
27+
double: SIGNED_NUMBER | NUMBER
28+
number: SIGNED_NUMBER | NUMBER
2629
string: ESCAPED_STRING | record
30+
simple_string: ESCAPED_STRING | _word
2731
record.1: _token+ _NL
2832
list: record*
2933
array: (single_array | layered_array)
@@ -43,15 +47,13 @@ filename: ESCAPED_STRING | _word
4347
data: double+
4448

4549
_word: /[a-zA-Z0-9._'~,-\\(\\)]+/
46-
_number: SIGNED_NUMBER | NUMBER
47-
_integer: SIGNED_INT | INT
48-
_token: _word | _number
50+
_token: _word | number
4951

5052
%import common.NEWLINE -> _NL
5153
%import common.CNAME
5254
%import common.WORD
55+
%import common.ESCAPED_STRING
5356
%import common.NUMBER
5457
%import common.INT
55-
%import common.ESCAPED_STRING
5658
%import common.SIGNED_NUMBER
5759
%import common.SIGNED_INT

0 commit comments

Comments
 (0)