Skip to content

Commit c6c5c5b

Browse files
committed
Merge branch 'hotfix/1.12.3' into develop
2 parents c932c19 + f9a51e8 commit c6c5c5b

File tree

2 files changed

+35
-26
lines changed

2 files changed

+35
-26
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.12.2
1+
1.12.3

share/metkit/language.yaml

+34-25
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,10 @@ _field: &_field
353353
multiple: false
354354
type: enum
355355
values:
356-
- climate-dt
357-
- extremes-dt
358-
- on-demand-extremes-dt
356+
- [climate-dt, Climate change adaptation digital twin]
357+
- [extremes-dt, Weather and geophysical extremes digital twin]
358+
- [on-demand-climate-dt, On-demand climate change adaptation digital twin]
359+
- [on-demand-extremes-dt, On-demand weather and geophysical extremes digital twin]
359360
only:
360361
- context:
361362
class: [d1]
@@ -372,10 +373,10 @@ _field: &_field
372373
- [none]
373374
- [hrm]
374375
- [lm]
375-
- [ifs]
376-
- [ifs-nemo]
377-
- [ifs-fesom]
378-
- [icon]
376+
- [ifs, IFS, IFS with no ocean model]
377+
- [ifs-nemo, IFS-NEMO, IFS with NEMO ocean model]
378+
- [ifs-fesom, IFS-FESOM, IFS with FESOM ocean model]
379+
- [icon, ICON, ICON-A with ICON-O ocean model]
379380
- [aifs]
380381
- [aifs-single]
381382
- [aifs-single-mse]
@@ -390,6 +391,7 @@ _field: &_field
390391
- context:
391392
class: [ml]
392393

394+
393395
georef:
394396
type: lowercase
395397
unset:
@@ -1029,42 +1031,49 @@ _field: &_field
10291031
category: data
10301032
type: enum
10311033
values:
1032-
- cmip6
1033-
- scenariomip
1034-
- highresmip
1035-
- story-nudging
1034+
- [cmip6, CMIP6, Coupled Model Intercomparison Project Phase 6]
1035+
- [scenariomip, ScenarioMIP, Scenario Model Intercomparison Project]
1036+
- [highresmip, HighResMIP, High Resolution Model Intercomparison Project]
1037+
- [story-nudging, Climate storylines by nudging to reanalysis]
1038+
- [baseline, Baseline simulations for climate model evaluation]
1039+
- [projections, Future climate projections]
1040+
10361041

10371042
experiment:
10381043
category: data
10391044
type: enum
10401045
values:
1041-
- hist
1042-
- cont
1043-
- amip
1044-
- ssp1-1.9
1045-
- ssp1-2.6
1046-
- ssp2-4.5
1047-
- ssp3-7.0
1048-
- ssp5-8.5
1049-
- tplus1.5k
1050-
- tplus2.0k
1051-
- tplus3.0k
1052-
- tplus4.0k
1046+
- [hist, Historical]
1047+
- [cont, Control]
1048+
- [amip, Atmospheric Model Intercomparison Project]
1049+
- [ssp1-1.9, SSP1-1.9, Shared Socio-economic Pathways 1-1.9]
1050+
- [ssp1-2.6, SSP1-2.6, Shared Socio-economic Pathways 1-2.6]
1051+
- [ssp2-4.5, SSP2-4.5, Shared Socio-economic Pathways 2-4.5]
1052+
- [ssp3-7.0, SSP3-7.0, Shared Socio-economic Pathways 3-7.0]
1053+
- [ssp5-8.5, SSP5-8.5, Shared Socio-economic Pathways 5-8.5]
1054+
- [tplus1.5k, Tplus1.5K, Warmer world at 1.5 degrees K above pre-industrial temperatures]
1055+
- [tplus2.0k, Tplus2.0K, Warmer world at 2.0 degrees K above pre-industrial temperatures]
1056+
- [tplus3.0k, Tplus3.0K, Warmer world at 3.0 degrees K above pre-industrial temperatures]
1057+
- [tplus4.0k, Tplus4.0K, Warmer world at 4.0 degrees K above pre-industrial temperatures]
1058+
- [abrupt4xco2, CO2 abruptly quadrupled and then held constant]
1059+
10531060

10541061
generation:
10551062
category: data
10561063
type: integer
10571064

1065+
10581066
realization:
10591067
category: data
10601068
type: integer
10611069

1070+
10621071
resolution:
10631072
category: data
10641073
type: enum
10651074
values:
1066-
- standard
1067-
- high
1075+
- [standard, Standard resolution model output with longer availability]
1076+
- [high, High resolution model output with limited availability]
10681077

10691078
#######################################################################
10701079

0 commit comments

Comments
 (0)