Skip to content

Commit ea3aa71

Browse files
committed
add schemes and patterns for SecondaryOutputData in global water and marine-fishery sectors
1 parent dcb0fdc commit ea3aa71

File tree

3 files changed

+66
-4
lines changed

3 files changed

+66
-4
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
dataset: >-
2+
(?P<model>[a-z0-9-+.]+)
3+
_(?P<climate_forcing>[a-z0-9-]+)
4+
_(?P<climate_scenario>[a-z0-9-]+)
5+
_(?P<soc_scenario>[a-z0-9-]+)
6+
_(?P<sens_scenario>[a-z0-9-]+)
7+
_(?P<variable>[a-z0-9]+)(-(?P<crop>[a-z0-9]{3})-(?P<irrigation>(firr|cirr|noirr))|-(?P<pft>[a-z0-9-]+))?
8+
_(?P<region>(global))
9+
_(?P<time_step>[a-z0-9-]+)
10+
11+
file: >-
12+
(?P<model>[a-z0-9-+.]+)
13+
_(?P<climate_forcing>[a-z0-9-]+)
14+
_(?P<climate_scenario>[a-z0-9-]+)
15+
_(?P<soc_scenario>[a-z0-9-]+)
16+
_(?P<sens_scenario>[a-z0-9-]+)
17+
_(?P<variable>[a-z0-9]+)(-(?P<crop>[a-z0-9]{3})-(?P<irrigation>(firr|cirr|noirr))|-(?P<pft>[a-z0-9-]+))?
18+
_(?P<region>(global))
19+
_(?P<time_step>[a-z0-9-]+)
20+
(_(?P<start_year>\d{4})_(?P<end_year>\d{4}))?

pattern/ISIMIP3b/SecondaryOutputData/marine-fishery_global.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dataset: >-
55
_(?P<climate_scenario>[a-z0-9-]+)
66
_(?P<soc_scenario>[a-z0-9-]+)
77
_(?P<sens_scenario>[a-z0-9-]+)
8-
_(?P<variable>[a-z0-9]+)
8+
_(?P<variable>[a-z0-9]+)(-(zooc|zmeso))?
99
_(?P<region>(global))
1010
_(?P<time_step>[a-z0-9-]+)
1111
@@ -16,8 +16,7 @@ file: >-
1616
_(?P<climate_scenario>[a-z0-9-]+)
1717
_(?P<soc_scenario>[a-z0-9-]+)
1818
_(?P<sens_scenario>[a-z0-9-]+)
19-
_(?P<variable>[a-z0-9]+)
19+
_(?P<variable>[a-z0-9]+)(-(zooc|zmeso))?
2020
_(?P<region>(global))
2121
_(?P<time_step>[a-z0-9-]+)
22-
_(?P<start_year>\d{4})
23-
_(?P<end_year>\d{4})
22+
(_(?P<start_year>\d{4})_(?P<end_year>\d{4}))?
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
type: object
2+
required:
3+
- specifiers
4+
properties:
5+
specifiers:
6+
required:
7+
- model
8+
- climate_forcing
9+
- climate_scenario
10+
- soc_scenario
11+
- sens_scenario
12+
- variable
13+
- region
14+
- time_step
15+
properties:
16+
model:
17+
type: string
18+
climate_forcing:
19+
type: string
20+
detrending:
21+
type: string
22+
climate_scenario:
23+
type: string
24+
soc_scenario:
25+
type: string
26+
sens_scenario:
27+
type: string
28+
variable:
29+
type: string
30+
crop:
31+
type: string
32+
irrigation:
33+
type: string
34+
pft:
35+
type: string
36+
region:
37+
type: string
38+
time_step:
39+
type: string
40+
start_year:
41+
type: number
42+
end_year:
43+
type: number

0 commit comments

Comments
 (0)