From 2f86e13c7858186a81e6e789591028dc4650c8ae Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 15 May 2024 14:28:55 +0000 Subject: [PATCH] ECC-1827: GRIB2: Add new FT2024-1 parameters from issue #227 --- definitions/grib2/cfVarName.def | 48 +++++++++++++++++++ .../grib2/localConcepts/ecmf/cfVarName.def | 6 --- definitions/grib2/localConcepts/ecmf/name.def | 6 --- .../grib2/localConcepts/ecmf/paramId.def | 6 --- .../grib2/localConcepts/ecmf/shortName.def | 6 --- .../grib2/localConcepts/ecmf/units.def | 6 --- definitions/grib2/name.def | 48 +++++++++++++++++++ definitions/grib2/paramId.def | 48 +++++++++++++++++++ definitions/grib2/shortName.def | 48 +++++++++++++++++++ definitions/grib2/units.def | 48 +++++++++++++++++++ 10 files changed, 240 insertions(+), 30 deletions(-) diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index d72793b3b..468304658 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -5211,6 +5211,48 @@ parameterCategory = 0 ; parameterNumber = 19 ; } +#Floodplain depth +'flddep' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 17 ; + } +#Floodplain flooded fraction +'fldffr' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 18 ; + } +#Floodplain flooded area +'fldfar' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 19 ; + } +#River fraction +'rivfr' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 20 ; + } +#River area +'rivar' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 21 ; + } +#Fraction of river coverage plus river related flooding +'rivcffr' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 22 ; + } +#Area of river coverage plus river related flooding +'rivcfar' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 23 ; + } #Latitude 'lat' = { discipline = 0 ; @@ -10602,6 +10644,12 @@ parameterCategory = 0 ; parameterNumber = 44 ; } +#Wave spectral peakedness +'wsp' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 98 ; + } #Skin reservoir content 'srcrea' = { discipline = 2 ; diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def index 7efe686a0..e99c871c7 100644 --- a/definitions/grib2/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def @@ -16607,12 +16607,6 @@ parameterCategory = 140 ; parameterNumber = 250 ; } -#Wave spectral peakedness -'wsp' = { - discipline = 192 ; - parameterCategory = 140 ; - parameterNumber = 254 ; - } #Indicates a missing value 'p255.140' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def index c5d77647c..e70af2e1b 100644 --- a/definitions/grib2/localConcepts/ecmf/name.def +++ b/definitions/grib2/localConcepts/ecmf/name.def @@ -16607,12 +16607,6 @@ parameterCategory = 140 ; parameterNumber = 250 ; } -#Wave spectral peakedness -'Wave spectral peakedness' = { - discipline = 192 ; - parameterCategory = 140 ; - parameterNumber = 254 ; - } #Indicates a missing value 'Indicates a missing value' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def index 12fe43ab4..04d3a8625 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.def @@ -16607,12 +16607,6 @@ parameterCategory = 140 ; parameterNumber = 250 ; } -#Wave spectral peakedness -'140254' = { - discipline = 192 ; - parameterCategory = 140 ; - parameterNumber = 254 ; - } #Indicates a missing value '140255' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def index b7e53c29d..dd15a6b74 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.def @@ -16607,12 +16607,6 @@ parameterCategory = 140 ; parameterNumber = 250 ; } -#Wave spectral peakedness -'wsp' = { - discipline = 192 ; - parameterCategory = 140 ; - parameterNumber = 254 ; - } #Indicates a missing value '~' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def index 1629e52b0..9b73ff42a 100644 --- a/definitions/grib2/localConcepts/ecmf/units.def +++ b/definitions/grib2/localConcepts/ecmf/units.def @@ -16607,12 +16607,6 @@ parameterCategory = 140 ; parameterNumber = 250 ; } -#Wave spectral peakedness -'dimensionless' = { - discipline = 192 ; - parameterCategory = 140 ; - parameterNumber = 254 ; - } #Indicates a missing value '~' = { discipline = 192 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index a64e2c630..f281ae65d 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -5211,6 +5211,48 @@ parameterCategory = 0 ; parameterNumber = 19 ; } +#Floodplain depth +'Floodplain depth' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 17 ; + } +#Floodplain flooded fraction +'Floodplain flooded fraction' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 18 ; + } +#Floodplain flooded area +'Floodplain flooded area' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 19 ; + } +#River fraction +'River fraction' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 20 ; + } +#River area +'River area' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 21 ; + } +#Fraction of river coverage plus river related flooding +'Fraction of river coverage plus river related flooding' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 22 ; + } +#Area of river coverage plus river related flooding +'Area of river coverage plus river related flooding' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 23 ; + } #Latitude 'Latitude' = { discipline = 0 ; @@ -10602,6 +10644,12 @@ parameterCategory = 0 ; parameterNumber = 44 ; } +#Wave spectral peakedness +'Wave spectral peakedness' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 98 ; + } #Skin reservoir content 'Skin reservoir content' = { discipline = 2 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index a9f5f256e..7f2556ee7 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -5211,6 +5211,48 @@ parameterCategory = 0 ; parameterNumber = 19 ; } +#Floodplain depth +'240035' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 17 ; + } +#Floodplain flooded fraction +'240036' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 18 ; + } +#Floodplain flooded area +'240037' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 19 ; + } +#River fraction +'240038' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 20 ; + } +#River area +'240039' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 21 ; + } +#Fraction of river coverage plus river related flooding +'240040' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 22 ; + } +#Area of river coverage plus river related flooding +'240041' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 23 ; + } #Latitude '250001' = { discipline = 0 ; @@ -10602,6 +10644,12 @@ parameterCategory = 0 ; parameterNumber = 44 ; } +#Wave spectral peakedness +'140254' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 98 ; + } #Skin reservoir content '160198' = { discipline = 2 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 4d68cb57c..18e2dc8a7 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -5211,6 +5211,48 @@ parameterCategory = 0 ; parameterNumber = 19 ; } +#Floodplain depth +'flddep' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 17 ; + } +#Floodplain flooded fraction +'fldffr' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 18 ; + } +#Floodplain flooded area +'fldfar' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 19 ; + } +#River fraction +'rivfr' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 20 ; + } +#River area +'rivar' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 21 ; + } +#Fraction of river coverage plus river related flooding +'rivcffr' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 22 ; + } +#Area of river coverage plus river related flooding +'rivcfar' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 23 ; + } #Latitude 'lat' = { discipline = 0 ; @@ -10602,6 +10644,12 @@ parameterCategory = 0 ; parameterNumber = 44 ; } +#Wave spectral peakedness +'wsp' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 98 ; + } #Skin reservoir content 'srcrea' = { discipline = 2 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 4a6bde706..6aaba2634 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -5211,6 +5211,48 @@ parameterCategory = 0 ; parameterNumber = 19 ; } +#Floodplain depth +'m' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 17 ; + } +#Floodplain flooded fraction +'Proportion' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 18 ; + } +#Floodplain flooded area +'m**2' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 19 ; + } +#River fraction +'Proportion' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 20 ; + } +#River area +'m**2' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 21 ; + } +#Fraction of river coverage plus river related flooding +'Proportion' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 22 ; + } +#Area of river coverage plus river related flooding +'m**2' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 23 ; + } #Latitude 'Degree N' = { discipline = 0 ; @@ -10602,6 +10644,12 @@ parameterCategory = 0 ; parameterNumber = 44 ; } +#Wave spectral peakedness +'dimensionless' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 98 ; + } #Skin reservoir content 'kg m**-2' = { discipline = 2 ;