From 7fbd3709c1de7e8d482e04a57a3a97b0a582ee44 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 30 Jan 2024 16:23:55 +0000 Subject: [PATCH 1/3] Bump up version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ba13d3caf..0b82b8d70 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.33.1 +2.33.2 From 6e6852f261d520433ea3b3514892a1e28312e022 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 30 Jan 2024 16:27:20 +0000 Subject: [PATCH 2/3] ECC-1750: MARS: Add new class 'ai' --- definitions/mars/class.table | 1 + 1 file changed, 1 insertion(+) diff --git a/definitions/mars/class.table b/definitions/mars/class.table index f2338f0ad..efe2be6b1 100644 --- a/definitions/mars/class.table +++ b/definitions/mars/class.table @@ -49,6 +49,7 @@ 48 eh C3S European hydrology 49 gh C3S Global hydrology 50 ci CERISE project +51 ai Operational AIFS 99 te Test 100 at Austria 101 be Belgium From 24288bdd37af784ba4d198ab19415215ba67145a Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 30 Jan 2024 16:33:01 +0000 Subject: [PATCH 3/3] ECC-1743: GRIB2: New hydro and wave parameters --- definitions/grib2/cfVarName.def | 64 +++++++++++++++++++++++++++++++++ definitions/grib2/name.def | 64 +++++++++++++++++++++++++++++++++ definitions/grib2/paramId.def | 64 +++++++++++++++++++++++++++++++++ definitions/grib2/shortName.def | 64 +++++++++++++++++++++++++++++++++ definitions/grib2/units.def | 64 +++++++++++++++++++++++++++++++++ 5 files changed, 320 insertions(+) diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 72e8fc702..adc59d44e 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -949,6 +949,36 @@ parameterCategory = 0 ; parameterNumber = 52 ; } +#Envelope-maximum individual wave height +'envhmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 93 ; + } +#Time domain maximum individual crest height +'tdcmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 94 ; + } +#Time domain maximum individual wave height +'tdhmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 95 ; + } +#Space time maximum individual crest height +'stcmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 96 ; + } +#Space time maximum individual wave height +'sthmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 97 ; + } #Wave Spectral Skewness 'wss' = { discipline = 10 ; @@ -4445,6 +4475,40 @@ parameterCategory = 0 ; parameterNumber = 9 ; } +#Lake depth +'lakdph' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 15 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River depth +'rivdph' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River outflow of water +'rivout' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 17 ; + } +#Floodplain outflow of water +'fldout' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 18 ; + } +#Floodpath outflow of water +'pthflw' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 19 ; + } #Latitude 'lat' = { discipline = 0 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index baa1ecdc5..b9304d855 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -949,6 +949,36 @@ parameterCategory = 0 ; parameterNumber = 52 ; } +#Envelope-maximum individual wave height +'Envelope-maximum individual wave height' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 93 ; + } +#Time domain maximum individual crest height +'Time domain maximum individual crest height' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 94 ; + } +#Time domain maximum individual wave height +'Time domain maximum individual wave height' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 95 ; + } +#Space time maximum individual crest height +'Space time maximum individual crest height' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 96 ; + } +#Space time maximum individual wave height +'Space time maximum individual wave height' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 97 ; + } #Wave Spectral Skewness 'Wave Spectral Skewness' = { discipline = 10 ; @@ -4445,6 +4475,40 @@ parameterCategory = 0 ; parameterNumber = 9 ; } +#Lake depth +'Lake depth' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 15 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River depth +'River depth' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River outflow of water +'River outflow of water' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 17 ; + } +#Floodplain outflow of water +'Floodplain outflow of water' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 18 ; + } +#Floodpath outflow of water +'Floodpath outflow of water' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 19 ; + } #Latitude 'Latitude' = { discipline = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index b4db93f75..a1c6a4cfb 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -949,6 +949,36 @@ parameterCategory = 0 ; parameterNumber = 52 ; } +#Envelope-maximum individual wave height +'140130' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 93 ; + } +#Time domain maximum individual crest height +'140131' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 94 ; + } +#Time domain maximum individual wave height +'140132' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 95 ; + } +#Space time maximum individual crest height +'140133' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 96 ; + } +#Space time maximum individual wave height +'140134' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 97 ; + } #Wave Spectral Skewness '140207' = { discipline = 10 ; @@ -4445,6 +4475,40 @@ parameterCategory = 0 ; parameterNumber = 9 ; } +#Lake depth +'240030' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 15 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River depth +'240031' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River outflow of water +'240032' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 17 ; + } +#Floodplain outflow of water +'240033' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 18 ; + } +#Floodpath outflow of water +'240034' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 19 ; + } #Latitude '250001' = { discipline = 0 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 7a5016a63..e21f406a9 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -949,6 +949,36 @@ parameterCategory = 0 ; parameterNumber = 52 ; } +#Envelope-maximum individual wave height +'envhmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 93 ; + } +#Time domain maximum individual crest height +'tdcmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 94 ; + } +#Time domain maximum individual wave height +'tdhmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 95 ; + } +#Space time maximum individual crest height +'stcmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 96 ; + } +#Space time maximum individual wave height +'sthmax' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 97 ; + } #Wave Spectral Skewness 'wss' = { discipline = 10 ; @@ -4445,6 +4475,40 @@ parameterCategory = 0 ; parameterNumber = 9 ; } +#Lake depth +'lakdph' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 15 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River depth +'rivdph' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River outflow of water +'rivout' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 17 ; + } +#Floodplain outflow of water +'fldout' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 18 ; + } +#Floodpath outflow of water +'pthflw' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 19 ; + } #Latitude 'lat' = { discipline = 0 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 783bf5bb0..6352e9b6c 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -949,6 +949,36 @@ parameterCategory = 0 ; parameterNumber = 52 ; } +#Envelope-maximum individual wave height +'m' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 93 ; + } +#Time domain maximum individual crest height +'m' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 94 ; + } +#Time domain maximum individual wave height +'m' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 95 ; + } +#Space time maximum individual crest height +'m' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 96 ; + } +#Space time maximum individual wave height +'m' = { + discipline = 10 ; + parameterCategory = 0 ; + parameterNumber = 97 ; + } #Wave Spectral Skewness 'Numeric' = { discipline = 10 ; @@ -4445,6 +4475,40 @@ parameterCategory = 0 ; parameterNumber = 9 ; } +#Lake depth +'m' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 15 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River depth +'m' = { + discipline = 1 ; + parameterCategory = 2 ; + parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 162 ; + } +#River outflow of water +'m**3 s**-1' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 17 ; + } +#Floodplain outflow of water +'m**3 s**-1' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 18 ; + } +#Floodpath outflow of water +'m**3 s**-1' = { + discipline = 1 ; + parameterCategory = 0 ; + parameterNumber = 19 ; + } #Latitude 'Degree N' = { discipline = 0 ;